GeoDirectory / geodirectory

geodirectory-functions/template_functions.php

Indentation +105 added lines, -105 removed lines

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

 /**

- * Template functions

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * Template functions

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

 

 /**

  * Locates template based on the template type.

@@ -29,21 +29,21 @@ 
         case 'add-listing':

 

             $sc_post_type = '';

-			if (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {

+            if (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {

                 $listing_page_id = $post->ID;

 				

-				$regex_pattern = get_shortcode_regex();

-				preg_match('/'.$regex_pattern.'/s', $post->post_content, $regex_matches);

+                $regex_pattern = get_shortcode_regex();

+                preg_match('/'.$regex_pattern.'/s', $post->post_content, $regex_matches);

 				

-				if (!empty($regex_matches) && isset($regex_matches[2]) == 'gd_add_listing' && isset($regex_matches[3])) {

-					$shortcode_atts = shortcode_parse_atts($regex_matches[3]);

-					$sc_post_type = !empty($shortcode_atts) && isset($shortcode_atts['listing_type']) && !empty($shortcode_atts['listing_type']) ? $shortcode_atts['listing_type'] : '';

-				}

+                if (!empty($regex_matches) && isset($regex_matches[2]) == 'gd_add_listing' && isset($regex_matches[3])) {

+                    $shortcode_atts = shortcode_parse_atts($regex_matches[3]);

+                    $sc_post_type = !empty($shortcode_atts) && isset($shortcode_atts['listing_type']) && !empty($shortcode_atts['listing_type']) ? $shortcode_atts['listing_type'] : '';

+                }

             } else {

                 $listing_page_id = geodir_add_listing_page_id();

             }

 			

-			$is_wpml = function_exists('icl_object_id') ? true : false;

+            $is_wpml = function_exists('icl_object_id') ? true : false;

 

             if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type'])

                 && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

@@ -55,14 +55,14 @@ 
                 if (!empty($post_types))

                     $post_type = $post_types[0];

 					

-				if($sc_post_type != '' )

-					$post_type = $sc_post_type;

+                if($sc_post_type != '' )

+                    $post_type = $sc_post_type;

 				

                 if ($is_wpml && !empty($wp->query_vars['page_id'])) {

-					wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

-				} else {

-					wp_redirect(trailingslashit(get_site_url()) . $pagename . '/?listing_type=' . $post_type);

-				}

+                    wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

+                } else {

+                    wp_redirect(trailingslashit(get_site_url()) . $pagename . '/?listing_type=' . $post_type);

+                }

                 exit();

             }

             return $template = locate_template(array("geodirectory/add-{$post_type}.php", "geodirectory/add-listing.php"));

@@ -481,21 +481,21 @@ 
  */

 function geodir_display_message_not_found_on_listing($template_listview = 'listing-listview', $favorite = false) {

     if ($favorite) {

-		$message = __('No favorite listings found which match your selection.', 'geodirectory');

-	} else {

-		$message = __('No listings found which match your selection.', 'geodirectory');

-	}

+        $message = __('No favorite listings found which match your selection.', 'geodirectory');

+    } else {

+        $message = __('No listings found which match your selection.', 'geodirectory');

+    }

 	

-	/**

-	 * Filter the no listing found message.

-	 *

-	 * @since 1.5.5

-	 * @param string $template_listview Listing listview template.

-	 * @param bool $favorite Are favorite listings results?

-	 */

-	$message = apply_filters('geodir_message_listing_not_found', $message, $template_listview, $favorite);

+    /**

+     * Filter the no listing found message.

+     *

+     * @since 1.5.5

+     * @param string $template_listview Listing listview template.

+     * @param bool $favorite Are favorite listings results?

+     */

+    $message = apply_filters('geodir_message_listing_not_found', $message, $template_listview, $favorite);

 	

-	echo '<li class="no-listing">' . $message . '</li>';

+    echo '<li class="no-listing">' . $message . '</li>';

 }

 

 /**

@@ -509,9 +509,9 @@ 
  * @return string Breadcrumb HTML.

  */

 function geodir_strip_breadcrumb_li_wrappers($breadcrumb, $separator) {

-	$breadcrumb = str_replace(array('</li><li>', '</li> <li>'), '', $breadcrumb);

+    $breadcrumb = str_replace(array('</li><li>', '</li> <li>'), '', $breadcrumb);

 	

-	return $breadcrumb;

+    return $breadcrumb;

 }

 

 /**

@@ -522,30 +522,30 @@ 
  * @return string Listing listview class.

  */

 function geodir_convert_listing_view_class($columns = '') {

-	$class = '';

+    $class = '';

 	

-	switch ((int)$columns) {

-		case 1:

-			$class = '';

-		break;

-		case 2:

-			$class = 'gridview_onehalf';

-		break;

-		case 3:

-			$class = 'gridview_onethird';

-		break;

-		case 4:

-			$class = 'gridview_onefourth';

-		break;

-		case 5:

-			$class = 'gridview_onefifth';

-		break;

-		default:

-			$class = '';

-		break;

-	}

+    switch ((int)$columns) {

+        case 1:

+            $class = '';

+        break;

+        case 2:

+            $class = 'gridview_onehalf';

+        break;

+        case 3:

+            $class = 'gridview_onethird';

+        break;

+        case 4:

+            $class = 'gridview_onefourth';

+        break;

+        case 5:

+            $class = 'gridview_onefifth';

+        break;

+        default:

+            $class = '';

+        break;

+    }

 	

-	return $class;

+    return $class;

 }

 

 /**

@@ -558,18 +558,18 @@ 
  * @return bool Modified value for display the excerpt.

  */

 function geodir_show_listing_post_excerpt($display, $view, $post) {

-	if ($view == 'listview') {

-		if (geodir_is_page('author')) {

-			$word_limit = get_option('geodir_author_desc_word_limit');

-		} else {

-			$word_limit = get_option('geodir_desc_word_limit');

-		}

+    if ($view == 'listview') {

+        if (geodir_is_page('author')) {

+            $word_limit = get_option('geodir_author_desc_word_limit');

+        } else {

+            $word_limit = get_option('geodir_desc_word_limit');

+        }

 		

-		if ($word_limit !== '' && ($word_limit == 0 || $word_limit == '0')) {

-			$display = false;

-		}

-	}

-	return $display;

+        if ($word_limit !== '' && ($word_limit == 0 || $word_limit == '0')) {

+            $display = false;

+        }

+    }

+    return $display;

 }

 

 /**

@@ -584,24 +584,24 @@ 
  * @return string Rating icons html content.

  */

 function geodir_font_awesome_rating_form_html($html, $star_texts = array(), $default = '') {

-	if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

-		$html = '<select class="gd-fa-rating">';

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

-		if (!empty($star_texts) && is_array($star_texts)) {

-			foreach ($star_texts as $i => $text) {

-				$html .= '<option ' . selected((int)($i + 1), (int)$default, false) . ' value="' . (int)($i + 1) . '">' . $text . '</option>';

-			}

-		} else {

-			$html .= '<option value="1">1</option>';

-			$html .= '<option value="2">2</option>';

-			$html .= '<option value="3">3</option>';

-			$html .= '<option value="4">4</option>';

-			$html .= '<option value="5">5</option>';

-		}

-		$html .= '</select>';

-	}

-

-	return $html;

+    if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

+        $html = '<select class="gd-fa-rating">';

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

+        if (!empty($star_texts) && is_array($star_texts)) {

+            foreach ($star_texts as $i => $text) {

+                $html .= '<option ' . selected((int)($i + 1), (int)$default, false) . ' value="' . (int)($i + 1) . '">' . $text . '</option>';

+            }

+        } else {

+            $html .= '<option value="1">1</option>';

+            $html .= '<option value="2">2</option>';

+            $html .= '<option value="3">3</option>';

+            $html .= '<option value="4">4</option>';

+            $html .= '<option value="5">5</option>';

+        }

+        $html .= '</select>';

+    }

+

+    return $html;

 }

 

 /**

@@ -616,20 +616,20 @@ 
  * @return string Rating icons html content.

  */

 function geodir_font_awesome_rating_stars_html($html, $rating, $star_count = 5) {

-	if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

-		$rating = min($rating, $star_count);

-		$full_stars = floor( $rating );

-		$half_stars = ceil( $rating - $full_stars );

-		$empty_stars = $star_count - $full_stars - $half_stars;

+    if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

+        $rating = min($rating, $star_count);

+        $full_stars = floor( $rating );

+        $half_stars = ceil( $rating - $full_stars );

+        $empty_stars = $star_count - $full_stars - $half_stars;

 		

-		$html = '<div class="gd-star-rating gd-fa-star-rating">';

-		$html .= str_repeat( '<i class="fa fa-star gd-full-star"></i>', $full_stars );

-		$html .= str_repeat( '<i class="fa fa-star-o fa-star-half-full gd-half-star"></i>', $half_stars );

-		$html .= str_repeat( '<i class="fa fa-star-o gd-empty-star"></i>', $empty_stars);

-		$html .= '</div>';

-	}

-

-	return $html;

+        $html = '<div class="gd-star-rating gd-fa-star-rating">';

+        $html .= str_repeat( '<i class="fa fa-star gd-full-star"></i>', $full_stars );

+        $html .= str_repeat( '<i class="fa fa-star-o fa-star-half-full gd-half-star"></i>', $half_stars );

+        $html .= str_repeat( '<i class="fa fa-star-o gd-empty-star"></i>', $empty_stars);

+        $html .= '</div>';

+    }

+

+    return $html;

 }

 

 /**

@@ -639,12 +639,12 @@ 
  * @package GeoDirectory

  */

 function geodir_font_awesome_rating_css() {

-	// Font awesome rating style

-	if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

-		$full_color = get_option('geodir_reviewrating_fa_full_rating_color', '#757575');

-		if ($full_color != '#757575') {

-			echo '<style type="text/css">.br-theme-fontawesome-stars .br-widget a.br-active:after,.br-theme-fontawesome-stars .br-widget a.br-selected:after,

+    // Font awesome rating style

+    if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

+        $full_color = get_option('geodir_reviewrating_fa_full_rating_color', '#757575');

+        if ($full_color != '#757575') {

+            echo '<style type="text/css">.br-theme-fontawesome-stars .br-widget a.br-active:after,.br-theme-fontawesome-stars .br-widget a.br-selected:after,

 			.gd-star-rating i.fa {color:' . stripslashes($full_color) . '!important;</style>';

-		}

-	}

+        }

+    }

 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -33,7 +33,7 @@ 
                 $listing_page_id = $post->ID;

 				

 				$regex_pattern = get_shortcode_regex();

-				preg_match('/'.$regex_pattern.'/s', $post->post_content, $regex_matches);

+				preg_match('/' . $regex_pattern . '/s', $post->post_content, $regex_matches);

 				

 				if (!empty($regex_matches) && isset($regex_matches[2]) == 'gd_add_listing' && isset($regex_matches[3])) {

 					$shortcode_atts = shortcode_parse_atts($regex_matches[3]);

@@ -55,7 +55,7 @@ 
                 if (!empty($post_types))

                     $post_type = $post_types[0];

 					

-				if($sc_post_type != '' )

+				if ($sc_post_type != '')

 					$post_type = $sc_post_type;

 				

                 if ($is_wpml && !empty($wp->query_vars['page_id'])) {

@@ -410,7 +410,7 @@ 
      */

     do_action("geodir_get_template_part_{$slug}", $slug, $name);

     $templates = array();

-    $name = (string)$name;

+    $name = (string) $name;

     if ('' !== $name) {

         $template_name = "{$slug}-{$name}.php";

 

@@ -524,7 +524,7 @@ 
 function geodir_convert_listing_view_class($columns = '') {

 	$class = '';

 	

-	switch ((int)$columns) {

+	switch ((int) $columns) {

 		case 1:

 			$class = '';

 		break;

@@ -589,7 +589,7 @@ 
 		$html .= '<option value=""></option>';

 		if (!empty($star_texts) && is_array($star_texts)) {

 			foreach ($star_texts as $i => $text) {

-				$html .= '<option ' . selected((int)($i + 1), (int)$default, false) . ' value="' . (int)($i + 1) . '">' . $text . '</option>';

+				$html .= '<option ' . selected((int) ($i + 1), (int) $default, false) . ' value="' . (int) ($i + 1) . '">' . $text . '</option>';

 			}

 		} else {

 			$html .= '<option value="1">1</option>';

@@ -618,14 +618,14 @@ 
 function geodir_font_awesome_rating_stars_html($html, $rating, $star_count = 5) {

 	if (get_option('geodir_reviewrating_enable_font_awesome') == '1') {

 		$rating = min($rating, $star_count);

-		$full_stars = floor( $rating );

-		$half_stars = ceil( $rating - $full_stars );

+		$full_stars = floor($rating);

+		$half_stars = ceil($rating - $full_stars);

 		$empty_stars = $star_count - $full_stars - $half_stars;

 		

 		$html = '<div class="gd-star-rating gd-fa-star-rating">';

-		$html .= str_repeat( '<i class="fa fa-star gd-full-star"></i>', $full_stars );

-		$html .= str_repeat( '<i class="fa fa-star-o fa-star-half-full gd-half-star"></i>', $half_stars );

-		$html .= str_repeat( '<i class="fa fa-star-o gd-empty-star"></i>', $empty_stars);

+		$html .= str_repeat('<i class="fa fa-star gd-full-star"></i>', $full_stars);

+		$html .= str_repeat('<i class="fa fa-star-o fa-star-half-full gd-half-star"></i>', $half_stars);

+		$html .= str_repeat('<i class="fa fa-star-o gd-empty-star"></i>', $empty_stars);

 		$html .= '</div>';

 	}

 

Braces +58 added lines, -26 removed lines

@@ -47,16 +47,19 @@ 
 

             if ($listing_page_id != '' && (is_page($listing_page_id) || ($is_wpml && !empty($wp->query_vars['page_id']))) && isset($_REQUEST['listing_type'])

                 && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                $post_type = sanitize_text_field($_REQUEST['listing_type']);

+            ) {
+                            $post_type = sanitize_text_field($_REQUEST['listing_type']);
+            }
             if (empty($post_type) && !isset($_REQUEST['pid'])) {

                 $pagename = $wp->query_vars['pagename'];

                 $post_types = geodir_get_posttypes();

-                if (!empty($post_types))

-                    $post_type = $post_types[0];

+                if (!empty($post_types)) {
+                                    $post_type = $post_types[0];
+                }
 					

-				if($sc_post_type != '' )

-					$post_type = $sc_post_type;

+				if($sc_post_type != '' ) {
+									$post_type = $sc_post_type;
+				}
 				

                 if ($is_wpml && !empty($wp->query_vars['page_id'])) {

 					wp_redirect(geodir_getlink(get_permalink($wp->query_vars['page_id']), array('listing_type' => $post_type)));

@@ -71,14 +74,16 @@ 
             $success_page_id = geodir_success_page_id();

             if ($success_page_id != '' && is_page($success_page_id) && isset($_REQUEST['listing_type'])

                 && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                $post_type = sanitize_text_field($_REQUEST['listing_type']);

+            ) {
+                            $post_type = sanitize_text_field($_REQUEST['listing_type']);
+            }
             return $template = locate_template(array("geodirectory/{$post_type}-success.php", "geodirectory/listing-success.php"));

             break;

         case 'detail':

         case 'preview':

-            if (in_array(get_post_type(), geodir_get_posttypes()))

-                $post_type = get_post_type();

+            if (in_array(get_post_type(), geodir_get_posttypes())) {
+                            $post_type = get_post_type();
+            }
             return $template = locate_template(array("geodirectory/single-{$post_type}.php", "geodirectory/listing-detail.php"));

             break;

         case 'listing':

@@ -184,7 +189,9 @@ 
 

         $template = geodir_locate_template('signup');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';

+        if (!$template) {
+            $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';
+        }
 

         /**

          * Filter the signup template path.

@@ -202,7 +209,9 @@ 
 

             $template = geodir_locate_template('information');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+            if (!$template) {
+                $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';
+            }
             /**

              * Filter the information template path.

              *

@@ -219,7 +228,9 @@ 
             if (!$is_current_user_owner) {

                 $template = geodir_locate_template('information');

 

-                if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';

+                if (!$template) {
+                    $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';
+                }
                 /**

                  * Filter the information template path.

                  *

@@ -241,7 +252,9 @@ 
 

         $template = geodir_locate_template('add-listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';

+        if (!$template) {
+            $template = geodir_plugin_path() . '/geodirectory-templates/add-listing.php';
+        }
         /**

          * Filter the add listing template path.

          *

@@ -258,7 +271,9 @@ 
 

         $template = geodir_locate_template('preview');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) {
+            $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';
+        }
         /**

          * Filter the preview template path.

          *

@@ -274,7 +289,9 @@ 
 

         $template = geodir_locate_template('success');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';

+        if (!$template) {
+            $template = geodir_plugin_path() . '/geodirectory-templates/listing-success.php';
+        }
         /**

          * Filter the success template path.

          *

@@ -289,7 +306,9 @@ 
 

         $template = geodir_locate_template('detail');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';

+        if (!$template) {
+            $template = geodir_plugin_path() . '/geodirectory-templates/listing-detail.php';
+        }
         /**

          * Filter the detail template path.

          *

@@ -304,7 +323,9 @@ 
 

         $template = geodir_locate_template('listing');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';

+        if (!$template) {
+            $template = geodir_plugin_path() . '/geodirectory-templates/geodir-listing.php';
+        }
         /**

          * Filter the listing template path.

          *

@@ -319,7 +340,9 @@ 
 

         $template = geodir_locate_template('search');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';

+        if (!$template) {
+            $template = geodir_plugin_path() . '/geodirectory-templates/geodir-search.php';
+        }
         /**

          * Filter the search template path.

          *

@@ -334,7 +357,9 @@ 
 

         $template = geodir_locate_template('author');

 

-        if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';

+        if (!$template) {
+            $template = geodir_plugin_path() . '/geodirectory-templates/geodir-author.php';
+        }
         /**

          * Filter the author template path.

          *

@@ -355,7 +380,9 @@ 
 

             $template = geodir_locate_template('geodir-home');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';

+            if (!$template) {
+                $template = geodir_plugin_path() . '/geodirectory-templates/geodir-home.php';
+            }
             /**

              * Filter the home page template path.

              *

@@ -368,7 +395,9 @@ 
 

             $template = geodir_locate_template('location');

 

-            if (!$template) $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';

+            if (!$template) {
+                $template = geodir_plugin_path() . '/geodirectory-templates/geodir-location.php';
+            }
             /**

              * Filter the location template path.

              *

@@ -377,8 +406,9 @@ 
              */

             return $template = apply_filters('geodir_template_location', $template);

 

-        } else

-            return $template;

+        } else {
+                    return $template;
+        }
 

     }

 

@@ -432,8 +462,10 @@ 
          * @since 1.0.0

          */

         include($template);

-    else:

-        locate_template(array("geodirectory/" . $template_name), true, false);

+    else {
+        :

+        locate_template(array("geodirectory/" . $template_name), true, false);
+    }
     endif;

 

 }

geodirectory_template_tags.php

Indentation +29 added lines, -29 removed lines

@@ -184,17 +184,17 @@ 
 

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

     if ($is_detail_page) {

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

-	}

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

+    }

 

     // font awesome rating script

-	if (get_option('geodir_reviewrating_enable_font_awesome')) {

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

-		wp_enqueue_script('geodir-barrating-js');

-	} else { // default rating script

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

-		wp_enqueue_script('geodir-jRating-js');

-	}

+    if (get_option('geodir_reviewrating_enable_font_awesome')) {

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

+        wp_enqueue_script('geodir-barrating-js');

+    } else { // default rating script

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

+        wp_enqueue_script('geodir-jRating-js');

+    }

 

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

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

@@ -230,7 +230,7 @@ 
  */

 function geodir_footer_scripts()

 {	

-	echo stripslashes(get_option('geodir_ga_tracking_code'));

+    echo stripslashes(get_option('geodir_ga_tracking_code'));

     echo stripslashes(get_option('geodir_footer_scripts'));

 }

 

@@ -363,9 +363,9 @@ 
         return;

 

     if (!is_single()) {

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

+        }

         $numposts = $wp_query->found_posts;

 

 

@@ -376,22 +376,22 @@ 
         }

 

         if ($max_page > 1 || $always_show) {

-			// Extra pagination info

-			$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

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

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

+            // Extra pagination info

+            $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

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

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

 			

-			if ($geodir_pagination_more_info != '') {

-				$pagination_info = '<div class="gd-pagination-details">' . wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts) . '</div>';

+            if ($geodir_pagination_more_info != '') {

+                $pagination_info = '<div class="gd-pagination-details">' . wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts) . '</div>';

 				

-				if ($geodir_pagination_more_info == 'before') {

-					$before = $before . $pagination_info;

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

-					$after = $pagination_info . $after;

-				}

-			}

+                if ($geodir_pagination_more_info == 'before') {

+                    $before = $before . $pagination_info;

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

+                    $after = $pagination_info . $after;

+                }

+            }

 			

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

+            echo "$before <div class='Navi'>";

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

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

             }

@@ -412,9 +412,9 @@ 
             echo "</div> $after";

         }

 		

-		if (function_exists('geodir_location_geo_home_link')) {

-			add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

-		}

+        if (function_exists('geodir_location_geo_home_link')) {

+            add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

+        }

     }

 }

 

Spacing +35 added lines, -35 removed lines

@@ -37,7 +37,7 @@ 
 {

     $is_detail_page = false;

 

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

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

         $is_detail_page = true;

     }

 

@@ -51,7 +51,7 @@ 
         'siteurl' => get_option('siteurl'),

         'geodir_plugin_url' => geodir_plugin_url(),

         'geodir_ajax_url' => geodir_get_ajax_url(),

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

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

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

     );

 

@@ -72,25 +72,25 @@ 
      *

      * }

      */

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

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

 

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

 

 

 

 

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

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

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

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

 

 

 

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

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

     wp_enqueue_script('geodirectory-lightbox-jquery');

 

 

 

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

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

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

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

 

 

     //if( get_option('geodir_enqueue_google_api_script')==1)

@@ -111,7 +111,7 @@ 
             wp_enqueue_script( 'geodirectory-googlemap-script' );

            }

         */

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

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

     wp_enqueue_script('geodirectory-goMap-script');

 

 

@@ -133,7 +133,7 @@ 
         wp_enqueue_script('plupload-all');

         wp_enqueue_script('jquery-ui-sortable');

 

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

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

         wp_enqueue_script('geodirectory-plupload-script');

 

         // SCRIPT FOR UPLOAD END

@@ -245,12 +245,12 @@ 
  */

 function geodir_add_async_forscript($url)

 {

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

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

         return $url;

     else if (is_admin())

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

     else

-        return str_replace('#asyncload', '', $url)."' async='async";

+        return str_replace('#asyncload', '', $url) . "' async='async";

 }

 add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);

 

@@ -264,7 +264,7 @@ 
 {

 

 

-    if(get_option('geodir_scss_core')) {

+    if (get_option('geodir_scss_core')) {

 

 

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

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

         wp_enqueue_style('geodir-chosen-style');

 

-    }else{

+    } else {

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

         wp_enqueue_style('geodir-core-scss');

 

@@ -306,7 +306,7 @@ 
 

     }

 

-    if(is_rtl()){

+    if (is_rtl()) {

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

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

     }

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

 			// Extra pagination info

 			$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

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

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

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

 			

 			if ($geodir_pagination_more_info != '') {

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

             $("#distance_slider").slider({

                 range: true,

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

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

                 min: 0,

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

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

@@ -510,7 +510,7 @@ 
 

 

     <script type="text/javascript">

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

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

         var latlng;

         var Sgeocoder;

         var address;

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

 				

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

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

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

 				

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

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

@@ -537,7 +537,7 @@ 
 					}

 				}

 				

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

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

 					geodir_setsearch($form);

 				} else {

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

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

         

 		function geodir_setsearch($form) {

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

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

 			geocodeAddress($form);

 		}

 

@@ -570,8 +570,8 @@ 
         function geocodeAddress($form) {

             Sgeocoder = new google.maps.Geocoder(); // Call the geocode function

 

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

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

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

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

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

                 }

                 jQuery($form).submit();

@@ -579,24 +579,24 @@ 
 

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

 

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

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

                     initialise2();

                 } else {

 

                     Sgeocoder.geocode({'address': address<?php

-                    if($near_add = get_option('geodir_search_near_addition')){echo '+", '.$near_add.'"';}

-                    if($near_add2 =

+                    if ($near_add = get_option('geodir_search_near_addition')) {echo '+", ' . $near_add . '"'; }

+                    if ($near_add2 =

                     /**

                      * Adds any extra info to the near search box query when trying to geolocate it via google api.

                      *

                      * @since 1.0.0

                      */

-                    apply_filters('geodir_search_near_addition','')){echo $near_add2;}//gt_advanced_near_search();?>},

+                    apply_filters('geodir_search_near_addition', '')) {echo $near_add2; }//gt_advanced_near_search();?>},

                         function (results, status) {

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

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

                             } else {

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

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

                             }

                         });

                 }

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

             switch (err.code) {

                 case err.UNKNOWN_ERROR:

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

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

                     break;

                 case err.PERMISSION_DENINED:

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

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

                     break;

                 case err.POSITION_UNAVAILABLE:

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

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

                     break;

                 case err.BREAK:

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

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

                     break;

                 default:

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

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

             }

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

         }

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

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

              */

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

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

             break;

         case 'new' :

             /**

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

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

              */

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

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

             break;

 

     }

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

  */

Spacing +53 added lines, -53 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;

             }

         }

 

@@ -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,7 +251,7 @@ 
         }

 

         // 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'])) {

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

 

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

             }

 

@@ -658,7 +658,7 @@ 
 

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

@@ -928,7 +928,7 @@ 
                 $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] : '';

 

@@ -985,20 +985,20 @@ 
                         }

 

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

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

 

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

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

 

                     }

 

@@ -1113,7 +1113,7 @@ 
 

             }

 

-            $invalid_files = (object)$invalid_files;

+            $invalid_files = (object) $invalid_files;

         }

 

         $remove_files[] = $post_id;

@@ -1247,7 +1247,7 @@ 
         }

 

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

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

             $imagesize = getimagesize($img_arr['path']);

             $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : 0;

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

     }

@@ -1436,7 +1436,7 @@ 
                 * @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['src'] = apply_filters('geodir_get_images_src', $uploads_url . '/' . $file_name, $file_name, $uploads_url, $uploads_baseurl);

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

                 $imagesize = getimagesize($img_arr['path']);

                 $width = !empty($imagesize) && isset($imagesize[0]) ? $imagesize[0] : 0;

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

@@ -1489,7 +1489,7 @@ 
                 $img_arr['title'] = $file_name; // add the title to the array

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

 

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

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

 

                 return $return_arr;

             } else

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

@@ -1528,10 +1528,10 @@ 
              * 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);

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

             }

 

             $imagesize = getimagesize($request->path);

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

 

@@ -1555,10 +1555,10 @@ 
                         $width_per = 100;

                 }

 

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

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

+                else {

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

                 }

 

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

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

                             }

                         }

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

@@ -1941,10 +1941,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); ?>

@@ -2239,7 +2239,7 @@ 
          */

         do_action('geodir_before_add_from_favorite', $post_id);

 

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

 

         /**

          * Called after adding the post from favourites.

@@ -2318,7 +2318,7 @@ 
          */

         do_action('geodir_before_remove_from_favorite', $post_id);

 

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

 

         /**

          * Called after removing the post from favourites.

@@ -2413,10 +2413,10 @@ 
             $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 {

@@ -2426,11 +2426,11 @@ 
             } 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>

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

     }

 }

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

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

 

     }

geodirectory-admin/admin_functions.php

Indentation +891 added lines, -891 removed lines

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

 /**

- * Admin functions.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * Admin functions.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

 

 /**

  * Updates option value when GeoDirectory get deactivated.

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

         wp_enqueue_script('geodirectory-goMap-script');

 

-		// font awesome rating script

-		if (get_option('geodir_reviewrating_enable_font_awesome')) {

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

-			wp_enqueue_script('geodir-barrating-js');

-		} else { // default rating script

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

-			wp_enqueue_script('geodir-jRating-js');

-		}

+        // font awesome rating script

+        if (get_option('geodir_reviewrating_enable_font_awesome')) {

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

+            wp_enqueue_script('geodir-barrating-js');

+        } else { // default rating script

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

+            wp_enqueue_script('geodir-jRating-js');

+        }

 

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

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

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

 

                 break;

-			case 'fail':

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

+            case 'fail':

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

 				

-				if ($gderr == 21)

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

-				else

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

+                if ($gderr == 21)

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

+                else

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

                 break;

         }

     }

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

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

 		

-		/**

-		 * Fires before updating geodirectory admin settings.

-		 *

-		 * @since 1.4.2

-		 *

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

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

-		 */

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

+        /**

+         * Fires before updating geodirectory admin settings.

+         *

+         * @since 1.4.2

+         *

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

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

+         */

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

 		

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

             geodir_update_options($geodir_settings[$current_tab]);

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

 

                     $default_location = geodir_get_default_location();

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

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

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

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

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

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

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

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

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

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

 

                 ?>

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

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

 function geodir_update_options($options, $dummy = false)

 {

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

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

 

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

 

@@ -2253,10 +2253,10 @@ 
                                            <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

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

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

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

-                                           } else {

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

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

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

+                                            } else {

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

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

                 </tr><?php

                 break;

 

@@ -2270,10 +2270,10 @@ 
                                            <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

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

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

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

-                                           } else {

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

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

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

+                                            } else {

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

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

                 </tr><?php

                 break;

 

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

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

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

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

-                                           } else {

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

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

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

+                                            } else {

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

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

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

 

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

@@ -2685,22 +2685,22 @@ 
 

             case 'single_select_page' :

                 // WPML

-				$switch_lang = false;

-				$disabled = '';

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

-					global $sitepress;

+                $switch_lang = false;

+                $disabled = '';

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

+                    global $sitepress;

 					

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

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

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

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

 					

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

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

-						$switch_lang = $current_lang;

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

-					}

-				}

-				//

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

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

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

+                        $switch_lang = $current_lang;

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

+                    }

+                }

+                //

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

 

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

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

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

                 </td>

                 </tr><?php

-				if ($switch_lang) {

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

-				}

+                if ($switch_lang) {

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

+                }

                 break;

             case 'single_select_country' :

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

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

  */

 function geodir_admin_current_post_type() {

-	global $post, $typenow, $current_screen;

+    global $post, $typenow, $current_screen;

 	

-	$post_type = NULL;

+    $post_type = NULL;

 	

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

-		$post_type = $post->post_type;

-	elseif ($typenow)

-		$post_type = $typenow;

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

-		$post_type = $current_screen->post_type;

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

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

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

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

-

-	return $post_type;

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

+        $post_type = $post->post_type;

+    elseif ($typenow)

+        $post_type = $typenow;

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

+        $post_type = $current_screen->post_type;

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

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

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

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

+

+    return $post_type;

 }

 

 /**

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

  */

 function geodir_before_update_options($current_tab, $geodir_settings) {

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

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

 		

-	// Permalink settings

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

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

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

+    // Permalink settings

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

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

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

 		

-		// Don't allow same slug url for listing and location

-		if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {

-			$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');

-        	wp_redirect($redirect_url);

-			exit;

-		}

+        // Don't allow same slug url for listing and location

+        if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {

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

+            wp_redirect($redirect_url);

+            exit;

+        }

 		

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

-		if (geodir_is_wpml()) {

-			global $sitepress;

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

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

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

+        if (geodir_is_wpml()) {

+            global $sitepress;

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

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

 			

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

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

-				wp_redirect($redirect_url);

-				exit;

-			}

-		}

-	}

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

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

+                wp_redirect($redirect_url);

+                exit;

+            }

+        }

+    }

 }

 

 

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

  */

 function geodir_import_export_tab( $tabs ) {

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

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

     return $tabs;

 }

 

@@ -3456,8 +3456,8 @@ 
  * @return string Html content.

  */

 function geodir_import_export_page() {

-	$nonce = wp_create_nonce( 'geodir_import_export_nonce' );

-	$gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';

+    $nonce = wp_create_nonce( 'geodir_import_export_nonce' );

+    $gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';

     /**

      * Filter sample category data csv file url.

      *

@@ -3466,9 +3466,9 @@ 
      *

      * @param string $gd_cats_sample_csv Sample category data csv file url.

      */

-	$gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv );

+    $gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv );

 	

-	$gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';

+    $gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';

     /**

      * Filter sample post data csv file url.

      *

@@ -3479,42 +3479,42 @@ 
      */

     $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );

 	

-	$gd_posttypes = geodir_get_posttypes( 'array' );

+    $gd_posttypes = geodir_get_posttypes( 'array' );

 	

-	$gd_posttypes_option = '';

-	foreach ( $gd_posttypes as $gd_posttype => $row ) {

-		$gd_posttypes_option .= '<option value="' . $gd_posttype . '" data-cats="' . (int)geodir_get_terms_count( $gd_posttype ) . '" data-posts="' . (int)geodir_get_posts_count( $gd_posttype ) . '">' . __( $row['labels']['name'], 'geodirectory' ) . '</option>';

-	}

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

+    $gd_posttypes_option = '';

+    foreach ( $gd_posttypes as $gd_posttype => $row ) {

+        $gd_posttypes_option .= '<option value="' . $gd_posttype . '" data-cats="' . (int)geodir_get_terms_count( $gd_posttype ) . '" data-posts="' . (int)geodir_get_posts_count( $gd_posttype ) . '">' . __( $row['labels']['name'], 'geodirectory' ) . '</option>';

+    }

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

 	

-	$gd_chunksize_options = array();

-	$gd_chunksize_options[100] = 100;

-	$gd_chunksize_options[200] = 200;

-	$gd_chunksize_options[500] = 500;

-	$gd_chunksize_options[1000] = 1000;

-	$gd_chunksize_options[2000] = 2000;

-	$gd_chunksize_options[5000] = 5000;

-	$gd_chunksize_options[10000] = 10000;

-	$gd_chunksize_options[20000] = 20000;

-	$gd_chunksize_options[50000] = 50000;

-	$gd_chunksize_options[100000] = 100000;

+    $gd_chunksize_options = array();

+    $gd_chunksize_options[100] = 100;

+    $gd_chunksize_options[200] = 200;

+    $gd_chunksize_options[500] = 500;

+    $gd_chunksize_options[1000] = 1000;

+    $gd_chunksize_options[2000] = 2000;

+    $gd_chunksize_options[5000] = 5000;

+    $gd_chunksize_options[10000] = 10000;

+    $gd_chunksize_options[20000] = 20000;

+    $gd_chunksize_options[50000] = 50000;

+    $gd_chunksize_options[100000] = 100000;

 	 

-	 /**

-     * Filter max entries per export csv file.

-     *

-     * @since 1.5.6

-     * @package GeoDirectory

-     *

-     * @param string $gd_chunksize_options Entries options.

-     */

+        /**

+         * Filter max entries per export csv file.

+         *

+         * @since 1.5.6

+         * @package GeoDirectory

+         *

+         * @param string $gd_chunksize_options Entries options.

+         */

     $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

 	

-	$gd_chunksize_option = '';

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

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

-	}

+    $gd_chunksize_option = '';

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

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

+    }

 	

-	$uploads = wp_upload_dir();

+    $uploads = wp_upload_dir();

 ?>

 </form>

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

@@ -3576,13 +3576,13 @@ 
 							<input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">

 						<input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv;?>" />

 							<?php

-							/**

-							 * Called just after the sample CSV download link.

-							 *

-							 * @since 1.0.0

-							 */

-							do_action('geodir_sample_csv_download_link');

-							?>

+                            /**

+                             * Called just after the sample CSV download link.

+                             *

+                             * @since 1.0.0

+                             */

+                            do_action('geodir_sample_csv_download_link');

+                            ?>

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

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

 						</div>

@@ -3690,14 +3690,14 @@ 
 							<input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">

 						<input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv;?>" />

 						<?php

-						/**

-						 * Called just after the sample CSV download link.

-						 *

-						 * @since 1.0.0

+                        /**

+                         * Called just after the sample CSV download link.

+                         *

+                         * @since 1.0.0

                          * @package GeoDirectory

-						 */

-						do_action('geodir_sample_cats_csv_download_link');

-						?>

+                         */

+                        do_action('geodir_sample_cats_csv_download_link');

+                        ?>

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

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

 						</div>

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

     </div>

 	<?php

-	/**

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

-	 *

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

-	 * @since 1.4.6

+    /**

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

+     *

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

+     * @since 1.4.6

      * @package GeoDirectory

-	 *

-	 * @param array $gd_posttypes GD post types.

+     *

+     * @param array $gd_posttypes GD post types.

      * @param array $gd_chunksize_options File chunk size options.

      * @param string $nonce Wordpress security token for GD import & export.

-	 */

-	do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce );

-	?>

+     */

+    do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce );

+    ?>

   </div>

 </div>

 <script type="text/javascript">

@@ -5760,32 +5760,32 @@ 
  * @return int|bool Term id when success, false when fail.

  */

 function geodir_imex_insert_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

-		return false;

-	}

+    if ( empty( $taxonomy ) || empty( $term_data ) ) {

+        return false;

+    }

 	

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

-	$args = array();

-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

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

+    $args = array();

+    $args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

+    $args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

+    $args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

 	

-	if ( ( !empty( $args['slug'] ) && term_exists( $args['slug'], $taxonomy ) ) || empty( $args['slug'] ) ) {

-		$term_args = array_merge( $term_data, $args );

-		$defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');

-		$term_args = wp_parse_args( $term_args, $defaults );

-		$term_args = sanitize_term( $term_args, $taxonomy, 'db' );

-		$args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );

-	}

+    if ( ( !empty( $args['slug'] ) && term_exists( $args['slug'], $taxonomy ) ) || empty( $args['slug'] ) ) {

+        $term_args = array_merge( $term_data, $args );

+        $defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');

+        $term_args = wp_parse_args( $term_args, $defaults );

+        $term_args = sanitize_term( $term_args, $taxonomy, 'db' );

+        $args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );

+    }

 	

     if( !empty( $term ) ) {

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

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

         if( !is_wp_error( $result ) ) {

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

         }

     }

 	

-	return false;

+    return false;

 }

 

 /**

@@ -5812,39 +5812,39 @@ 
  * @return int|bool Term id when success, false when fail.

  */

 function geodir_imex_update_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

-		return false;

-	}

+    if ( empty( $taxonomy ) || empty( $term_data ) ) {

+        return false;

+    }

 	

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

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

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

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

 	

-	$args = array();

-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

+    $args = array();

+    $args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

+    $args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

+    $args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

 	

-	if ( $term_id > 0 && $term_info = (array)get_term( $term_id, $taxonomy ) ) {

-		$term_data['term_id'] = $term_info['term_id'];

+    if ( $term_id > 0 && $term_info = (array)get_term( $term_id, $taxonomy ) ) {

+        $term_data['term_id'] = $term_info['term_id'];

 		

-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

+        $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

 		

-		if( !is_wp_error( $result ) ) {

+        if( !is_wp_error( $result ) ) {

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

         }

-	} else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

-		$term_data['term_id'] = $term_info['term_id'];

+    } else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+        $term_data['term_id'] = $term_info['term_id'];

 		

-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

+        $result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

 		

-		if( !is_wp_error( $result ) ) {

+        if( !is_wp_error( $result ) ) {

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

         }

-	} else {

-		return geodir_imex_insert_term( $taxonomy, $term_data );

-	}

+    } else {

+        return geodir_imex_insert_term( $taxonomy, $term_data );

+    }

 	

-	return false;

+    return false;

 }

 

 /**

@@ -5857,21 +5857,21 @@ 
  * @return int Posts count.

  */

 function geodir_get_posts_count( $post_type ) {

-	$posts_count = wp_count_posts( $post_type );

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

+    $posts_count = wp_count_posts( $post_type );

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

 	

-	/**

-	 * Modify returned post counts for the current post type.

-	 *

-	 * @since 1.4.6

+    /**

+     * Modify returned post counts for the current post type.

+     *

+     * @since 1.4.6

      * @package GeoDirectory

-	 *

-	 * @param int $posts_count Post counts.

-	 * @param string $post_type Post type.

-	 */

-	$posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );	 

+     *

+     * @param int $posts_count Post counts.

+     * @param string $post_type Post type.

+     */

+    $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );	 

 	

-	return $posts_count;

+    return $posts_count;

 }

 

 /**

@@ -5888,18 +5888,18 @@ 
  * @return int Posts count.

  */

 function geodir_imex_count_events( $posts_count, $post_type ) {

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

-		global $wpdb, $plugin_prefix;

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

+        global $wpdb, $plugin_prefix;

 		

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

-		$schedule_table = EVENT_SCHEDULE;

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

+        $schedule_table = EVENT_SCHEDULE;

 

-		$query = "SELECT COUNT({$wpdb->posts}.ID) AS total FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s";

+        $query = "SELECT COUNT({$wpdb->posts}.ID) AS total FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s";

 		

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

-	}

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

+    }

 	

-	return $posts_count;

+    return $posts_count;

 }

 

 /**

@@ -5919,290 +5919,290 @@ 
  * @return array Array of posts data.

  */

 function geodir_imex_get_posts( $post_type, $per_page = 0, $page_no = 0 ) {	

-	global $wp_filesystem;

+    global $wp_filesystem;

 

-	$posts = geodir_get_export_posts( $post_type, $per_page, $page_no );

+    $posts = geodir_get_export_posts( $post_type, $per_page, $page_no );

 

-	$csv_rows = array();

+    $csv_rows = array();

 	

-	if ( !empty( $posts ) ) {

-		$is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' );

+    if ( !empty( $posts ) ) {

+        $is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' );

 		

-		$csv_row = array();

-		$csv_row[] = 'post_id';

-		$csv_row[] = 'post_title';

-		$csv_row[] = 'post_author';

-		$csv_row[] = 'post_content';

-		$csv_row[] = 'post_category';

-		$csv_row[] = 'default_category';

-		$csv_row[] = 'post_tags';

-		$csv_row[] = 'post_type';

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

-			$csv_row[] = 'event_date';

-			$csv_row[] = 'event_enddate';

-			$csv_row[] = 'starttime';

-			$csv_row[] = 'endtime';

+        $csv_row = array();

+        $csv_row[] = 'post_id';

+        $csv_row[] = 'post_title';

+        $csv_row[] = 'post_author';

+        $csv_row[] = 'post_content';

+        $csv_row[] = 'post_category';

+        $csv_row[] = 'default_category';

+        $csv_row[] = 'post_tags';

+        $csv_row[] = 'post_type';

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

+            $csv_row[] = 'event_date';

+            $csv_row[] = 'event_enddate';

+            $csv_row[] = 'starttime';

+            $csv_row[] = 'endtime';

 			

-			$csv_row[] = 'is_recurring_event';

-			$csv_row[] = 'event_duration_days';

-			$csv_row[] = 'recurring_dates';

-			$csv_row[] = 'is_whole_day_event';

-			$csv_row[] = 'event_starttimes';

-			$csv_row[] = 'event_endtimes';

-			$csv_row[] = 'recurring_type';

-			$csv_row[] = 'recurring_interval';

-			$csv_row[] = 'recurring_week_days';

-			$csv_row[] = 'recurring_week_nos';

-			$csv_row[] = 'max_recurring_count';

-			$csv_row[] = 'recurring_end_date';

-		}

-		$csv_row[] = 'post_status';

-		$csv_row[] = 'is_featured';

-		if ($is_payment_plugin) {

-			$csv_row[] = 'package_id';

-			$csv_row[] = 'expire_date';

-		}

-		$csv_row[] = 'geodir_video';

-		$csv_row[] = 'post_address';

-		$csv_row[] = 'post_city';

-		$csv_row[] = 'post_region';

-		$csv_row[] = 'post_country';

-		$csv_row[] = 'post_zip';

-		$csv_row[] = 'post_latitude';

-		$csv_row[] = 'post_longitude';

-		$csv_row[] = 'geodir_timing';

-		$csv_row[] = 'geodir_contact';

-		$csv_row[] = 'geodir_email';

-		$csv_row[] = 'geodir_website';

-		$csv_row[] = 'geodir_twitter';

-		$csv_row[] = 'geodir_facebook';

-		$csv_row[] = 'geodir_video';

-		$csv_row[] = 'geodir_special_offers';

-		// WPML

-		$is_wpml = geodir_is_wpml();

-		if ($is_wpml) {

-			$csv_row[] = 'language';

-			$csv_row[] = 'original_post_id';

-		}

-		// WPML

+            $csv_row[] = 'is_recurring_event';

+            $csv_row[] = 'event_duration_days';

+            $csv_row[] = 'recurring_dates';

+            $csv_row[] = 'is_whole_day_event';

+            $csv_row[] = 'event_starttimes';

+            $csv_row[] = 'event_endtimes';

+            $csv_row[] = 'recurring_type';

+            $csv_row[] = 'recurring_interval';

+            $csv_row[] = 'recurring_week_days';

+            $csv_row[] = 'recurring_week_nos';

+            $csv_row[] = 'max_recurring_count';

+            $csv_row[] = 'recurring_end_date';

+        }

+        $csv_row[] = 'post_status';

+        $csv_row[] = 'is_featured';

+        if ($is_payment_plugin) {

+            $csv_row[] = 'package_id';

+            $csv_row[] = 'expire_date';

+        }

+        $csv_row[] = 'geodir_video';

+        $csv_row[] = 'post_address';

+        $csv_row[] = 'post_city';

+        $csv_row[] = 'post_region';

+        $csv_row[] = 'post_country';

+        $csv_row[] = 'post_zip';

+        $csv_row[] = 'post_latitude';

+        $csv_row[] = 'post_longitude';

+        $csv_row[] = 'geodir_timing';

+        $csv_row[] = 'geodir_contact';

+        $csv_row[] = 'geodir_email';

+        $csv_row[] = 'geodir_website';

+        $csv_row[] = 'geodir_twitter';

+        $csv_row[] = 'geodir_facebook';

+        $csv_row[] = 'geodir_video';

+        $csv_row[] = 'geodir_special_offers';

+        // WPML

+        $is_wpml = geodir_is_wpml();

+        if ($is_wpml) {

+            $csv_row[] = 'language';

+            $csv_row[] = 'original_post_id';

+        }

+        // WPML

 

-		$custom_fields = geodir_imex_get_custom_fields( $post_type );

-		if ( !empty( $custom_fields ) ) {

-			foreach ( $custom_fields as $custom_field ) {

-				$csv_row[] = $custom_field->htmlvar_name;

-			}

-		}

+        $custom_fields = geodir_imex_get_custom_fields( $post_type );

+        if ( !empty( $custom_fields ) ) {

+            foreach ( $custom_fields as $custom_field ) {

+                $csv_row[] = $custom_field->htmlvar_name;

+            }

+        }

 

-		// Export franchise fields

-		$is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

-		if ($is_franchise_active) {

-			$csv_row[] = 'gd_is_franchise';

-			$csv_row[] = 'gd_franchise_lock';

-			$csv_row[] = 'franchise';

-		}

+        // Export franchise fields

+        $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+        if ($is_franchise_active) {

+            $csv_row[] = 'gd_is_franchise';

+            $csv_row[] = 'gd_franchise_lock';

+            $csv_row[] = 'franchise';

+        }

 		

-		$csv_rows[] = $csv_row;

+        $csv_rows[] = $csv_row;

 

-		$images_count = 5;

+        $images_count = 5;

         $xx=0;

-		foreach ( $posts as $post ) {$xx++;

-			$post_id = $post['ID'];

+        foreach ( $posts as $post ) {$xx++;

+            $post_id = $post['ID'];

 			

-			$gd_post_info = geodir_get_post_info( $post_id );

-			$post_info = (array)$gd_post_info;

+            $gd_post_info = geodir_get_post_info( $post_id );

+            $post_info = (array)$gd_post_info;

 						

-			$taxonomy_category = $post_type . 'category';

-			$taxonomy_tags = $post_type . '_tags';

+            $taxonomy_category = $post_type . 'category';

+            $taxonomy_tags = $post_type . '_tags';

 			

-			$post_category = '';

-			$default_category_id = $gd_post_info->default_category;

-			$default_category = '';

-			$post_tags = '';

-			$terms = wp_get_post_terms( $post_id, array( $taxonomy_category, $taxonomy_tags ) );

+            $post_category = '';

+            $default_category_id = $gd_post_info->default_category;

+            $default_category = '';

+            $post_tags = '';

+            $terms = wp_get_post_terms( $post_id, array( $taxonomy_category, $taxonomy_tags ) );

 			

-			if ( !empty( $terms ) && !is_wp_error( $terms ) ) {

-				$post_category = array();

-				$post_tags = array();

+            if ( !empty( $terms ) && !is_wp_error( $terms ) ) {

+                $post_category = array();

+                $post_tags = array();

 			

-				foreach ( $terms as $term ) {

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

-						$post_category[] = $term->name;

+                foreach ( $terms as $term ) {

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

+                        $post_category[] = $term->name;

 						

-						if ($default_category_id == $term->term_id) {

-							$default_category = $term->name; // Default category.

-						}

-					}

+                        if ($default_category_id == $term->term_id) {

+                            $default_category = $term->name; // Default category.

+                        }

+                    }

 					

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

-						$post_tags[] = $term->name;

-					}

-				}

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

+                        $post_tags[] = $term->name;

+                    }

+                }

 				

-				if (empty($default_category) && !empty($post_category)) {

-					$default_category = $post_category[0]; // Set first one as default category.

-				}

-				$post_category = !empty( $post_category ) ? implode( ',', $post_category ) : '';

-				$post_tags = !empty( $post_tags ) ? implode( ',', $post_tags ) : '';

-			}

+                if (empty($default_category) && !empty($post_category)) {

+                    $default_category = $post_category[0]; // Set first one as default category.

+                }

+                $post_category = !empty( $post_category ) ? implode( ',', $post_category ) : '';

+                $post_tags = !empty( $post_tags ) ? implode( ',', $post_tags ) : '';

+            }

 

-			// Franchise data

-			$franchise_id = NULL;

-			$franchise_info = array();

-			$locked_fields = array();

+            // Franchise data

+            $franchise_id = NULL;

+            $franchise_info = array();

+            $locked_fields = array();

 			

-			if ($is_franchise_active && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 && geodir_franchise_check((int)$post_info['franchise'])) {

-				$franchise_id = $post_info['franchise'];

-				$gd_franchise_info = geodir_get_post_info($franchise_id);

+            if ($is_franchise_active && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 && geodir_franchise_check((int)$post_info['franchise'])) {

+                $franchise_id = $post_info['franchise'];

+                $gd_franchise_info = geodir_get_post_info($franchise_id);

 

-				if (geodir_franchise_pkg_is_active($gd_franchise_info)) {

-					$franchise_info = (array)$gd_franchise_info;

-					$locked_fields = geodir_franchise_get_locked_fields($franchise_id, true);

+                if (geodir_franchise_pkg_is_active($gd_franchise_info)) {

+                    $franchise_info = (array)$gd_franchise_info;

+                    $locked_fields = geodir_franchise_get_locked_fields($franchise_id, true);

 					

-					if (!empty($locked_fields)) {

-						foreach( $locked_fields as $locked_field) {

-							if (isset($post_info[$locked_field]) && isset($franchise_info[$locked_field])) {

-								$post_info[$locked_field] = $franchise_info[$locked_field];

-							}

+                    if (!empty($locked_fields)) {

+                        foreach( $locked_fields as $locked_field) {

+                            if (isset($post_info[$locked_field]) && isset($franchise_info[$locked_field])) {

+                                $post_info[$locked_field] = $franchise_info[$locked_field];

+                            }

 							

-							if (in_array($taxonomy_category, $locked_fields) || in_array('post_tags', $locked_fields)) {

-								$franchise_terms = wp_get_post_terms( $franchise_id, array( $taxonomy_category, $taxonomy_tags ) );

+                            if (in_array($taxonomy_category, $locked_fields) || in_array('post_tags', $locked_fields)) {

+                                $franchise_terms = wp_get_post_terms( $franchise_id, array( $taxonomy_category, $taxonomy_tags ) );

 			

-								if ( !empty( $franchise_terms ) && !is_wp_error( $franchise_terms ) ) {

-									$franchise_post_category = array();

-									$franchise_post_tags = array();

+                                if ( !empty( $franchise_terms ) && !is_wp_error( $franchise_terms ) ) {

+                                    $franchise_post_category = array();

+                                    $franchise_post_tags = array();

 								

-									foreach ( $franchise_terms as $franchise_term ) {

-										if ( $franchise_term->taxonomy == $taxonomy_category ) {

-											$franchise_post_category[] = $franchise_term->name;

-										}

+                                    foreach ( $franchise_terms as $franchise_term ) {

+                                        if ( $franchise_term->taxonomy == $taxonomy_category ) {

+                                            $franchise_post_category[] = $franchise_term->name;

+                                        }

 										

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

-											$franchise_post_tags[] = $franchise_term->name;

-										}

-									}

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

+                                            $franchise_post_tags[] = $franchise_term->name;

+                                        }

+                                    }

 									

-									if (in_array($taxonomy_category, $locked_fields)) {

-										$post_category = !empty( $franchise_post_category ) ? implode( ',', $franchise_post_category ) : '';

-									}

-									if (in_array('post_tags', $locked_fields)) {

-										$post_tags = !empty( $franchise_post_tags ) ? implode( ',', $franchise_post_tags ) : '';

-									}

-								}

-							}

-						}

-					}

-				}

-			}

+                                    if (in_array($taxonomy_category, $locked_fields)) {

+                                        $post_category = !empty( $franchise_post_category ) ? implode( ',', $franchise_post_category ) : '';

+                                    }

+                                    if (in_array('post_tags', $locked_fields)) {

+                                        $post_tags = !empty( $franchise_post_tags ) ? implode( ',', $franchise_post_tags ) : '';

+                                    }

+                                }

+                            }

+                        }

+                    }

+                }

+            }

 						

-			$post_images = geodir_get_images( $post_id );

-			$current_images = array();

-			if ( !empty( $post_images ) ) {

-				foreach ( $post_images as $post_image ) {

-					$post_image = (array)$post_image;

-					$image = !empty( $post_image ) && isset( $post_image['path'] ) && $wp_filesystem->is_file( $post_image['path'] ) && $wp_filesystem->exists( $post_image['path'] ) ? $post_image['src'] : '';

-					if ( $image ) {

-						$current_images[] = $image;

-					}

-				}

+            $post_images = geodir_get_images( $post_id );

+            $current_images = array();

+            if ( !empty( $post_images ) ) {

+                foreach ( $post_images as $post_image ) {

+                    $post_image = (array)$post_image;

+                    $image = !empty( $post_image ) && isset( $post_image['path'] ) && $wp_filesystem->is_file( $post_image['path'] ) && $wp_filesystem->exists( $post_image['path'] ) ? $post_image['src'] : '';

+                    if ( $image ) {

+                        $current_images[] = $image;

+                    }

+                }

 				

-				$images_count = max( $images_count, count( $current_images ) );

-			}

+                $images_count = max( $images_count, count( $current_images ) );

+            }

 

-			$csv_row = array();

-			$csv_row[] = $post_id; // post_id

-			$csv_row[] = $post_info['post_title']; // post_title

-			$csv_row[] = $post_info['post_author']; // post_author

-			$csv_row[] = $post_info['post_content']; // post_content

-			$csv_row[] = $post_category; // post_category

-			$csv_row[] = $default_category; // default_category

-			$csv_row[] = $post_tags; // post_tags

-			$csv_row[] = $post_type; // post_type

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

-				$event_data = geodir_imex_get_event_data($post, $gd_post_info);

-				$csv_row[] = $event_data['event_date']; // event_date

-				$csv_row[] = $event_data['event_enddate']; // enddate

-				$csv_row[] = $event_data['starttime']; // starttime

-				$csv_row[] = $event_data['endtime']; // endtime

+            $csv_row = array();

+            $csv_row[] = $post_id; // post_id

+            $csv_row[] = $post_info['post_title']; // post_title

+            $csv_row[] = $post_info['post_author']; // post_author

+            $csv_row[] = $post_info['post_content']; // post_content

+            $csv_row[] = $post_category; // post_category

+            $csv_row[] = $default_category; // default_category

+            $csv_row[] = $post_tags; // post_tags

+            $csv_row[] = $post_type; // post_type

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

+                $event_data = geodir_imex_get_event_data($post, $gd_post_info);

+                $csv_row[] = $event_data['event_date']; // event_date

+                $csv_row[] = $event_data['event_enddate']; // enddate

+                $csv_row[] = $event_data['starttime']; // starttime

+                $csv_row[] = $event_data['endtime']; // endtime

 				

-				$csv_row[] = $event_data['is_recurring_event']; // is_recurring

-				$csv_row[] = $event_data['event_duration_days']; // duration_x

-				$csv_row[] = $event_data['recurring_dates']; // recurring_dates

-				$csv_row[] = $event_data['is_whole_day_event']; // all_day

-				$csv_row[] = $event_data['event_starttimes']; // starttimes

-				$csv_row[] = $event_data['event_endtimes']; // endtimes

-				$csv_row[] = $event_data['recurring_type']; // repeat_type

-				$csv_row[] = $event_data['recurring_interval']; // repeat_x

-				$csv_row[] = $event_data['recurring_week_days']; // repeat_days

-				$csv_row[] = $event_data['recurring_week_nos']; // repeat_weeks

-				$csv_row[] = $event_data['max_recurring_count']; // max_repeat

-				$csv_row[] = $event_data['recurring_end_date']; // repeat_end

-			}

-			$csv_row[] = $post_info['post_status']; // post_status

-			$csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured

-			if ($is_payment_plugin) {

-				$csv_row[] = (int)$post_info['package_id']; // package_id

-				$csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date

-			}

-			$csv_row[] = $post_info['geodir_video']; // geodir_video

-			$csv_row[] = $post_info['post_address']; // post_address

-			$csv_row[] = $post_info['post_city']; // post_city

-			$csv_row[] = $post_info['post_region']; // post_region

-			$csv_row[] = $post_info['post_country']; // post_country

-			$csv_row[] = $post_info['post_zip']; // post_zip

-			$csv_row[] = $post_info['post_latitude']; // post_latitude

-			$csv_row[] = $post_info['post_longitude']; // post_longitude

-			$csv_row[] = $post_info['geodir_timing']; // geodir_timing

-			$csv_row[] = $post_info['geodir_contact']; // geodir_contact

-			$csv_row[] = $post_info['geodir_email']; // geodir_email

-			$csv_row[] = $post_info['geodir_website']; // geodir_website

-			$csv_row[] = $post_info['geodir_twitter']; // geodir_twitter

-			$csv_row[] = $post_info['geodir_facebook']; // geodir_facebook

-			$csv_row[] = $post_info['geodir_video']; // geodir_video

-			$csv_row[] = $post_info['geodir_special_offers']; // geodir_special_offers

-			// WPML

-			if ($is_wpml) {

-				$csv_row[] = geodir_get_language_for_element( $post_id, 'post_' . $post_type );

-				$csv_row[] = geodir_imex_original_post_id( $post_id, 'post_' . $post_type );

-			}

-			// WPML

+                $csv_row[] = $event_data['is_recurring_event']; // is_recurring

+                $csv_row[] = $event_data['event_duration_days']; // duration_x

+                $csv_row[] = $event_data['recurring_dates']; // recurring_dates

+                $csv_row[] = $event_data['is_whole_day_event']; // all_day

+                $csv_row[] = $event_data['event_starttimes']; // starttimes

+                $csv_row[] = $event_data['event_endtimes']; // endtimes

+                $csv_row[] = $event_data['recurring_type']; // repeat_type

+                $csv_row[] = $event_data['recurring_interval']; // repeat_x

+                $csv_row[] = $event_data['recurring_week_days']; // repeat_days

+                $csv_row[] = $event_data['recurring_week_nos']; // repeat_weeks

+                $csv_row[] = $event_data['max_recurring_count']; // max_repeat

+                $csv_row[] = $event_data['recurring_end_date']; // repeat_end

+            }

+            $csv_row[] = $post_info['post_status']; // post_status

+            $csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured

+            if ($is_payment_plugin) {

+                $csv_row[] = (int)$post_info['package_id']; // package_id

+                $csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date

+            }

+            $csv_row[] = $post_info['geodir_video']; // geodir_video

+            $csv_row[] = $post_info['post_address']; // post_address

+            $csv_row[] = $post_info['post_city']; // post_city

+            $csv_row[] = $post_info['post_region']; // post_region

+            $csv_row[] = $post_info['post_country']; // post_country

+            $csv_row[] = $post_info['post_zip']; // post_zip

+            $csv_row[] = $post_info['post_latitude']; // post_latitude

+            $csv_row[] = $post_info['post_longitude']; // post_longitude

+            $csv_row[] = $post_info['geodir_timing']; // geodir_timing

+            $csv_row[] = $post_info['geodir_contact']; // geodir_contact

+            $csv_row[] = $post_info['geodir_email']; // geodir_email

+            $csv_row[] = $post_info['geodir_website']; // geodir_website

+            $csv_row[] = $post_info['geodir_twitter']; // geodir_twitter

+            $csv_row[] = $post_info['geodir_facebook']; // geodir_facebook

+            $csv_row[] = $post_info['geodir_video']; // geodir_video

+            $csv_row[] = $post_info['geodir_special_offers']; // geodir_special_offers

+            // WPML

+            if ($is_wpml) {

+                $csv_row[] = geodir_get_language_for_element( $post_id, 'post_' . $post_type );

+                $csv_row[] = geodir_imex_original_post_id( $post_id, 'post_' . $post_type );

+            }

+            // WPML

 			

-			if ( !empty( $custom_fields ) ) {

-				foreach ( $custom_fields as $custom_field ) {

-					$csv_row[] = isset( $post_info[$custom_field->htmlvar_name] ) ? $post_info[$custom_field->htmlvar_name] : '';

-				}

-			}

+            if ( !empty( $custom_fields ) ) {

+                foreach ( $custom_fields as $custom_field ) {

+                    $csv_row[] = isset( $post_info[$custom_field->htmlvar_name] ) ? $post_info[$custom_field->htmlvar_name] : '';

+                }

+            }

 			

-			// Franchise data

-			if ($is_franchise_active) {

-				$gd_is_franchise = '';

-				$locaked_fields = '';

-				$franchise = '';

+            // Franchise data

+            if ($is_franchise_active) {

+                $gd_is_franchise = '';

+                $locaked_fields = '';

+                $franchise = '';

 					

-				if (geodir_franchise_pkg_is_active($gd_post_info)) {

-					$gd_is_franchise = (int)get_post_meta( $post_id, 'gd_is_franchise', true );

-					$locaked_fields = $gd_is_franchise ? get_post_meta( $post_id, 'gd_franchise_lock', true ) : '';

-					$locaked_fields = (is_array($locaked_fields) && !empty($locaked_fields) ? implode(",", $locaked_fields) : '');

-					$franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 ? (int)$post_info['franchise'] : 0; // franchise id

-				}

+                if (geodir_franchise_pkg_is_active($gd_post_info)) {

+                    $gd_is_franchise = (int)get_post_meta( $post_id, 'gd_is_franchise', true );

+                    $locaked_fields = $gd_is_franchise ? get_post_meta( $post_id, 'gd_franchise_lock', true ) : '';

+                    $locaked_fields = (is_array($locaked_fields) && !empty($locaked_fields) ? implode(",", $locaked_fields) : '');

+                    $franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 ? (int)$post_info['franchise'] : 0; // franchise id

+                }

 				

-				$csv_row[] = (int)$gd_is_franchise; // gd_is_franchise

-				$csv_row[] = $locaked_fields; // gd_franchise_lock fields

-				$csv_row[] = (int)$franchise; // franchise id

-			}

+                $csv_row[] = (int)$gd_is_franchise; // gd_is_franchise

+                $csv_row[] = $locaked_fields; // gd_franchise_lock fields

+                $csv_row[] = (int)$franchise; // franchise id

+            }

 			

-			for ( $c = 0; $c < $images_count; $c++ ) {

-				$csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE

-			}

+            for ( $c = 0; $c < $images_count; $c++ ) {

+                $csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE

+            }

 			

-			$csv_rows[] = $csv_row;

+            $csv_rows[] = $csv_row;

 

-		}

+        }

 

-		for ( $c = 0; $c < $images_count; $c++ ) {

-			$csv_rows[0][] = 'IMAGE';

-		}

-	}

-	return $csv_rows;

+        for ( $c = 0; $c < $images_count; $c++ ) {

+            $csv_rows[0][] = 'IMAGE';

+        }

+    }

+    return $csv_rows;

 }

 

 /**

@@ -6221,48 +6221,48 @@ 
  * @return array Array of posts data.

  */

 function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

-	global $wpdb, $plugin_prefix;

+    global $wpdb, $plugin_prefix;

 

-	if ( ! post_type_exists( $post_type ) )

-		return new stdClass;

+    if ( ! post_type_exists( $post_type ) )

+        return new stdClass;

 		

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

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

 	

-	$limit = '';

-	if ( $per_page > 0 && $page_no > 0 ) {

-		$offset = ( $page_no - 1 ) * $per_page;

+    $limit = '';

+    if ( $per_page > 0 && $page_no > 0 ) {

+        $offset = ( $page_no - 1 ) * $per_page;

 		

-		if ( $offset > 0 ) {

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

-		} else {

-			$limit = " LIMIT " . $per_page;

-		}

-	}

+        if ( $offset > 0 ) {

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

+        } else {

+            $limit = " LIMIT " . $per_page;

+        }

+    }

 

-	$query = "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ORDER BY {$wpdb->posts}.ID ASC" . $limit;

-	/**

-	 * Modify returned posts SQL query for the current post type.

-	 *

-	 * @since 1.4.6

+    $query = "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ORDER BY {$wpdb->posts}.ID ASC" . $limit;

+    /**

+     * Modify returned posts SQL query for the current post type.

+     *

+     * @since 1.4.6

      * @package GeoDirectory

-	 *

-	 * @param int $query The SQL query.

-	 * @param string $post_type Post type.

-	 */

-	$query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

-

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

-

-	/**

-	 * Modify returned post results for the current post type.

-	 *

-	 * @since 1.4.6

+     *

+     * @param int $query The SQL query.

+     * @param string $post_type Post type.

+     */

+    $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

+

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

+

+    /**

+     * Modify returned post results for the current post type.

+     *

+     * @since 1.4.6

      * @package GeoDirectory

-	 *

-	 * @param object $results An object containing all post ids.

-	 * @param string $post_type Post type.

-	 */

-	return apply_filters( 'geodir_export_posts', $results, $post_type );

+     *

+     * @param object $results An object containing all post ids.

+     * @param string $post_type Post type.

+     */

+    return apply_filters( 'geodir_export_posts', $results, $post_type );

 }

 

 /**

@@ -6280,16 +6280,16 @@ 
  * @return string The SQL query.

  */

 function geodir_imex_get_events_query( $query, $post_type ) {

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

-		global $wpdb, $plugin_prefix;

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

+        global $wpdb, $plugin_prefix;

 		

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

-		$schedule_table = EVENT_SCHEDULE;

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

+        $schedule_table = EVENT_SCHEDULE;

 

-		$query = "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC";

-	}

+        $query = "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC";

+    }

 	

-	return $query; 

+    return $query; 

 }

 

 /**

@@ -6302,16 +6302,16 @@ 
  * @return int Total terms count.

  */

 function geodir_get_terms_count( $post_type ) {

-	$args = array( 'hide_empty' => 0 );

+    $args = array( 'hide_empty' => 0 );

 	

-	remove_all_filters( 'get_terms' );

+    remove_all_filters( 'get_terms' );

 	

-	$taxonomy = $post_type . 'category';

+    $taxonomy = $post_type . 'category';

 

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

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

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

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

 	 

-	return $count_terms;

+    return $count_terms;

 }

 

 /**

@@ -6327,76 +6327,76 @@ 
  * @return array Array of terms data.

  */

 function geodir_imex_get_terms( $post_type, $per_page = 0, $page_no = 0 ) {

-	$args = array( 'hide_empty' => 0, 'orderby' => 'id' );

+    $args = array( 'hide_empty' => 0, 'orderby' => 'id' );

 	

-	remove_all_filters( 'get_terms' );

+    remove_all_filters( 'get_terms' );

 	

-	$taxonomy = $post_type . 'category';

+    $taxonomy = $post_type . 'category';

 	

-	if ( $per_page > 0 && $page_no > 0 ) {

-		$args['offset'] = ( $page_no - 1 ) * $per_page;

-		$args['number'] = $per_page;

-	}

+    if ( $per_page > 0 && $page_no > 0 ) {

+        $args['offset'] = ( $page_no - 1 ) * $per_page;

+        $args['number'] = $per_page;

+    }

 	

-	$terms = get_terms( $taxonomy, $args );

+    $terms = get_terms( $taxonomy, $args );

 

-	$csv_rows = array();

+    $csv_rows = array();

 	

-	if ( !empty( $terms ) ) {

-		$csv_row = array();

-		$csv_row[] = 'cat_id';

-		$csv_row[] = 'cat_name';

-		$csv_row[] = 'cat_slug';

-		$csv_row[] = 'cat_posttype';

-		$csv_row[] = 'cat_parent';

-		$csv_row[] = 'cat_schema';

-		$csv_row[] = 'cat_description';

-		$csv_row[] = 'cat_top_description';

-		$csv_row[] = 'cat_image';

-		$csv_row[] = 'cat_icon';

-		// WPML

-		$is_wpml = geodir_is_wpml();

-		if ($is_wpml) {

-			$csv_row[] = 'cat_language';

-		}

-		// WPML

+    if ( !empty( $terms ) ) {

+        $csv_row = array();

+        $csv_row[] = 'cat_id';

+        $csv_row[] = 'cat_name';

+        $csv_row[] = 'cat_slug';

+        $csv_row[] = 'cat_posttype';

+        $csv_row[] = 'cat_parent';

+        $csv_row[] = 'cat_schema';

+        $csv_row[] = 'cat_description';

+        $csv_row[] = 'cat_top_description';

+        $csv_row[] = 'cat_image';

+        $csv_row[] = 'cat_icon';

+        // WPML

+        $is_wpml = geodir_is_wpml();

+        if ($is_wpml) {

+            $csv_row[] = 'cat_language';

+        }

+        // WPML

 		

-		$csv_rows[] = $csv_row;

+        $csv_rows[] = $csv_row;

 		

-		foreach ( $terms as $term ) {			

-			$cat_icon = get_tax_meta( $term->term_id, 'ct_cat_icon', false, $post_type );

-			$cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+        foreach ( $terms as $term ) {			

+            $cat_icon = get_tax_meta( $term->term_id, 'ct_cat_icon', false, $post_type );

+            $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

 			

-			$cat_image = geodir_get_default_catimage( $term->term_id, $post_type );

-			$cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; 

+            $cat_image = geodir_get_default_catimage( $term->term_id, $post_type );

+            $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; 

 			

-			$cat_parent = '';

-			if (isset($term->parent) && (int)$term->parent > 0 && term_exists((int)$term->parent, $taxonomy)) {

-				$parent_term = (array)get_term_by( 'id', (int)$term->parent, $taxonomy );

-				$cat_parent = !empty($parent_term) && isset($parent_term['name']) ? $parent_term['name'] : '';

-			}

+            $cat_parent = '';

+            if (isset($term->parent) && (int)$term->parent > 0 && term_exists((int)$term->parent, $taxonomy)) {

+                $parent_term = (array)get_term_by( 'id', (int)$term->parent, $taxonomy );

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

+            }

 			

-			$csv_row = array();

-			$csv_row[] = $term->term_id;

-			$csv_row[] = $term->name;

-			$csv_row[] = $term->slug;

-			$csv_row[] = $post_type;

-			$csv_row[] = $cat_parent;

-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );

-			$csv_row[] = $term->description;

-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type );

-			$csv_row[] = $cat_image;

-			$csv_row[] = $cat_icon;

-			// WPML

-			if ($is_wpml) {

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

-			}

-			// WPML

+            $csv_row = array();

+            $csv_row[] = $term->term_id;

+            $csv_row[] = $term->name;

+            $csv_row[] = $term->slug;

+            $csv_row[] = $post_type;

+            $csv_row[] = $cat_parent;

+            $csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );

+            $csv_row[] = $term->description;

+            $csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type );

+            $csv_row[] = $cat_image;

+            $csv_row[] = $cat_icon;

+            // WPML

+            if ($is_wpml) {

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

+            }

+            // WPML

 			

-			$csv_rows[] = $csv_row;

-		}

-	}

-	return $csv_rows;

+            $csv_rows[] = $csv_row;

+        }

+    }

+    return $csv_rows;

 }

 

 /**

@@ -6409,9 +6409,9 @@ 
  * @return string Path to the cache directory.

  */

 function geodir_path_import_export( $relative = true ) {

-	$upload_dir = wp_upload_dir();

+    $upload_dir = wp_upload_dir();

 	

-	return $relative ? $upload_dir['baseurl'] . '/cache' : $upload_dir['basedir'] . '/cache';

+    return $relative ? $upload_dir['baseurl'] . '/cache' : $upload_dir['basedir'] . '/cache';

 }

 

 /**

@@ -6428,29 +6428,29 @@ 
  * @return bool true if success otherwise false.

  */

 function geodir_save_csv_data( $file_path, $csv_data = array(), $clear = true ) {

-	if ( empty( $csv_data ) ) {

-		return false;

-	}

+    if ( empty( $csv_data ) ) {

+        return false;

+    }

 	

-	global $wp_filesystem;

+    global $wp_filesystem;

 	

-	$mode = $clear ? 'w+' : 'a+';

+    $mode = $clear ? 'w+' : 'a+';

 	

-	if ( function_exists( 'fputcsv' ) ) {

-		$file = fopen( $file_path, $mode );

-		foreach( $csv_data as $csv_row ) {

-			//$csv_row = array_map( 'utf8_decode', $csv_row );

-			$write_successful = fputcsv( $file, $csv_row, ",", $enclosure = '"' );

-		}

-		fclose( $file );

-	} else {

-		foreach( $csv_data as $csv_row ) {

-			//$csv_row = array_map( 'utf8_decode', $csv_row );

-			$wp_filesystem->put_contents( $file_path, $csv_row );

-		}

-	}

+    if ( function_exists( 'fputcsv' ) ) {

+        $file = fopen( $file_path, $mode );

+        foreach( $csv_data as $csv_row ) {

+            //$csv_row = array_map( 'utf8_decode', $csv_row );

+            $write_successful = fputcsv( $file, $csv_row, ",", $enclosure = '"' );

+        }

+        fclose( $file );

+    } else {

+        foreach( $csv_data as $csv_row ) {

+            //$csv_row = array_map( 'utf8_decode', $csv_row );

+            $wp_filesystem->put_contents( $file_path, $csv_row );

+        }

+    }

 		

-	return true;

+    return true;

 }

 

 /**

@@ -6465,17 +6465,17 @@ 
  * @return int No of file rows.

  */

 function geodir_import_export_line_count( $file ) {

-	global $wp_filesystem;

+    global $wp_filesystem;

 	

-	if ( $wp_filesystem->is_file( $file ) && $wp_filesystem->exists( $file ) ) {

-		$contents = $wp_filesystem->get_contents_array( $file );

+    if ( $wp_filesystem->is_file( $file ) && $wp_filesystem->exists( $file ) ) {

+        $contents = $wp_filesystem->get_contents_array( $file );

 		

-		if ( !empty( $contents ) && is_array( $contents ) ) {

-			return count( $contents ) - 1;

-		}

-	}

+        if ( !empty( $contents ) && is_array( $contents ) ) {

+            return count( $contents ) - 1;

+        }

+    }

 	

-	return NULL;

+    return NULL;

 }

 

 /**

@@ -6489,12 +6489,12 @@ 
  * @return object Queried object.

  */

 function geodir_imex_get_custom_fields( $post_type ) {

-	global $wpdb;

+    global $wpdb;

 	 

-	$sql = $wpdb->prepare("SELECT htmlvar_name FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array( $post_type ) );

-	$rows = $wpdb->get_results( $sql );

+    $sql = $wpdb->prepare("SELECT htmlvar_name FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array( $post_type ) );

+    $rows = $wpdb->get_results( $sql );

 	 

-	return $rows;

+    return $rows;

 }

 

 /**

@@ -6505,11 +6505,11 @@ 
  * @return True if WPML is active else False.

  */

 function geodir_is_wpml() {

-	if (function_exists('icl_object_id')) {

-		return true;

-	}

+    if (function_exists('icl_object_id')) {

+        return true;

+    }

 	

-	return false;

+    return false;

 }

 

 /**

@@ -6524,9 +6524,9 @@ 
  * @return Language code.

  */

 function geodir_get_language_for_element($element_id, $element_type) {

-	global $sitepress;

+    global $sitepress;

 	

-	return $sitepress->get_language_for_element($element_id, $element_type);

+    return $sitepress->get_language_for_element($element_id, $element_type);

 }

 

 /**

@@ -6540,18 +6540,18 @@ 
  * @param int $tr_post_id Translation Post ID.

  */

 function geodir_icl_make_duplicate($master_post_id, $lang, $postarr, $tr_post_id) {

-	$post_type = get_post_type($master_post_id);

+    $post_type = get_post_type($master_post_id);

 

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

-		// Duplicate post details

-		geodir_icl_duplicate_post_details($master_post_id, $tr_post_id, $lang);

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

+        // Duplicate post details

+        geodir_icl_duplicate_post_details($master_post_id, $tr_post_id, $lang);

 		

-		// Duplicate taxonomies

-		geodir_icl_duplicate_taxonomies($master_post_id, $tr_post_id, $lang);

+        // Duplicate taxonomies

+        geodir_icl_duplicate_taxonomies($master_post_id, $tr_post_id, $lang);

 		

-		// Duplicate post images

-		geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang);

-	}

+        // Duplicate post images

+        geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang);

+    }

 }

 

 /**

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

  */

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

-	global $wpdb, $plugin_prefix;

+    global $wpdb, $plugin_prefix;

 	

-	$post_type = get_post_type($master_post_id);

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

+    $post_type = get_post_type($master_post_id);

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

 	

-	$query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));

-	$data = (array)$wpdb->get_row($query);

+    $query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));

+    $data = (array)$wpdb->get_row($query);

 	

-	if ( !empty( $data ) ) {

-		$data['post_id'] = $tr_post_id;

-		unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category'], $data['overall_rating'], $data['rating_count'], $data['ratings']);

+    if ( !empty( $data ) ) {

+        $data['post_id'] = $tr_post_id;

+        unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category'], $data['overall_rating'], $data['rating_count'], $data['ratings']);

 		

-		$wpdb->update($post_table, $data, array('post_id' => $tr_post_id));		

-		return true;

-	}

+        $wpdb->update($post_table, $data, array('post_id' => $tr_post_id));		

+        return true;

+    }

 	

-	return false;

+    return false;

 }

 

 /**

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

  */

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

-	global $sitepress, $wpdb;

-	$post_type = get_post_type($master_post_id);

+    global $sitepress, $wpdb;

+    $post_type = get_post_type($master_post_id);

 	

-	remove_filter('get_term', array($sitepress,'get_term_adjust_id')); // AVOID filtering to current language

+    remove_filter('get_term', array($sitepress,'get_term_adjust_id')); // AVOID filtering to current language

 

-	$taxonomies = get_object_taxonomies($post_type);

-	foreach ($taxonomies as $taxonomy) {

-		$terms = get_the_terms($master_post_id, $taxonomy);

-		$terms_array = array();

+    $taxonomies = get_object_taxonomies($post_type);

+    foreach ($taxonomies as $taxonomy) {

+        $terms = get_the_terms($master_post_id, $taxonomy);

+        $terms_array = array();

 		

-		if ($terms) {

-			foreach ($terms as $term) {

-				$tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang);

+        if ($terms) {

+            foreach ($terms as $term) {

+                $tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang);

 				

-				if (!is_null($tr_id)){

-					// not using get_term - unfiltered get_term

-					$translated_term = $wpdb->get_row($wpdb->prepare("

+                if (!is_null($tr_id)){

+                    // not using get_term - unfiltered get_term

+                    $translated_term = $wpdb->get_row($wpdb->prepare("

 						SELECT * FROM {$wpdb->terms} t JOIN {$wpdb->term_taxonomy} x ON x.term_id = t.term_id WHERE t.term_id = %d AND x.taxonomy = %s", $tr_id, $taxonomy));

 

-					$terms_array[] = $translated_term->term_id;

-				}

-			}

+                    $terms_array[] = $translated_term->term_id;

+                }

+            }

 

-			if (!is_taxonomy_hierarchical($taxonomy)){

-				$terms_array = array_unique( array_map( 'intval', $terms_array ) );

-			}

+            if (!is_taxonomy_hierarchical($taxonomy)){

+                $terms_array = array_unique( array_map( 'intval', $terms_array ) );

+            }

 

-			wp_set_post_terms($tr_post_id, $terms_array, $taxonomy);

+            wp_set_post_terms($tr_post_id, $terms_array, $taxonomy);

 			

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

-				geodir_set_postcat_structure($tr_post_id, $post_type . 'category');

-			}

-		}

-	}

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

+                geodir_set_postcat_structure($tr_post_id, $post_type . 'category');

+            }

+        }

+    }

 }

 

 /**

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

  */

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

-	global $wpdb;

+    global $wpdb;

 	

-	$query = $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

-	$wpdb->query($query);

+    $query = $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

+    $wpdb->query($query);

 	

-	$query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

-	$post_images = $wpdb->get_results($query);

+    $query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

+    $post_images = $wpdb->get_results($query);

 	

-	if ( !empty( $post_images ) ) {

-		foreach ( $post_images as $post_image) {

-			$image_data = (array)$post_image;

-			unset($image_data['ID']);

-			$image_data['post_id'] = $tr_post_id;

+    if ( !empty( $post_images ) ) {

+        foreach ( $post_images as $post_image) {

+            $image_data = (array)$post_image;

+            unset($image_data['ID']);

+            $image_data['post_id'] = $tr_post_id;

 			

-			$wpdb->insert(GEODIR_ATTACHMENT_TABLE, $image_data);

+            $wpdb->insert(GEODIR_ATTACHMENT_TABLE, $image_data);

 			

-			geodir_set_wp_featured_image($tr_post_id);

-		}

+            geodir_set_wp_featured_image($tr_post_id);

+        }

 		

-		return true;

-	}

+        return true;

+    }

 	

-	return false;

+    return false;

 }

 

 /**

@@ -6686,141 +6686,141 @@ 
  * @return array Event data array.

  */

 function geodir_imex_get_event_data($post, $gd_post_info) {

-	$event_date = isset( $post['event_date'] ) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $post['event_date'] ) ) : '';

-	$event_enddate = $event_date;

-	$starttime = isset( $post['starttime'] ) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['starttime'] ) ) : '';

-	$endtime = isset( $post['endtime'] ) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['endtime'] ) ) : '';

+    $event_date = isset( $post['event_date'] ) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $post['event_date'] ) ) : '';

+    $event_enddate = $event_date;

+    $starttime = isset( $post['starttime'] ) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['starttime'] ) ) : '';

+    $endtime = isset( $post['endtime'] ) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['endtime'] ) ) : '';

 	

-	$is_recurring_event = '';

-	$event_duration_days = '';

-	$is_whole_day_event = '';

-	$recurring_dates = '';

-	$event_starttimes = '';

-	$event_endtimes = '';

-	$recurring_type = '';

-	$recurring_interval = '';

-	$recurring_week_days = '';

-	$recurring_week_nos = '';

-	$max_recurring_count = '';

-	$recurring_end_date = '';

-	$recurring_dates = '';

+    $is_recurring_event = '';

+    $event_duration_days = '';

+    $is_whole_day_event = '';

+    $recurring_dates = '';

+    $event_starttimes = '';

+    $event_endtimes = '';

+    $recurring_type = '';

+    $recurring_interval = '';

+    $recurring_week_days = '';

+    $recurring_week_nos = '';

+    $max_recurring_count = '';

+    $recurring_end_date = '';

+    $recurring_dates = '';

 		

-	$recurring_data = isset($gd_post_info->recurring_dates) ? maybe_unserialize($gd_post_info->recurring_dates) : array();

-	if (!empty($recurring_data)) {

-		$event_date = isset( $recurring_data['event_start'] ) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_start'] ) ) : $event_date;

-		$event_enddate = isset( $recurring_data['event_end'] ) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_end'] ) ) : $event_date;

-		$starttime = isset( $recurring_data['starttime'] ) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['starttime'] ) ) : $starttime;

-		$endtime = isset( $recurring_data['endtime'] ) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['endtime'] ) ) : $endtime;

-		$is_whole_day_event = !empty($recurring_data['all_day']) ? 1 : '';

-		$different_times = !empty($recurring_data['different_times']) ? true : false;

+    $recurring_data = isset($gd_post_info->recurring_dates) ? maybe_unserialize($gd_post_info->recurring_dates) : array();

+    if (!empty($recurring_data)) {

+        $event_date = isset( $recurring_data['event_start'] ) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_start'] ) ) : $event_date;

+        $event_enddate = isset( $recurring_data['event_end'] ) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_end'] ) ) : $event_date;

+        $starttime = isset( $recurring_data['starttime'] ) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['starttime'] ) ) : $starttime;

+        $endtime = isset( $recurring_data['endtime'] ) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['endtime'] ) ) : $endtime;

+        $is_whole_day_event = !empty($recurring_data['all_day']) ? 1 : '';

+        $different_times = !empty($recurring_data['different_times']) ? true : false;

 	

-		$recurring_pkg = geodir_event_recurring_pkg( $gd_post_info );

-		$is_recurring = isset( $gd_post_info->is_recurring ) && (int)$gd_post_info->is_recurring == 0 ? false : true;

+        $recurring_pkg = geodir_event_recurring_pkg( $gd_post_info );

+        $is_recurring = isset( $gd_post_info->is_recurring ) && (int)$gd_post_info->is_recurring == 0 ? false : true;

 			

-		if ($recurring_pkg && $is_recurring) {

-			$recurring_dates = $event_date;

-			$event_enddate = '';

-			$is_recurring_event = 1;

+        if ($recurring_pkg && $is_recurring) {

+            $recurring_dates = $event_date;

+            $event_enddate = '';

+            $is_recurring_event = 1;

 						

-			$recurring_type = !empty($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'custom';

+            $recurring_type = !empty($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'custom';

 			

-			if (!empty($recurring_data['event_recurring_dates'])) {

-				$event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] );

+            if (!empty($recurring_data['event_recurring_dates'])) {

+                $event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] );

 				

-				if (!empty($event_recurring_dates)) {

-					$recurring_dates = array();

+                if (!empty($event_recurring_dates)) {

+                    $recurring_dates = array();

 					

-					foreach ($event_recurring_dates as $date) {

-						$recurring_dates[] = date_i18n( 'd/m/Y', strtotime( $date ) );

-					}

+                    foreach ($event_recurring_dates as $date) {

+                        $recurring_dates[] = date_i18n( 'd/m/Y', strtotime( $date ) );

+                    }

 					

-					$recurring_dates = implode(",", $recurring_dates);

-				}

-			}

+                    $recurring_dates = implode(",", $recurring_dates);

+                }

+            }

 			

-			if ($recurring_type == 'custom') {

-				if (!$is_whole_day_event) {

-					$event_starttimes = $starttime;

-					$event_endtimes = $endtime;

+            if ($recurring_type == 'custom') {

+                if (!$is_whole_day_event) {

+                    $event_starttimes = $starttime;

+                    $event_endtimes = $endtime;

 			

-					if (!empty($recurring_data['starttimes'])) {

-						$times = array();

+                    if (!empty($recurring_data['starttimes'])) {

+                        $times = array();

 						

-						foreach ($recurring_data['starttimes'] as $time) {

-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

-						}

+                        foreach ($recurring_data['starttimes'] as $time) {

+                            $times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

+                        }

 						

-						$event_starttimes = implode(",", $times);

-					}

+                        $event_starttimes = implode(",", $times);

+                    }

 					

-					if (!empty($recurring_data['endtimes'])) {

-						$times = array();

+                    if (!empty($recurring_data['endtimes'])) {

+                        $times = array();

 						

-						foreach ($recurring_data['endtimes'] as $time) {

-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

-						}

+                        foreach ($recurring_data['endtimes'] as $time) {

+                            $times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

+                        }

 						

-						$event_endtimes = implode(",", $times);

-					}

+                        $event_endtimes = implode(",", $times);

+                    }

 					

-					if (!$different_times) {

-						$event_starttimes = '';

-						$event_endtimes = '';

-					}

-				}

-			} else {

-				$event_duration_days = isset($recurring_data['duration_x']) ? (int)$recurring_data['duration_x'] : 1;

-				$recurring_interval = !empty($recurring_data['repeat_x']) && (int)$recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;

+                    if (!$different_times) {

+                        $event_starttimes = '';

+                        $event_endtimes = '';

+                    }

+                }

+            } else {

+                $event_duration_days = isset($recurring_data['duration_x']) ? (int)$recurring_data['duration_x'] : 1;

+                $recurring_interval = !empty($recurring_data['repeat_x']) && (int)$recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;

 				

-				if (($recurring_type == 'week' || $recurring_type == 'month') && !empty($recurring_data['repeat_days'])) {

-					$week_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');

+                if (($recurring_type == 'week' || $recurring_type == 'month') && !empty($recurring_data['repeat_days'])) {

+                    $week_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');

 					

-					$days = array();

-					foreach ($recurring_data['repeat_days'] as $day) {

-						if (isset($week_days[$day])) {

-							$days[] = $week_days[$day];

-						}

-					}

+                    $days = array();

+                    foreach ($recurring_data['repeat_days'] as $day) {

+                        if (isset($week_days[$day])) {

+                            $days[] = $week_days[$day];

+                        }

+                    }

 					

-					$recurring_week_days = implode(",", array_unique($days));

-				}

+                    $recurring_week_days = implode(",", array_unique($days));

+                }

 				

-				$recurring_week_nos = $recurring_type == 'month' && !empty($recurring_data['repeat_weeks']) ? implode(",", $recurring_data['repeat_weeks']) : $recurring_week_nos;

-				if (!empty($recurring_data['repeat_end_type']) && (int)$recurring_data['repeat_end_type'] == 1) {

-					$recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['repeat_end'] ) ) : '';

-					$max_recurring_count = empty($recurring_end_date) ? 1 : '';

-				} else {

-					$max_recurring_count = (!empty($recurring_data['max_repeat']) && (int)$recurring_data['max_repeat'] > 0 ? (int)$recurring_data['max_repeat'] : 1);

-				}

-			}

-		}

-	}

-	if ($is_whole_day_event) {

-		$starttime = '';

-		$endtime = '';

-		$event_starttimes = '';

-		$event_endtimes = '';

-	}

+                $recurring_week_nos = $recurring_type == 'month' && !empty($recurring_data['repeat_weeks']) ? implode(",", $recurring_data['repeat_weeks']) : $recurring_week_nos;

+                if (!empty($recurring_data['repeat_end_type']) && (int)$recurring_data['repeat_end_type'] == 1) {

+                    $recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['repeat_end'] ) ) : '';

+                    $max_recurring_count = empty($recurring_end_date) ? 1 : '';

+                } else {

+                    $max_recurring_count = (!empty($recurring_data['max_repeat']) && (int)$recurring_data['max_repeat'] > 0 ? (int)$recurring_data['max_repeat'] : 1);

+                }

+            }

+        }

+    }

+    if ($is_whole_day_event) {

+        $starttime = '';

+        $endtime = '';

+        $event_starttimes = '';

+        $event_endtimes = '';

+    }

 	

-	$data = array();

-	$data['event_date'] = $event_date;

-	$data['event_enddate'] = $event_enddate;

-	$data['starttime'] = $starttime;

-	$data['endtime'] = $endtime;

-	$data['is_recurring_event'] = $is_recurring_event;

-	$data['recurring_dates'] = $recurring_dates;

-	$data['event_duration_days'] = $event_duration_days;

-	$data['is_whole_day_event'] = $is_whole_day_event;

-	$data['event_starttimes'] = $event_starttimes;

-	$data['event_endtimes'] = $event_endtimes;

-	$data['recurring_type'] = $recurring_type;

-	$data['recurring_interval'] = $recurring_interval;

-	$data['recurring_week_days'] = $recurring_week_days;

-	$data['recurring_week_nos'] = $recurring_week_nos;

-	$data['max_recurring_count'] = $max_recurring_count;

-	$data['recurring_end_date'] = $recurring_end_date;

+    $data = array();

+    $data['event_date'] = $event_date;

+    $data['event_enddate'] = $event_enddate;

+    $data['starttime'] = $starttime;

+    $data['endtime'] = $endtime;

+    $data['is_recurring_event'] = $is_recurring_event;

+    $data['recurring_dates'] = $recurring_dates;

+    $data['event_duration_days'] = $event_duration_days;

+    $data['is_whole_day_event'] = $is_whole_day_event;

+    $data['event_starttimes'] = $event_starttimes;

+    $data['event_endtimes'] = $event_endtimes;

+    $data['recurring_type'] = $recurring_type;

+    $data['recurring_interval'] = $recurring_interval;

+    $data['recurring_week_days'] = $recurring_week_days;

+    $data['recurring_week_nos'] = $recurring_week_nos;

+    $data['max_recurring_count'] = $max_recurring_count;

+    $data['recurring_end_date'] = $recurring_end_date;

 	

-	return $data;

+    return $data;

 }

 

 /**

@@ -6836,12 +6836,12 @@ 
  * @return doesn't Date.

  */

 function geodir_imex_get_date_ymd($date) {

-	if (strpos($date, '/') !== false) {

-		$date = str_replace('/', '-', $date); // PHP doesn't work well with dd/mm/yyyy format.

-	}

+    if (strpos($date, '/') !== false) {

+        $date = str_replace('/', '-', $date); // PHP doesn't work well with dd/mm/yyyy format.

+    }

 	

-	$date = date_i18n('Y-m-d', strtotime($date));

-	return $date;

+    $date = date_i18n('Y-m-d', strtotime($date));

+    return $date;

 }

 

 /**

@@ -6854,117 +6854,117 @@ 
  * @return array Event data array.

  */

 function geodir_imex_process_event_data($gd_post) {

-	$recurring_pkg = geodir_event_recurring_pkg( (object)$gd_post );

-

-	$is_recurring = isset( $gd_post['is_recurring_event'] ) && (int)$gd_post['is_recurring_event'] == 0 ? false : true;

-	$event_date = isset($gd_post['event_date']) && $gd_post['event_date'] != '' ? geodir_imex_get_date_ymd($gd_post['event_date']) : '';

-	$event_enddate = isset($gd_post['event_enddate']) && $gd_post['event_enddate'] != '' ? geodir_imex_get_date_ymd($gd_post['event_enddate']) : $event_date;

-	$all_day = isset($gd_post['is_whole_day_event']) && !empty($gd_post['is_whole_day_event']) ? true : false;

-	$starttime = isset($gd_post['starttime']) && !$all_day ? $gd_post['starttime'] : '';

-	$endtime = isset($gd_post['endtime']) && !$all_day ? $gd_post['endtime'] : '';

+    $recurring_pkg = geodir_event_recurring_pkg( (object)$gd_post );

+

+    $is_recurring = isset( $gd_post['is_recurring_event'] ) && (int)$gd_post['is_recurring_event'] == 0 ? false : true;

+    $event_date = isset($gd_post['event_date']) && $gd_post['event_date'] != '' ? geodir_imex_get_date_ymd($gd_post['event_date']) : '';

+    $event_enddate = isset($gd_post['event_enddate']) && $gd_post['event_enddate'] != '' ? geodir_imex_get_date_ymd($gd_post['event_enddate']) : $event_date;

+    $all_day = isset($gd_post['is_whole_day_event']) && !empty($gd_post['is_whole_day_event']) ? true : false;

+    $starttime = isset($gd_post['starttime']) && !$all_day ? $gd_post['starttime'] : '';

+    $endtime = isset($gd_post['endtime']) && !$all_day ? $gd_post['endtime'] : '';

 	

-	$repeat_type = '';

-	$different_times = '';

-	$starttimes = '';

-	$endtimes = '';

-	$repeat_days = '';

-	$repeat_weeks = '';

-	$event_recurring_dates = '';

-	$repeat_x = '';

-	$duration_x = '';

-	$repeat_end_type = '';

-	$max_repeat = '';

-	$repeat_end = '';

+    $repeat_type = '';

+    $different_times = '';

+    $starttimes = '';

+    $endtimes = '';

+    $repeat_days = '';

+    $repeat_weeks = '';

+    $event_recurring_dates = '';

+    $repeat_x = '';

+    $duration_x = '';

+    $repeat_end_type = '';

+    $max_repeat = '';

+    $repeat_end = '';

 	

-	if ($recurring_pkg && $is_recurring) {

-		$repeat_type = $gd_post['recurring_type'];

+    if ($recurring_pkg && $is_recurring) {

+        $repeat_type = $gd_post['recurring_type'];

 		

-		if ($repeat_type == 'custom') {

-			$starttimes = !$all_day && !empty($gd_post['event_starttimes']) ? explode(",", $gd_post['event_starttimes']) : array();

-			$endtimes = !$all_day && !empty($gd_post['event_endtimes']) ? explode(",", $gd_post['event_endtimes']) : array();

+        if ($repeat_type == 'custom') {

+            $starttimes = !$all_day && !empty($gd_post['event_starttimes']) ? explode(",", $gd_post['event_starttimes']) : array();

+            $endtimes = !$all_day && !empty($gd_post['event_endtimes']) ? explode(",", $gd_post['event_endtimes']) : array();

 			

-			if (!empty($starttimes) || !empty($endtimes)) {

-				$different_times = true;

-			}

+            if (!empty($starttimes) || !empty($endtimes)) {

+                $different_times = true;

+            }

 			

-			$recurring_dates = isset($gd_post['recurring_dates']) && $gd_post['recurring_dates'] != '' ? explode(",", $gd_post['recurring_dates']) : array();

-			if (!empty($recurring_dates)) {

-				$event_recurring_dates = array();

+            $recurring_dates = isset($gd_post['recurring_dates']) && $gd_post['recurring_dates'] != '' ? explode(",", $gd_post['recurring_dates']) : array();

+            if (!empty($recurring_dates)) {

+                $event_recurring_dates = array();

 				

-				foreach ($recurring_dates as $recurring_date) {

-					$recurring_date = trim($recurring_date);

+                foreach ($recurring_dates as $recurring_date) {

+                    $recurring_date = trim($recurring_date);

 					

-					if ($recurring_date != '') {

-						$event_recurring_dates[] = geodir_imex_get_date_ymd($recurring_date);

-					}

-				}

+                    if ($recurring_date != '') {

+                        $event_recurring_dates[] = geodir_imex_get_date_ymd($recurring_date);

+                    }

+                }

 				

-				$event_recurring_dates = array_unique($event_recurring_dates);

-				$event_recurring_dates = implode(",", $event_recurring_dates);

-			}

-		} else {

-			$duration_x = !empty( $gd_post['event_duration_days'] ) ? (int)$gd_post['event_duration_days'] : 1;

-			$repeat_x = !empty( $gd_post['recurring_interval'] ) ? (int)$gd_post['recurring_interval'] : 1;

-			$max_repeat = !empty( $gd_post['max_recurring_count'] ) ? (int)$gd_post['max_recurring_count'] : 1;

-			$repeat_end = !empty( $gd_post['recurring_end_date'] ) ? geodir_imex_get_date_ymd($gd_post['recurring_end_date']) : '';

+                $event_recurring_dates = array_unique($event_recurring_dates);

+                $event_recurring_dates = implode(",", $event_recurring_dates);

+            }

+        } else {

+            $duration_x = !empty( $gd_post['event_duration_days'] ) ? (int)$gd_post['event_duration_days'] : 1;

+            $repeat_x = !empty( $gd_post['recurring_interval'] ) ? (int)$gd_post['recurring_interval'] : 1;

+            $max_repeat = !empty( $gd_post['max_recurring_count'] ) ? (int)$gd_post['max_recurring_count'] : 1;

+            $repeat_end = !empty( $gd_post['recurring_end_date'] ) ? geodir_imex_get_date_ymd($gd_post['recurring_end_date']) : '';

 			

-			$repeat_end_type = $repeat_end != '' ? 1 : 0;

-			$max_repeat = $repeat_end != '' ? '' : $max_repeat;

+            $repeat_end_type = $repeat_end != '' ? 1 : 0;

+            $max_repeat = $repeat_end != '' ? '' : $max_repeat;

 			

-			$week_days = array_flip(array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'));

+            $week_days = array_flip(array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'));

 			

-			$a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days'])!='' ? explode(',', trim($gd_post['recurring_week_days'])) : array();

-			$repeat_days = array();

-			if (!empty($a_repeat_days)) {

-				foreach ($a_repeat_days as $repeat_day) {

-					$repeat_day = geodir_strtolower(trim($repeat_day));

+            $a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days'])!='' ? explode(',', trim($gd_post['recurring_week_days'])) : array();

+            $repeat_days = array();

+            if (!empty($a_repeat_days)) {

+                foreach ($a_repeat_days as $repeat_day) {

+                    $repeat_day = geodir_strtolower(trim($repeat_day));

 					

-					if ($repeat_day != '' && isset($week_days[$repeat_day])) {

-						$repeat_days[] = $week_days[$repeat_day];

-					}

-				}

+                    if ($repeat_day != '' && isset($week_days[$repeat_day])) {

+                        $repeat_days[] = $week_days[$repeat_day];

+                    }

+                }

 				

-				$repeat_days = array_unique($repeat_days);

-			}

+                $repeat_days = array_unique($repeat_days);

+            }

 			

-			$a_repeat_weeks = isset($gd_post['recurring_week_nos']) && trim($gd_post['recurring_week_nos']) != '' ? explode(",", trim($gd_post['recurring_week_nos'])) : array();

-			$repeat_weeks = array();

-			if (!empty($a_repeat_weeks)) {

-				foreach ($a_repeat_weeks as $repeat_week) {

-					$repeat_weeks[] = (int)$repeat_week;

-				}

+            $a_repeat_weeks = isset($gd_post['recurring_week_nos']) && trim($gd_post['recurring_week_nos']) != '' ? explode(",", trim($gd_post['recurring_week_nos'])) : array();

+            $repeat_weeks = array();

+            if (!empty($a_repeat_weeks)) {

+                foreach ($a_repeat_weeks as $repeat_week) {

+                    $repeat_weeks[] = (int)$repeat_week;

+                }

 				

-				$repeat_weeks = array_unique($repeat_weeks);

-			}

-		}

-	}

+                $repeat_weeks = array_unique($repeat_weeks);

+            }

+        }

+    }

 	

-	if (isset($gd_post['recurring_dates'])) {

-		unset($gd_post['recurring_dates']);

-	}

+    if (isset($gd_post['recurring_dates'])) {

+        unset($gd_post['recurring_dates']);

+    }

 

-	$gd_post['is_recurring'] = $is_recurring;

-	$gd_post['event_date'] = $event_date;

-	$gd_post['event_start'] = $event_date;

-	$gd_post['event_end'] = $event_enddate;

-	$gd_post['all_day'] = $all_day;

-	$gd_post['starttime'] = $starttime;

-	$gd_post['endtime'] = $endtime;

+    $gd_post['is_recurring'] = $is_recurring;

+    $gd_post['event_date'] = $event_date;

+    $gd_post['event_start'] = $event_date;

+    $gd_post['event_end'] = $event_enddate;

+    $gd_post['all_day'] = $all_day;

+    $gd_post['starttime'] = $starttime;

+    $gd_post['endtime'] = $endtime;

 	

-	$gd_post['repeat_type'] = $repeat_type;

-	$gd_post['different_times'] = $different_times;

-	$gd_post['starttimes'] = $starttimes;

-	$gd_post['endtimes'] = $endtimes;

-	$gd_post['repeat_days'] = $repeat_days;

-	$gd_post['repeat_weeks'] = $repeat_weeks;

-	$gd_post['event_recurring_dates'] = $event_recurring_dates;

-	$gd_post['repeat_x'] = $repeat_x;

-	$gd_post['duration_x'] = $duration_x;

-	$gd_post['repeat_end_type'] = $repeat_end_type;

-	$gd_post['max_repeat'] = $max_repeat;

-	$gd_post['repeat_end'] = $repeat_end;

-

-	return $gd_post;

+    $gd_post['repeat_type'] = $repeat_type;

+    $gd_post['different_times'] = $different_times;

+    $gd_post['starttimes'] = $starttimes;

+    $gd_post['endtimes'] = $endtimes;

+    $gd_post['repeat_days'] = $repeat_days;

+    $gd_post['repeat_weeks'] = $repeat_weeks;

+    $gd_post['event_recurring_dates'] = $event_recurring_dates;

+    $gd_post['repeat_x'] = $repeat_x;

+    $gd_post['duration_x'] = $duration_x;

+    $gd_post['repeat_end_type'] = $repeat_end_type;

+    $gd_post['max_repeat'] = $max_repeat;

+    $gd_post['repeat_end'] = $repeat_end;

+

+    return $gd_post;

 }

 

 /**

@@ -7036,12 +7036,12 @@ 
  * @return Original element id.

  */

 function geodir_imex_original_post_id($element_id, $element_type) {

-	global $sitepress;

+    global $sitepress;

 	

-	$original_element_id = $sitepress->get_original_element_id($element_id, $element_type);

-	$element_id = $element_id != $original_element_id ? $original_element_id : '';

+    $original_element_id = $sitepress->get_original_element_id($element_id, $element_type);

+    $element_id = $element_id != $original_element_id ? $original_element_id : '';

 	

-	return $element_id;

+    return $element_id;

 }

 

 /*

@@ -7121,15 +7121,15 @@ 
  * @global object $sitepress Sitepress WPML object.

  */

 function geodir_wpml_permalink_setting_notice() {

-	if (geodir_is_wpml()) {

-		global $sitepress;

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

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

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

-	?>

+    if (geodir_is_wpml()) {

+        global $sitepress;

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

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

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

+    ?>

 	<div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory');?></strong></p></div>

 	<?php

-		}

-	}

+        }

+    }

 }

 ?>
\ No newline at end of file

Spacing +642 added lines, -642 removed lines

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

 

                     $default_location = geodir_get_default_location();

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

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

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

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

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

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

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

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

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

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

 

                 ?>

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

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

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

                 var bound_lat_lng;

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

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

@@ -525,7 +525,7 @@ 
                             );

 

                         } else {

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

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

                         }

                     });

 

@@ -538,7 +538,7 @@ 
                     var total_dummy_post_count = jQuery('#sub_' + active_tab).find('.selected_sample_data').val();

 

                     if (id == 'geodir_dummy_delete') {

-                        if (confirm('<?php _e('Are you sure you want to delete dummy data?' , 'geodirectory'); ?>')) {

+                        if (confirm('<?php _e('Are you sure you want to delete dummy data?', 'geodirectory'); ?>')) {

                             jQuery('#sub_' + active_tab).find('.geodir_auto_install').hide();

                             jQuery('#sub_' + active_tab).find('.geodir_show_progress').show();

                             jQuery.post('<?php echo geodir_get_ajax_url(); ?>&geodir_autofill=' + id + '&posttype=' + posttype + '&_wpnonce=' + nonce,

@@ -557,7 +557,7 @@ 
                         jQuery.post('<?php echo geodir_get_ajax_url(); ?>&geodir_autofill=' + id + '&posttype=' + posttype + '&insert_dummy_post_index=' + dummy_post_index + '&city_bound_lat1=' + bound_lat_lng[0] + '&city_bound_lng1=' + bound_lat_lng[1] + '&city_bound_lat2=' + bound_lat_lng[2] + '&city_bound_lng2=' + bound_lat_lng[3] + '&_wpnonce=' + nonce,

                             function (data) {

 

-                                jQuery(obj).closest('form').find('.dummy_post_inserted').html('<?php _e('Dummy post(s) inserted:','geodirectory');?> ' + dummy_post_index + ' <?php _e('of' ,'geodirectory'); ?> ' + total_dummy_post_count + '');

+                                jQuery(obj).closest('form').find('.dummy_post_inserted').html('<?php _e('Dummy post(s) inserted:', 'geodirectory'); ?> ' + dummy_post_index + ' <?php _e('of', 'geodirectory'); ?> ' + total_dummy_post_count + '');

                                 dummy_post_index++;

                                 if (dummy_post_index <= total_dummy_post_count)

                                     geodir_autoinstall(obj, id, nonce, posttype);

@@ -668,7 +668,7 @@ 
                     else

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

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

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

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

 

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

                         $new_path = $uploaded['file'];

@@ -709,7 +709,7 @@ 
                 else

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

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

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

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

 

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

                     $new_path = $uploaded['file'];

@@ -1021,7 +1021,7 @@ 
  */

 function geodir_extend_geodirectory_setting_tab($tabs)

 {

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

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

     return $tabs;

 }

 

@@ -1174,7 +1174,7 @@ 
 function geodir_post_information_save($post_id, $post) {

     global $wpdb, $current_user;

 

-    if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {

+    if (isset($post->post_type) && ($post->post_type == 'nav_menu_item' || $post->post_type == 'page' || $post->post_type == 'post')) {

         return;

     }

 

@@ -1256,7 +1256,7 @@ 
 

         if (isset($_REQUEST['active_tab']) && $_REQUEST['active_tab'] == 'csv_upload_settings') {

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

-                $rowcount = (int)$_REQUEST['rowcount'];

+                $rowcount = (int) $_REQUEST['rowcount'];

                 $uploads = wp_upload_dir();

                 ?>

                 <div class="updated fade below-h2" id="message" style="background-color: rgb(255, 251, 204); margin-left:0px; margin-top:0px; margin-bottom:10px;">

@@ -1270,25 +1270,25 @@ 
 

                     if (isset($_REQUEST['invalidcount']) && $_REQUEST['invalidcount'] > 0) {

                         echo '<p>';

-                        printf(CSV_INVALID_DEFUALT_ADDRESS, (int)$_REQUEST['invalidcount'], (int)$_REQUEST['total_records']);

+                        printf(CSV_INVALID_DEFUALT_ADDRESS, (int) $_REQUEST['invalidcount'], (int) $_REQUEST['total_records']);

                         echo '</p>';

                     }

 

                     if (isset($_REQUEST['blank_address']) && $_REQUEST['blank_address'] > 0) {

                         echo '<p>';

-                        printf(CSV_INVALID_TOTAL_RECORD, (int)$_REQUEST['blank_address'], (int)$_REQUEST['total_records']);

+                        printf(CSV_INVALID_TOTAL_RECORD, (int) $_REQUEST['blank_address'], (int) $_REQUEST['total_records']);

                         echo '</p>';

                     }

 

                     if (isset($_REQUEST['invalid_post_type']) && $_REQUEST['invalid_post_type'] > 0) {

                         echo '<p>';

-                        printf(CSV_INVALID_POST_TYPE, (int)$_REQUEST['invalid_post_type'], (int)$_REQUEST['total_records']);

+                        printf(CSV_INVALID_POST_TYPE, (int) $_REQUEST['invalid_post_type'], (int) $_REQUEST['total_records']);

                         echo '</p>';

                     }

 

                     if (isset($_REQUEST['invalid_title']) && $_REQUEST['invalid_title'] > 0) {

                         echo '<p>';

-                        printf(CSV_BLANK_POST_TITLE, (int)$_REQUEST['invalid_title'], (int)$_REQUEST['total_records']);

+                        printf(CSV_BLANK_POST_TITLE, (int) $_REQUEST['invalid_title'], (int) $_REQUEST['total_records']);

                         echo '</p>';

                     }

 

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

 

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

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

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

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

 

                     return false;

@@ -1658,38 +1658,38 @@ 
 

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

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

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

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

                 }

 

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

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

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

 

                 if (gd_invalidcount > 0) {

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

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

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

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

                     gdMsg += msgParse;

                 }

                 if (gd_blank_address > 0) {

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

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

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

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

                     gdMsg += msgParse;

                 }

                 if (gd_invalid_post_type > 0) {

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

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

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

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

                     gdMsg += msgParse;

                 }

                 if (gd_invalid_title > 0) {

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

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

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

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

                     gdMsg += msgParse;

                 }

                 if (gd_upload_files > 0) {

-                    gdMsg += '<p><?php echo addslashes( sprintf( CSV_TRANSFER_IMG_FOLDER, $uploads['subdir'] ) );?></p>';

+                    gdMsg += '<p><?php echo addslashes(sprintf(CSV_TRANSFER_IMG_FOLDER, $uploads['subdir'])); ?></p>';

                 }

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

                 jQuery('#gd-import-msg').find('#message').removeClass('error').addClass('updated').html(gdMsg);

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

             <tbody>

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

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

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

                 <td class="forminp">

                     <div class="gtd-formfeild">

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

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

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

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

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

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

                                id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none"

                                onclick="gdTerminateImport()"/>

 

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

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

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

                         </div>

                     </div>

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

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

                     </div>

                     <div class="gd-import-progress" id="gd-import-progress" style="display:none">

-                        <div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font

+                        <div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font

                                 id="gd-import-done">0</font> / <font id="gd-import-total">0</font>&nbsp;( <font

                                 id="gd-import-perc">0%</font> )

                             <div class="gd-fileprogress"></div>

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

                             $package_info = array();

 

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

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

                             $package_id = '';

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

                                 $package_id = $gd_post_info['package_id'];

@@ -2250,7 +2250,7 @@ 
                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

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

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

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

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

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

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

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

@@ -2267,7 +2267,7 @@ 
                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

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

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

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

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

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

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

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

@@ -2368,7 +2368,7 @@ 
                                             id="<?php echo esc_attr($value['id']); ?>"

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

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

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

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

                                             option-ajaxchosen="false">

                         <?php

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

@@ -2416,7 +2416,7 @@ 
                 ?>

 

                 <tr valign="top">

-                    <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>

+                    <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory'); ?></th>

                     <td width="60%">

                         <select name="geodir_default_map_language" style="width:60%">

                             <?php

@@ -2498,7 +2498,7 @@ 
 

                 <tr valign="top">

                     <th class="titledesc"

-                        width="40%"><?php _e('Default post type search on map', 'geodirectory');?></th>

+                        width="40%"><?php _e('Default post type search on map', 'geodirectory'); ?></th>

                     <td width="60%">

                         <select name="geodir_default_map_search_pt" style="width:60%">

                             <?php

@@ -2539,7 +2539,7 @@ 
                         $cat_display = 'checkbox';

                         $gd_post_types = get_option('geodir_exclude_post_type_on_map');

                         $gd_cats = get_option('geodir_exclude_cat_on_map');

-                        $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');

+                        $gd_cats_upgrade = (int) get_option('geodir_exclude_cat_on_map_upgrade');

                         $count = 1;

                         ?>

                         <table width="70%" class="widefat">

@@ -2568,7 +2568,7 @@ 
                                                                                            name="home_map_post_types[]"

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

                                                                                            value="<?php echo $key; ?>"

-                                                                                           class="map_post_type" <?php echo $checked;?> />

+                                                                                           class="map_post_type" <?php echo $checked; ?> />

                                         <?php echo $post_types_obj->labels->singular_name; ?></td>

                                     <td width="40%">

                                         <div class="home_map_category" style="overflow:auto;width:200px;height:100px;"

@@ -2626,12 +2626,12 @@ 
                 ?>

                 <fieldset>

                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>

-                    <label for="<?php echo $value['id'];?>">

+                    <label for="<?php echo $value['id']; ?>">

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

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

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

                             echo 'checked="checked"';

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

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

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

                 </fieldset>

                 <?php

@@ -2653,7 +2653,7 @@ 
                     <textarea

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

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

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

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

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

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

 

@@ -2700,7 +2700,7 @@ 
 					}

 				}

 				//

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

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

 

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

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

@@ -2727,7 +2727,7 @@ 
                 break;

             case 'single_select_country' :

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

-                $country_setting = (string)get_option($value['id']);

+                $country_setting = (string) get_option($value['id']);

                 if (strstr($country_setting, ':')) :

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

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

@@ -2750,7 +2750,7 @@ 
             case 'multi_select_countries' :

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

                 asort($countries);

-                $selections = (array)get_option($value['id']);

+                $selections = (array) get_option($value['id']);

                 ?>

                 <tr valign="top">

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

@@ -2772,8 +2772,8 @@ 
                 break;

 

             case 'google_analytics' :

-                $selections = (array)get_option($value['id']);

-                if(get_option('geodir_ga_client_id') && get_option('geodir_ga_client_secret') ) {

+                $selections = (array) get_option($value['id']);

+                if (get_option('geodir_ga_client_id') && get_option('geodir_ga_client_secret')) {

                     ?>

                     <tr valign="top">

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

@@ -2784,10 +2784,10 @@ 
 

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

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

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

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

                             $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

                             $response_type = "&response_type=code";

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

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

                             $access_type = "&access_type=offline";

                             $approval_prompt = "&approval_prompt=force";

 

@@ -2797,7 +2797,7 @@ 
                             ?>

                             <script>

                                 function gd_ga_popup() {

-                                    var win = window.open("<?php echo $auth_url;?>", "Google Analytics", "");

+                                    var win = window.open("<?php echo $auth_url; ?>", "Google Analytics", "");

                                     var pollTimer = window.setInterval(function () {

                                         if (win.closed !== false) { // !== is required for compatibility with Opera

                                             window.clearInterval(pollTimer);

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

                                 ?>

                                 <span class="button-primary"

-                                      onclick="gd_ga_popup();"><?php _e('Authorize', 'geodirectory');?></span>

+                                      onclick="gd_ga_popup();"><?php _e('Authorize', 'geodirectory'); ?></span>

                             <?php

                             }

                             ?>

@@ -2890,9 +2890,9 @@ 
 

             <?php if (isset($_REQUEST['active_tab']) && $_REQUEST['active_tab'] != '') { ?>

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

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

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

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

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

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

             <?php } ?>

         });

     </script>

@@ -3034,7 +3034,7 @@ 
         <div

             class="plupload-upload-uic hide-if-no-js <?php if ($multiple): ?>plupload-upload-uic-multiple<?php endif; ?>"

             id="<?php echo $id; ?>plupload-upload-ui">

-            <h4><?php _e('Drop files to upload', 'geodirectory');?></h4>

+            <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4>

             <input id="<?php echo $id; ?>plupload-browse-button" type="button"

                    value="<?php _e('Select Files', 'geodirectory'); ?>" class="button"/>

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

@@ -3049,7 +3049,7 @@ 
              id="<?php echo $id; ?>plupload-thumbs" style="border-top:1px solid #ccc; padding-top:10px;">

         </div>

         <span

-            id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory');?></span>

+            id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory'); ?></span>

         <span id="<?php echo $id; ?>upload-error" style="display:none"></span>

     </div>

 

@@ -3427,11 +3427,11 @@ 
 function geodir_hide_admin_preview_button() {

     global $post_type;

     $post_types = geodir_get_posttypes();

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

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

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

 }

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

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

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

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

 

 /**

  * Add the tab in left sidebar menu fro import & export page.

@@ -3441,8 +3441,8 @@ 
  *

  * @return array Array of tab data.

  */

-function geodir_import_export_tab( $tabs ) {

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

+function geodir_import_export_tab($tabs) {

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

     return $tabs;

 }

 

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

  */

 function geodir_import_export_page() {

-	$nonce = wp_create_nonce( 'geodir_import_export_nonce' );

+	$nonce = wp_create_nonce('geodir_import_export_nonce');

 	$gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';

     /**

      * Filter sample category data csv file url.

@@ -3466,7 +3466,7 @@ 
      *

      * @param string $gd_cats_sample_csv Sample category data csv file url.

      */

-	$gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv );

+	$gd_cats_sample_csv = apply_filters('geodir_export_cats_sample_csv', $gd_cats_sample_csv);

 	

 	$gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';

     /**

@@ -3477,15 +3477,15 @@ 
      *

      * @param string $gd_posts_sample_csv Sample post data csv file url.

      */

-    $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );

+    $gd_posts_sample_csv = apply_filters('geodir_export_posts_sample_csv', $gd_posts_sample_csv);

 	

-	$gd_posttypes = geodir_get_posttypes( 'array' );

+	$gd_posttypes = geodir_get_posttypes('array');

 	

 	$gd_posttypes_option = '';

-	foreach ( $gd_posttypes as $gd_posttype => $row ) {

-		$gd_posttypes_option .= '<option value="' . $gd_posttype . '" data-cats="' . (int)geodir_get_terms_count( $gd_posttype ) . '" data-posts="' . (int)geodir_get_posts_count( $gd_posttype ) . '">' . __( $row['labels']['name'], 'geodirectory' ) . '</option>';

+	foreach ($gd_posttypes as $gd_posttype => $row) {

+		$gd_posttypes_option .= '<option value="' . $gd_posttype . '" data-cats="' . (int) geodir_get_terms_count($gd_posttype) . '" data-posts="' . (int) geodir_get_posts_count($gd_posttype) . '">' . __($row['labels']['name'], 'geodirectory') . '</option>';

 	}

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

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

 	

 	$gd_chunksize_options = array();

 	$gd_chunksize_options[100] = 100;

@@ -3507,7 +3507,7 @@ 
      *

      * @param string $gd_chunksize_options Entries options.

      */

-    $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

+    $gd_chunksize_options = apply_filters('geodir_export_csv_chunksize_options', $gd_chunksize_options);

 	

 	$gd_chunksize_option = '';

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

@@ -3518,38 +3518,38 @@ 
 ?>

 </form>

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

-  <h3><?php _e( 'GD Import & Export CSV', 'geodirectory' ) ;?></h3>

-  <span class="description"><?php _e( 'Import & export csv for GD listings & categories.', 'geodirectory' ) ;?></span>

+  <h3><?php _e('GD Import & Export CSV', 'geodirectory'); ?></h3>

+  <span class="description"><?php _e('Import & export csv for GD listings & categories.', 'geodirectory'); ?></span>

   <div class="gd-content-heading">

 

   <?php

     ini_set('max_execution_time', 999999);

-    $ini_max_execution_time_check = @ini_get( 'max_execution_time' );

+    $ini_max_execution_time_check = @ini_get('max_execution_time');

     ini_restore('max_execution_time');

 

-    if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting

+    if ($ini_max_execution_time_check != 999999) { // only show these setting to the user if we can't change the ini setting

         ?>

 	<div id="gd_ie_reqs" class="metabox-holder">

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

         <div class="postbox">

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

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

           <div class="inside">

-            <span class="description"><?php echo __( 'Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory' );?></span>

+            <span class="description"><?php echo __('Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory'); ?></span>

 			<table class="form-table">

 				<thead>

 				  <tr>

-				  	<th><?php _e( 'PHP Settings', 'geodirectory' );?></th><th><?php _e( 'Current Value', 'geodirectory' );?></th><th><?php _e( 'Recommended Value', 'geodirectory' );?></th>

+				  	<th><?php _e('PHP Settings', 'geodirectory'); ?></th><th><?php _e('Current Value', 'geodirectory'); ?></th><th><?php _e('Recommended Value', 'geodirectory'); ?></th>

 				  </tr>

 				</thead>

 				<tbody>

 				  <tr>

-				  	<td>max_input_time</td><td><?php echo @ini_get( 'max_input_time' );?></td><td>3000</td>

+				  	<td>max_input_time</td><td><?php echo @ini_get('max_input_time'); ?></td><td>3000</td>

 				  </tr>

 				  <tr>

-				  	<td>max_execution_time</td><td><?php  echo @ini_get( 'max_execution_time' );?></td><td>3000</td>

+				  	<td>max_execution_time</td><td><?php  echo @ini_get('max_execution_time'); ?></td><td>3000</td>

 				  </tr>

 				  <tr>

-				  	<td>memory_limit</td><td><?php echo @ini_get( 'memory_limit' );?></td><td>256M</td>

+				  	<td>memory_limit</td><td><?php echo @ini_get('memory_limit'); ?></td><td>256M</td>

 				  </tr>

 				</tbody>

 		    </table>

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

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

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

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

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

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

 					<td class="gd-imex-box">

 						<div class="gd-im-choices">

-						<p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e( 'Update listing if post with post_id already exists.', 'geodirectory' );?></label></p>

-						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e( 'Ignore listing if post with post_id already exists.', 'geodirectory' );?></label></p>

+						<p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e('Update listing if post with post_id already exists.', 'geodirectory'); ?></label></p>

+						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e('Ignore listing if post with post_id already exists.', 'geodirectory'); ?></label></p>

 						</div>

 						<div class="plupload-upload-uic hide-if-no-js" id="gd_im_postplupload-upload-ui">

 							<input type="text" readonly="readonly" name="gd_im_post_file" class="gd-imex-file gd_im_post_file" id="gd_im_post" onclick="jQuery('#gd_im_postplupload-browse-button').trigger('click');" />

-							<input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">

-						<input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv;?>" />

+							<input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">

+						<input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv; ?>" />

 							<?php

 							/**

 							 * Called just after the sample CSV download link.

@@ -3583,7 +3583,7 @@ 
 							 */

 							do_action('geodir_sample_csv_download_link');

 							?>

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

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

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

 						</div>

 						<span id="gd_im_catupload-error" style="display:none"></span>

@@ -3601,7 +3601,7 @@ 
 							<input type="hidden" id="gd_terminateaction" value="continue"/>

 						</div>

 						<div class="gd-import-progress" id="gd-import-progress" style="display:none">

-							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font

+							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font

 									id="gd-import-done">0</font> / <font id="gd-import-total">0</font>&nbsp;( <font

 									id="gd-import-perc">0%</font> )

 								<div class="gd-fileprogress"></div>

@@ -3613,10 +3613,10 @@ 
                     	<div class="gd-imex-btns" style="display:none;">

                         	<input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/>

                         	<input onclick="gd_imex_PrepareImport(this, 'post')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" />

-                        	<input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/>

-                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>

+                        	<input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>

+                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>

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

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

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

 							</div>

 						</div>

 					</td>

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

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

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

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

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

 		  <div class="inside">

 			<table class="form-table">

 			  <tbody>

 				<tr>

 				  <td class="fld"><label for="gd_post_type">

-					<?php _e( 'Post Type:', 'geodirectory' );?>

+					<?php _e('Post Type:', 'geodirectory'); ?>

 					</label></td>

 				  <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px">

-					  <?php echo $gd_posttypes_option;?>

+					  <?php echo $gd_posttypes_option; ?>

 					</select></td>

 				</tr>

 				<tr>

-					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td>

-					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td>

+					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>

 				  </tr>

 				<tr>

 				  <td class="fld" style="vertical-align:top"><label>

-					<?php _e( 'Progress:', 'geodirectory' );?>

+					<?php _e('Progress:', 'geodirectory'); ?>

 					</label></td>

 				  <td><div id='gd_progressbar_box'>

 					  <div id="gd_progressbar" class="gd_progressbar">

@@ -3656,13 +3656,13 @@ 
 					  </div>

 					</div>

 					<p style="display:inline-block">

-					  <?php _e( 'Elapsed Time:', 'geodirectory' );?>

+					  <?php _e('Elapsed Time:', 'geodirectory'); ?>

 					</p>

 					  

 					<p id="gd_timer" class="gd_timer">00:00:00</p></td>

 				</tr>

 				<tr class="gd-ie-actions">

-				  <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit">

+				  <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit">

 				  </td>

 				  <td id="gd_ie_ex_files" class="gd-ie-files"></td>

 				</tr>

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

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

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

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

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

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

 					<td class="gd-imex-box">

 						<div class="gd-im-choices">

-						<p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e( 'Update item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p>

-						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e( 'Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p>

+						<p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e('Update item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>

+						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e('Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>

 						</div>

 						<div class="plupload-upload-uic hide-if-no-js" id="gd_im_catplupload-upload-ui">

 							<input type="text" readonly="readonly" name="gd_im_cat_file" class="gd-imex-file gd_im_cat_file" id="gd_im_cat" onclick="jQuery('#gd_im_catplupload-browse-button').trigger('click');" />

-							<input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">

-						<input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv;?>" />

+							<input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">

+						<input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv; ?>" />

 						<?php

 						/**

 						 * Called just after the sample CSV download link.

@@ -3698,7 +3698,7 @@ 
 						 */

 						do_action('geodir_sample_cats_csv_download_link');

 						?>

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

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

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

 						</div>

 						<span id="gd_im_catupload-error" style="display:none"></span>

@@ -3715,7 +3715,7 @@ 
 							<input type="hidden" id="gd_terminateaction" value="continue"/>

 						</div>

 						<div class="gd-import-progress" id="gd-import-progress" style="display:none">

-							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font

+							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font

 									id="gd-import-done">0</font> / <font id="gd-import-total">0</font>&nbsp;( <font

 									id="gd-import-perc">0%</font> )

 								<div class="gd-fileprogress"></div>

@@ -3727,10 +3727,10 @@ 
                     	<div class="gd-imex-btns" style="display:none;">

                         	<input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/>

                         	<input onclick="gd_imex_PrepareImport(this, 'cat')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" />

-                        	<input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/>

-                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>

+                        	<input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>

+                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>

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

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

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

 							</div>

 						</div>

 					</td>

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

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

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

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

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

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

-					<td class="fld"><label for="gd_post_type"><?php _e( 'Post Type:', 'geodirectory' );?></label></td>

-					<td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option;?></select></td>

+					<td class="fld"><label for="gd_post_type"><?php _e('Post Type:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option; ?></select></td>

 				  </tr>

 				   <tr>

-					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td>

-					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td>

+					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>

 				  </tr>

 				  <tr>

-					<td class="fld" style="vertical-align:top"><label><?php _e( 'Progress:', 'geodirectory' );?></label></td>

-					<td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e( 'Elapsed Time:', 'geodirectory' );?></p>&nbsp;&nbsp;<p id="gd_timer" class="gd_timer">00:00:00</p></td>

+					<td class="fld" style="vertical-align:top"><label><?php _e('Progress:', 'geodirectory'); ?></label></td>

+					<td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e('Elapsed Time:', 'geodirectory'); ?></p>&nbsp;&nbsp;<p id="gd_timer" class="gd_timer">00:00:00</p></td>

 				  </tr>

 				  <tr class="gd-ie-actions">

 					<td style="vertical-align:top">

-						<input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">

+						<input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">

 					</td>

 					<td id="gd_ie_ex_files" class="gd-ie-files"></td>

 				  </tr>

@@ -3784,7 +3784,7 @@ 
      * @param array $gd_chunksize_options File chunk size options.

      * @param string $nonce Wordpress security token for GD import & export.

 	 */

-	do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce );

+	do_action('geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce);

 	?>

   </div>

 </div>

@@ -3803,7 +3803,7 @@ 
 		jQuery.ajax({

 			url: ajaxurl,

 			type: "POST",

-			data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce;?>',

+			data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce; ?>',

 			dataType: 'json',

 			cache: false,

 			success: function(data) {

@@ -3855,7 +3855,7 @@ 
 

 		jQuery(cont).find('.filelist .file').remove();

 		

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

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

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

 		

 		return false;

@@ -3914,7 +3914,7 @@ 
 	jQuery.ajax({

 		url: ajaxurl,

 		type: "POST",

-		data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce;?>',

+		data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce; ?>',

 		dataType : 'json',

 		cache: false,

 		success: function (data) {

@@ -4090,27 +4090,27 @@ 
 	

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

 	if ( processed > 0 ) {

-		var msgParse = '<p><?php echo addslashes( sprintf( __( 'Total %s item(s) found.', 'geodirectory' ), '%s' ) );?></p>';

+		var msgParse = '<p><?php echo addslashes(sprintf(__('Total %s item(s) found.', 'geodirectory'), '%s')); ?></p>';

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

 		gdMsg += msgParse;

 	}

 	

 	if ( updated > 0 ) {

-		var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) updated.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+		var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) updated.', 'geodirectory'), '%s', '%d')); ?></p>';

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

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

 		gdMsg += msgParse;

 	}

 	

 	if ( created > 0 ) {

-		var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) added.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+		var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) added.', 'geodirectory'), '%s', '%d')); ?></p>';

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

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

 		gdMsg += msgParse;

 	}

 	

 	if ( skipped > 0 ) {

-		var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) ignored due to already exists.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+		var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) ignored due to already exists.', 'geodirectory'), '%s', '%d')); ?></p>';

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

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

 		gdMsg += msgParse;

@@ -4120,21 +4120,21 @@ 
 		if (type=='loc') {

 			invalid_addr = invalid;

 		}

-		var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ), '%s', '%d' ) );?></p>';

+		var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'), '%s', '%d')); ?></p>';

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

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

 		gdMsg += msgParse;

 	}

 	

 	if (invalid > 0 && type!='loc') {

-		var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank title/invalid post type.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+		var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank title/invalid post type.', 'geodirectory'), '%s', '%d')); ?></p>';

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

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

 		gdMsg += msgParse;

 	}

 	

 	if (images > 0) {

-		gdMsg += '<p><?php echo addslashes( sprintf( CSV_TRANSFER_IMG_FOLDER, $uploads['subdir'] ) );?></p>';

+		gdMsg += '<p><?php echo addslashes(sprintf(CSV_TRANSFER_IMG_FOLDER, $uploads['subdir'])); ?></p>';

 	}

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

 	jQuery('#gd-import-msg', cont).find('#message').removeClass('error').addClass('updated').html(gdMsg);

@@ -4283,7 +4283,7 @@ 
 		

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

 		if (page < 2) {

-			gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+			gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

 			jQuery(el).find('#gd_timer').text('00:00:01');

 			jQuery('#gd_ie_ex_files', el).html('');

 		}

@@ -4291,7 +4291,7 @@ 
 		jQuery.ajax({

 			url: ajaxurl,

 			type: "POST",

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

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

 			dataType : 'json',

 			cache: false,

 			beforeSend: function (jqXHR, settings) {},

@@ -4305,11 +4305,11 @@ 
 					} else {

 						if (pages < page || pages == page) {

 							window.clearInterval(timer_posts);

-							gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');

+							gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');

 						} else {

 							var percentage = Math.ceil(( page / pages ) * 100);

 							percentage = percentage > 100 ? 100 : percentage;

-							gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+							gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

 						}

 						if (typeof data.files != 'undefined' && jQuery(data.files).length ) {

 							var obj_files = data.files;

@@ -4339,7 +4339,7 @@ 
 	

 	function gd_process_export_cats(el, post_type, total_cats, chunk_size, pages, page) {

 		if (page < 2) {

-			gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+			gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

 			jQuery(el).find('#gd_timer').text('00:00:01');

 			jQuery('#gd_ie_ex_files', el).html('');

 		}

@@ -4347,7 +4347,7 @@ 
 		jQuery.ajax({

 			url: ajaxurl,

 			type: "POST",

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

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

 			dataType : 'json',

 			cache: false,

 			beforeSend: function (jqXHR, settings) {},

@@ -4361,11 +4361,11 @@ 
 					} else {

 						if (pages < page || pages == page) {

 							window.clearInterval(timer_cats);

-							gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');

+							gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');

 						} else {

 							var percentage = Math.ceil(( page / pages ) * 100);

 							percentage = percentage > 100 ? 100 : percentage;

-							gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e( 'Exporting...', 'geodirectory' );?>');

+							gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e('Exporting...', 'geodirectory'); ?>');

 						}

 						if (typeof data.files != 'undefined' && jQuery(data.files).length ) {

 							var obj_files = data.files;

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

 {

 

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

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

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

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

     }

     $access_type = get_filesystem_method();

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

@@ -4476,7 +4476,7 @@ 
  * @package GeoDirectory

  */

 function geodir_filesystem_notice()

-{   if ( defined( 'DOING_AJAX' ) ){return;}

+{   if (defined('DOING_AJAX')) {return; }

     $access_type = get_filesystem_method();

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

     } elseif (!defined('FTP_USER')) {

@@ -4513,61 +4513,61 @@ 
     // try to set higher limits for import

     $max_input_time = ini_get('max_input_time');

     $max_execution_time = ini_get('max_execution_time');

-    $memory_limit= ini_get('memory_limit');

+    $memory_limit = ini_get('memory_limit');

 

-    if(!$max_input_time || $max_input_time<3000){

+    if (!$max_input_time || $max_input_time < 3000) {

         ini_set('max_input_time', 3000);

     }

 

-    if(!$max_execution_time || $max_execution_time<3000){

+    if (!$max_execution_time || $max_execution_time < 3000) {

         ini_set('max_execution_time', 3000);

     }

 

-    if($memory_limit && str_replace('M','',$memory_limit)){

-        if(str_replace('M','',$memory_limit)<256){

+    if ($memory_limit && str_replace('M', '', $memory_limit)) {

+        if (str_replace('M', '', $memory_limit) < 256) {

             ini_set('memory_limit', '256M');

         }

     }

 

     $json = array();

 

-    if ( !current_user_can( 'manage_options' ) ) {

-        wp_send_json( $json );

+    if (!current_user_can('manage_options')) {

+        wp_send_json($json);

     }

 

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

-    $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

-    $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

+    $task = isset($_REQUEST['task']) ? $_REQUEST['task'] : NULL;

+    $nonce = isset($_REQUEST['_nonce']) ? $_REQUEST['_nonce'] : NULL;

+    $stat = isset($_REQUEST['_st']) ? $_REQUEST['_st'] : false;

 

-    if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

-        wp_send_json( $json );

+    if (!wp_verify_nonce($nonce, 'geodir_import_export_nonce')) {

+        wp_send_json($json);

     }

 

-    $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;

-    $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

+    $post_type = isset($_REQUEST['_pt']) ? $_REQUEST['_pt'] : NULL;

+    $chunk_per_page = isset($_REQUEST['_n']) ? absint($_REQUEST['_n']) : NULL;

     $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

-    $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

+    $chunk_page_no = isset($_REQUEST['_p']) ? absint($_REQUEST['_p']) : 1;

 

     $wp_filesystem = geodir_init_filesystem();

     if (!$wp_filesystem) {

-        $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );

-        wp_send_json( $json );

+        $json['error'] = __('Filesystem ERROR: Could not access filesystem.', 'geodirectory');

+        wp_send_json($json);

     }

 

     if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {

-        $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );

-        wp_send_json( $json );

+        $json['error'] = __('Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory');

+        wp_send_json($json);

     }

 

-    $csv_file_dir = geodir_path_import_export( false );

-    if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

-        if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

-            $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

-            wp_send_json( $json );

+    $csv_file_dir = geodir_path_import_export(false);

+    if (!$wp_filesystem->is_dir($csv_file_dir)) {

+        if (!$wp_filesystem->mkdir($csv_file_dir, FS_CHMOD_DIR)) {

+            $json['error'] = __('ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory');

+            wp_send_json($json);

         }

     }

 

-    switch ( $task ) {

+    switch ($task) {

         case 'export_posts': {

             // WPML

             $is_wpml = geodir_is_wpml();

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

             }

             // WPML

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

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

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

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

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

             }

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

-            $posts_count = geodir_get_posts_count( $post_type );

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

+            $posts_count = geodir_get_posts_count($post_type);

             $file_url_base = geodir_path_import_export() . '/';

             $file_url = $file_url_base . $file_name . '.csv';

             $file_path = $csv_file_dir . '/' . $file_name . '.csv';

@@ -4591,10 +4591,10 @@ 
             

             $chunk_file_paths = array();

 

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($posts_count) > 0 && $line_count > 0 ? ceil($line_count / $posts_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

                 // WPML

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

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

                 exit;

             } else {				

-                if ( !$posts_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$posts_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

                     $total_posts = $posts_count;

                     if ($chunk_per_page > $total_posts) {

                         $chunk_per_page = $total_posts;

                     }

-                    $chunk_total_pages = ceil( $total_posts / $chunk_per_page );

+                    $chunk_total_pages = ceil($total_posts / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

+                    $chunk_save_posts = geodir_imex_get_posts($post_type, $chunk_per_page, $j);

                     

                     $per_page = 500;

                     if ($per_page > $chunk_per_page) {

                         $per_page = $chunk_per_page;

                     }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

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

-                        $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_posts = array_slice($chunk_save_posts, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_posts, $clear);

                     }

                         

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

+                    if ($wp_filesystem->exists($file_path_temp)) {

                         $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

                         $chunk_file_name = $file_name . $chunk_page_no . '.csv';

                         $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

                         $file_url = $file_url_base . $chunk_file_name;

                         $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $posts_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+                        $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');

                     }

                 }

                 // WPML

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

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

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

             }

             // WPML

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

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

             

-            $terms_count = geodir_get_terms_count( $post_type );

+            $terms_count = geodir_get_terms_count($post_type);

             $file_url_base = geodir_path_import_export() . '/';

             $file_url = $file_url_base . $file_name . '.csv';

             $file_path = $csv_file_dir . '/' . $file_name . '.csv';

@@ -4676,10 +4676,10 @@ 
             

             $chunk_file_paths = array();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($terms_count) > 0 && $line_count > 0 ? ceil($line_count / $terms_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

                 // WPML

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

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {				

-                if ( !$terms_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$terms_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

                     $total_terms = $terms_count;

                     if ($chunk_per_page > $terms_count) {

                         $chunk_per_page = $terms_count;

                     }

-                    $chunk_total_pages = ceil( $total_terms / $chunk_per_page );

+                    $chunk_total_pages = ceil($total_terms / $chunk_per_page);

                     

                     $j = $chunk_page_no;					

-                    $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

+                    $chunk_save_terms = geodir_imex_get_terms($post_type, $chunk_per_page, $j);

                     

                     $per_page = 500;

                     if ($per_page > $chunk_per_page) {

                         $per_page = $chunk_per_page;

                     }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

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

-                        $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_terms = array_slice($chunk_save_terms, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_terms, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

+                    if ($wp_filesystem->exists($file_path_temp)) {

                         $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

                         $chunk_file_name = $file_name . $chunk_page_no . '.csv';

                         $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

                         $file_url = $file_url_base . $chunk_file_name;

                         $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $terms_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+                        $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');

                     }

                 }

                 // WPML

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

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

         case 'export_locations': {

             $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_locations_' . date( 'dmyHi' );			

+            $file_name = 'gd_locations_' . date('dmyHi');			

             $file_url = $file_url_base . $file_name . '.csv';

             $file_path = $csv_file_dir . '/' . $file_name . '.csv';

             $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

             

-            $items_count = (int)geodir_location_imex_count_locations();

+            $items_count = (int) geodir_location_imex_count_locations();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

                 $chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$items_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+                    $chunk_per_page = min($chunk_per_page, $items_count);

+                    $chunk_total_pages = ceil($items_count / $chunk_per_page);

                     

                     $j = $chunk_page_no;					

-                    $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

+                    $chunk_save_items = geodir_location_imex_locations_data($chunk_per_page, $j);

                     

                     $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $per_page = min($per_page, $chunk_per_page);

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

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

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_items, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

+                    if ($wp_filesystem->exists($file_path_temp)) {

                         $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

                         $chunk_file_name = $file_name . $chunk_page_no . '.csv';

                         $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

                         $file_url = $file_url_base . $chunk_file_name;

                         $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $items_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+                        $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');

                     }

                 }

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -4812,32 +4812,32 @@ 
             }

             // WPML

             

-            ini_set( 'auto_detect_line_endings', true );

+            ini_set('auto_detect_line_endings', true);

             

             $uploads = wp_upload_dir();

             $uploads_dir = $uploads['path'];

             $uploads_subdir = $uploads['subdir'];

             

-            $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

-            $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

+            $csv_file = isset($_POST['_file']) ? $_POST['_file'] : NULL;

+            $import_choice = isset($_REQUEST['_ch']) ? $_REQUEST['_ch'] : 'skip';

             

-            $csv_file_arr = explode( '/', $csv_file );

-            $csv_filename = end( $csv_file_arr );

+            $csv_file_arr = explode('/', $csv_file);

+            $csv_filename = end($csv_file_arr);

             $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

             

             $json['file'] = $csv_file;

-            $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

+            $json['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

 

-            if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

-                $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

+            if ($csv_file && $wp_filesystem->is_file($target_path) && $wp_filesystem->exists($target_path)) {

+                $wp_filetype = wp_check_filetype_and_ext($target_path, $csv_filename);

                 

                 if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

                     $json['error'] = NULL;

                     $json['rows'] = 0;

                     

-                    if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

-                        while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

-                            if ( !empty( $data ) ) {

+                    if (($handle = fopen($target_path, "r")) !== FALSE) {

+                        while (($data = fgetcsv($handle, 100000, ",")) !== FALSE) {

+                            if (!empty($data)) {

                                 $file[] = $data;

                             }

                         }

@@ -4850,19 +4850,19 @@ 
                         $json['error'] = __('No data found in csv file.', 'geodirectory');

                     }

                 } else {

-                    wp_send_json( $json );

+                    wp_send_json($json);

                 }

             } else {

-                wp_send_json( $json );

+                wp_send_json($json);

             }

             

-            if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {

-                wp_send_json( $json );

+            if ($task == 'prepare_import' || !empty($json['error'])) {

+                wp_send_json($json);

             }

             

             $total = $json['rows'];

-            $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

-            $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

+            $limit = isset($_POST['limit']) ? (int) $_POST['limit'] : 1;

+            $processed = isset($_POST['processed']) ? (int) $_POST['processed'] : 0;

             

             $count = $limit;

             $requested_limit = $limit;

@@ -4891,13 +4891,13 @@ 
             

             $post_types = geodir_get_posttypes();

 

-            if ( $task == 'import_cat' ) {				

+            if ($task == 'import_cat') {				

                 if (!empty($file)) {

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

+                        wp_send_json($json);

                         exit;

                     }

                     

@@ -4906,7 +4906,7 @@ 
                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             //$row = array_map( 'utf8_encode', $row );

                             

                             $cat_id = '';

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

                             

                             $c = 0;

-                            foreach ($columns as $column ) {

-                                if ( $column == 'cat_id' ) {

-                                    $cat_id = (int)$row[$c];

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

+                            foreach ($columns as $column) {

+                                if ($column == 'cat_id') {

+                                    $cat_id = (int) $row[$c];

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

                                     $cat_name = $row[$c];

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

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

                                     $cat_slug = $row[$c];

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

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

                                     $cat_posttype = $row[$c];

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

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

                                     $cat_parent = trim($row[$c]);

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

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

                                     $cat_schema = $row[$c];

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

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

                                     $cat_description = $row[$c];

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

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

                                     $cat_top_description = $row[$c];

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

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

                                     $cat_image = $row[$c];

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

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

                                     $cat_icon = $row[$c];

                                 }

                                 // WPML

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

                             }

                             

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

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

                                 $invalid++;

                                 continue;

                             }

@@ -4969,8 +4969,8 @@ 
                             $term_data['description'] = $cat_description;

                             $term_data['cat_schema'] = $cat_schema;

                             $term_data['top_description'] = $cat_top_description;

-                            $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

-                            $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

+                            $term_data['image'] = $cat_image != '' ? basename($cat_image) : '';

+                            $term_data['icon'] = $cat_icon != '' ? basename($cat_icon) : '';

                             

                             //$term_data = array_map( 'utf8_encode', $term_data );

                             

@@ -4979,14 +4979,14 @@ 
                             $term_data['taxonomy'] = $taxonomy;

 

                             $term_parent_id = 0;

-                            if ($cat_parent != "" || (int)$cat_parent > 0) {

+                            if ($cat_parent != "" || (int) $cat_parent > 0) {

                                 $term_parent = '';

                                 

-                                if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

+                                if ($term_parent = get_term_by('name', $cat_parent, $taxonomy)) {

                                     $term_parent = $term_parent;

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

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

                                     $term_parent = $term_parent;

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

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

                                     $term_parent = $term_parent;

                                 } else {

                                     $term_parent_data = array();

@@ -4994,47 +4994,47 @@ 
                                     //$term_parent_data = array_map( 'utf8_encode', $term_parent_data );										

                                     $term_parent_data['taxonomy'] = $taxonomy;

                                     

-                                    $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

+                                    $term_parent_id = (int) geodir_imex_insert_term($taxonomy, $term_parent_data);

                                 }

                                 

-                                if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

-                                    $term_parent_id = (int)$term_parent->term_id;

+                                if (!empty($term_parent) && !is_wp_error($term_parent)) {

+                                    $term_parent_id = (int) $term_parent->term_id;

                                 }

                             }

-                            $term_data['parent'] = (int)$term_parent_id;

+                            $term_data['parent'] = (int) $term_parent_id;

 

                             $term_id = NULL;

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

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

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

+                                if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {

                                     $term_data['term_id'] = $term['term_id'];

                                     

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

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

                                         $updated++;

                                     } else {

                                         $invalid++;

                                     }

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+                                } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {

                                     $term_data['term_id'] = $term['term_id'];

                                     

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

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

                                         $updated++;

                                     } else {

                                         $invalid++;

                                     }

                                 } else {

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

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

                                         $created++;

                                     } else {

                                         $invalid++;

                                     }

                                 }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+                            } else if ($import_choice == 'skip') {

+                                if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {

                                     $skipped++;

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+                                } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {

                                     $skipped++;

                                 } else {

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

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

                                         $created++;

                                     } else {

                                         $invalid++;

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

                             }

                             

-                            if ( $term_id ) {

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

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

+                            if ($term_id) {

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

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

                                 }

                                 

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

-                                    update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

+                                if (isset($term_data['cat_schema'])) {

+                                    update_tax_meta($term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype);

                                 }

             

                                 $attachment = false;

-                                if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

-                                    $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

-                                    $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

+                                if (isset($term_data['image']) && $term_data['image'] != '') {

+                                    $cat_image = geodir_get_default_catimage($term_id, $cat_posttype);

+                                    $cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : '';

                                     

-                                    if ( basename($cat_image) != $term_data['image'] ) {

+                                    if (basename($cat_image) != $term_data['image']) {

                                         $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

+                                        update_tax_meta($term_id, 'ct_cat_default_img', array('id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image']), $cat_posttype);

                                     }

                                 }

                                 

-                                if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

-                                    $cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

-                                    $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+                                if (isset($term_data['icon']) && $term_data['icon'] != '') {

+                                    $cat_icon = get_tax_meta($term_id, 'ct_cat_icon', false, $cat_posttype);

+                                    $cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : '';

                                         

-                                    if ( basename($cat_icon) != $term_data['icon'] ) {

+                                    if (basename($cat_icon) != $term_data['icon']) {

                                         $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

+                                        update_tax_meta($term_id, 'ct_cat_icon', array('id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon']), $cat_posttype);

                                     }

                                 }

                                 

-                                if ( $attachment ) {

+                                if ($attachment) {

                                     $images++;

                                 }

                             }

@@ -5096,14 +5096,14 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

                 exit;

-            } else if ( $task == 'import_post' ) {

+            } else if ($task == 'import_post') {

 

                 //run some stuff to make the import quicker

-                wp_defer_term_counting( true );

-                wp_defer_comment_counting( true );

-                $wpdb->query( 'SET autocommit = 0;' );

+                wp_defer_term_counting(true);

+                wp_defer_comment_counting(true);

+                $wpdb->query('SET autocommit = 0;');

 

                 //remove_all_actions('publish_post');

                 //remove_all_actions('transition_post_status');

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

                     $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

                     $default_status = 'publish';

-                    $current_date = date_i18n( 'Y-m-d', time() );

+                    $current_date = date_i18n('Y-m-d', time());

                     

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

+                        wp_send_json($json);

                         exit;

                     }

 

-                    $processed_actual=0;

+                    $processed_actual = 0;

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

                         $index = $processed + $i;

                         $gd_post = array();

                         

                         if (isset($file[$index])) {$processed_actual++;

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             //$row = array_map( 'utf8_encode', $row );

-                            $row = array_map( 'addslashes_gpc', $row );

+                            $row = array_map('addslashes_gpc', $row);

                             

                             $post_id = '';

                             $post_title = '';

@@ -5166,73 +5166,73 @@ 
                             $original_post_id = '';

                                                         

                             $c = 0;

-                            foreach ($columns as $column ) {

+                            foreach ($columns as $column) {

                                 $gd_post[$column] = $row[$c];

                                 

-                                if ( $column == 'post_id' ) {

+                                if ($column == 'post_id') {

                                     $post_id = $row[$c];

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

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

                                     $post_title = $row[$c];

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

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

                                     $post_author = $row[$c];

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

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

                                     $post_content = $row[$c];

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

-                                    $post_category_arr = explode( ',', $row[$c] );

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

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

+                                    $post_category_arr = explode(',', $row[$c]);

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

                                     $default_category = wp_kses_normalize_entities($row[$c]);

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

-                                    $post_tags = explode( ',', $row[$c] );

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

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

+                                    $post_tags = explode(',', $row[$c]);

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

                                     $post_type = $row[$c];

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

-                                    $post_status = sanitize_key( $row[$c] );

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

-                                    $is_featured = (int)$row[$c];

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

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

+                                    $post_status = sanitize_key($row[$c]);

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

+                                    $is_featured = (int) $row[$c];

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

                                     $geodir_video = $row[$c];

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

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

                                     $post_address = $row[$c];

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

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

                                     $post_city = $row[$c];

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

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

                                     $post_region = $row[$c];

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

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

                                     $post_country = $row[$c];

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

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

                                     $post_zip = $row[$c];

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

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

                                     $post_latitude = $row[$c];

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

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

                                     $post_longitude = $row[$c];

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

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

                                     $geodir_timing = $row[$c];

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

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

                                     $geodir_contact = $row[$c];

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

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

                                     $geodir_email = $row[$c];

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

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

                                     $geodir_website = $row[$c];

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

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

                                     $geodir_twitter = $row[$c];

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

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

                                     $geodir_facebook = $row[$c];

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

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

                                     $geodir_twitter = $row[$c];

-                                } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {

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

                                     $post_images[] = $row[$c];

-                                } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

-                                } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {

+                                } else if ($column == 'alive_days' && (int) $row[$c] > 0) {

+                                    $expire_date = date_i18n('Y-m-d', strtotime($current_date . '+' . (int) $row[$c] . ' days'));

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

                                     $row[$c] = str_replace('/', '-', $row[$c]);

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

+                                    $expire_date = date_i18n('Y-m-d', strtotime($row[$c]));

                                 }

                                 // WPML

                                 if ($is_wpml) {

                                     if ($column == 'language') {

                                         $language = geodir_strtolower(trim($row[$c]));

                                     } else if ($column == 'original_post_id') {

-                                        $original_post_id = (int)$row[$c];

+                                        $original_post_id = (int) $row[$c];

                                     }

                                 }

                                 // WPML

@@ -5247,24 +5247,24 @@ 
 

                             $gd_post['IMAGE'] = $post_images;

                             

-                            $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

-                            $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

+                            $post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status;

+                            $post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status;

                                                                                                                 

                             $valid = true;

                             

-                            if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

+                            if ($post_title == '' || !in_array($post_type, $post_types)) {

                                 $invalid++;

                                 $valid = false;

                             }

                             

-                            $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

-                            if ( $location_allowed ) {

+                            $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;

+                            if ($location_allowed) {

                                 $location_result = geodir_get_default_location();

-                                if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

+                                if ($post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '') {

                                     $invalid_addr++;

                                     $valid = false;

-                                } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

-                                    if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

+                                } else if (!empty($location_result) && $location_result->location_id == 0) {

+                                    if ((geodir_strtolower($post_city) != geodir_strtolower($location_result->city)) || (geodir_strtolower($post_region) != geodir_strtolower($location_result->region)) || (geodir_strtolower($post_country) != geodir_strtolower($location_result->country))) {

                                         $invalid_addr++;

                                         $valid = false;

                                     } else {

@@ -5275,7 +5275,7 @@ 
                                 }

                             }

                             

-                            if ( !$valid ) {

+                            if (!$valid) {

                                 continue;

                             }

 

@@ -5288,16 +5288,16 @@ 
 

                             $post_category = array();

                             $default_category_id = NULL;

-                            if ( !empty( $post_category_arr ) ) {

-                                foreach ( $post_category_arr as $value ) {

-                                    $category_name = wp_kses_normalize_entities( trim( $value ) );

+                            if (!empty($post_category_arr)) {

+                                foreach ($post_category_arr as $value) {

+                                    $category_name = wp_kses_normalize_entities(trim($value));

                                     

-                                    if ( $category_name != '' ) {

+                                    if ($category_name != '') {

                                         $term_category = array();

                                         

-                                        if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

+                                        if ($term = get_term_by('name', $category_name, $cat_taxonomy)) {

                                             $term_category = $term;

-                                        } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

+                                        } else if ($term = get_term_by('slug', $category_name, $cat_taxonomy)) {

                                             $term_category = $term;

                                         } else {

                                             $term_data = array();

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

                                             $term_data['taxonomy'] = $cat_taxonomy;

                                             

-                                            $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

-                                            if ( $term_id ) {

-                                                $term_category = get_term( $term_id, $cat_taxonomy );

+                                            $term_id = geodir_imex_insert_term($cat_taxonomy, $term_data);

+                                            if ($term_id) {

+                                                $term_category = get_term($term_id, $cat_taxonomy);

                                             }

                                         }

                                         

-                                        if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

+                                        if (!empty($term_category) && !is_wp_error($term_category)) {

                                             //$post_category[] = $term_category->slug;

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

                                             

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

 

                             $saved_post_id = NULL;

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

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

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

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

                                     $save_post['ID'] = $post_id;

                                     

-                                    if ( wp_update_post( $save_post ) ) {

+                                    if (wp_update_post($save_post)) {

                                         $saved_post_id = $post_id;

                                         $updated++;

                                     }

                                 } else {

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

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

                                         $created++;

                                     }

                                 }

                                 

-                                if ( !$saved_post_id > 0 ) {

+                                if (!$saved_post_id > 0) {

                                     $invalid++;

                                 }

-                            } else if ( $import_choice == 'skip' ) {

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

+                            } else if ($import_choice == 'skip') {

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

                                     $skipped++;	

                                 } else {

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

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

                                         $created++;	

                                     } else {

                                         $invalid++;

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

                             }

 

-                            if ( (int)$saved_post_id > 0 ) {

+                            if ((int) $saved_post_id > 0) {

                                 // WPML

                                 if ($is_wpml && $original_post_id > 0 && $language != '') {

                                     $wpml_post_type = 'post_' . $post_type;

-                                    $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

+                                    $source_language = geodir_get_language_for_element($original_post_id, $wpml_post_type);

                                     $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

 

-                                    $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

+                                    $trid = $sitepress->get_element_trid($original_post_id, $wpml_post_type);

                                     

-                                    $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

+                                    $sitepress->set_element_language_details($saved_post_id, $wpml_post_type, $trid, $language, $source_language);

                                 }

                                 // WPML

-                                $gd_post_info = geodir_get_post_info( $saved_post_id );

+                                $gd_post_info = geodir_get_post_info($saved_post_id);

                                 

                                 $gd_post['post_id'] = $saved_post_id;

                                 $gd_post['ID'] = $saved_post_id;

@@ -5388,7 +5388,7 @@ 
                                                     

                                 // post location

                                 $post_location_id = 0;

-                                if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

+                                if ($location_allowed && !empty($location_result) && $location_result->location_id > 0) {

                                     $post_location_info = array(

                                                                 'city' => $post_city,

                                                                 'region' => $post_region,

@@ -5396,21 +5396,21 @@ 
                                                                 'geo_lat' => $post_latitude,

                                                                 'geo_lng' => $post_longitude

                                                             );

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

+                                    if ($location_id = (int) geodir_add_new_location($post_location_info)) {

                                         $post_location_id = $location_id;

                                     }

                                 }

                                 $gd_post['post_location_id'] = $post_location_id;

                                 

                                 // post package info

-                                $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

+                                $package_id = isset($gd_post['package_id']) && !empty($gd_post['package_id']) ? (int) $gd_post['package_id'] : 0;

                                 if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

                                     $package_id = $gd_post_info->package_id;

                                 }

                                 

                                 $package_info = array();

                                 if ($package_id && function_exists('geodir_get_package_info_by_id')) {

-                                    $package_info = (array)geodir_get_package_info_by_id($package_id);

+                                    $package_info = (array) geodir_get_package_info_by_id($package_id);

                                     

                                     if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

                                         $package_info = array();

@@ -5418,18 +5418,18 @@ 
                                 }

                                 

                                 if (empty($package_info)) {

-                                    $package_info = (array)geodir_post_package_info( array(), '', $post_type );

+                                    $package_info = (array) geodir_post_package_info(array(), '', $post_type);

                                 }

                                  

-                                if (!empty($package_info))	 {

+                                if (!empty($package_info)) {

                                     $package_id = $package_info['pid'];

                                     

                                     if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {

                                         $gd_post['expire_date'] = $expire_date;

                                     } else {

-                                        if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {

-                                            $gd_post['alive_days'] = (int)$package_info['days'];

-                                            $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );

+                                        if (isset($package_info['days']) && (int) $package_info['days'] > 0) {

+                                            $gd_post['alive_days'] = (int) $package_info['days'];

+                                            $gd_post['expire_date'] = date_i18n('Y-m-d', strtotime($current_date . '+' . (int) $package_info['days'] . ' days'));

                                         } else {

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

                                         }

@@ -5449,28 +5449,28 @@ 
                                 }

 

                                 // Export franchise fields

-                                $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+                                $is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;

                                 if ($is_franchise_active) {

-                                    if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {

+                                    if (isset($gd_post['gd_is_franchise']) && (int) $gd_post['gd_is_franchise'] == 1) {

                                         $gd_franchise_lock = array();

                                         

-                                        if ( isset( $gd_post['gd_franchise_lock'] ) ) {

-                                            $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );

-                                            $gd_franchise_lock = trim( $gd_franchise_lock );

-                                            $gd_franchise_lock = explode( ",", $gd_franchise_lock );

+                                        if (isset($gd_post['gd_franchise_lock'])) {

+                                            $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock']);

+                                            $gd_franchise_lock = trim($gd_franchise_lock);

+                                            $gd_franchise_lock = explode(",", $gd_franchise_lock);

                                         }

                                         

-                                        update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );

-                                        update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );

+                                        update_post_meta($saved_post_id, 'gd_is_franchise', 1);

+                                        update_post_meta($saved_post_id, 'gd_franchise_lock', $gd_franchise_lock);

                                     } else {

-                                        if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {

-                                            geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );

+                                        if (isset($gd_post['franchise']) && (int) $gd_post['franchise'] > 0 && geodir_franchise_check((int) $gd_post['franchise'])) {

+                                            geodir_save_post_meta($saved_post_id, 'franchise', (int) $gd_post['franchise']);

                                         }

                                     }

                                 }

                                 

                                 if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {

-                                    $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );

+                                    $save_post['post_category'] = array_unique(array_map('intval', $save_post['post_category']));

                                     if ($default_category_id) {

                                         $save_post['post_default_category'] = $default_category_id;

                                         $gd_post['default_category'] = $default_category_id;

@@ -5479,12 +5479,12 @@ 
                                 }

                                 

                                 // Save post info

-                                geodir_save_post_info( $saved_post_id, $gd_post );

+                                geodir_save_post_info($saved_post_id, $gd_post);

                                 // post taxonomies

-                                if ( !empty( $save_post['post_category'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

+                                if (!empty($save_post['post_category'])) {

+                                    wp_set_object_terms($saved_post_id, $save_post['post_category'], $cat_taxonomy);

                                     

-                                    $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

+                                    $post_default_category = isset($save_post['post_default_category']) ? $save_post['post_default_category'] : '';

                                     if ($default_category_id) {

                                         $post_default_category = $default_category_id;

                                     }

@@ -5498,15 +5498,15 @@ 
                                     

                                     $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

                                     

-                                    geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

+                                    geodir_set_postcat_structure($saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str);

                                 }

 

-                                if ( !empty( $save_post['post_tags'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

+                                if (!empty($save_post['post_tags'])) {

+                                    wp_set_object_terms($saved_post_id, $save_post['post_tags'], $tags_taxonomy);

                                 }

 

                                 // Post images

-                                if ( !empty( $post_images ) ) {

+                                if (!empty($post_images)) {

                                     $post_images = array_unique($post_images);

                                     

                                     $old_post_images_arr = array();

@@ -5514,30 +5514,30 @@ 
                                     

                                     $order = 1;

                                     

-                                    $old_post_images = geodir_get_images( $saved_post_id );

+                                    $old_post_images = geodir_get_images($saved_post_id);

                                     if (!empty($old_post_images)) {

-                                        foreach( $old_post_images as $old_post_image ) {

+                                        foreach ($old_post_images as $old_post_image) {

                                             if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

                                                 $old_post_images_arr[] = $old_post_image->file;

                                             }

                                         }

                                     }

                                     

-                                    foreach ( $post_images as $post_image ) {

-                                        $image_name = basename( $post_image );

+                                    foreach ($post_images as $post_image) {

+                                        $image_name = basename($post_image);

                                         $saved_post_images_arr[] = $image_name;

                                         

-                                        if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

+                                        if (!empty($old_post_images_arr) && in_array($image_name, $old_post_images_arr)) {

                                             continue; // Skip if image already exists.

                                         }

                                         

-                                        $image_name_parts = explode( '.', $image_name );

-                                        array_pop( $image_name_parts );

-                                        $proper_image_name = implode( '.', $image_name_parts );

+                                        $image_name_parts = explode('.', $image_name);

+                                        array_pop($image_name_parts);

+                                        $proper_image_name = implode('.', $image_name_parts);

                                         

-                                        $arr_file_type = wp_check_filetype( $image_name );

+                                        $arr_file_type = wp_check_filetype($image_name);

                                         

-                                        if ( !empty( $arr_file_type ) ) {

+                                        if (!empty($arr_file_type)) {

                                             $uploaded_file_type = $arr_file_type['type'];

                                             

                                             $attachment = array();

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

 

                                             $attachment_set = '';

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

-                                                if ( $val != '' ) {

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

+                                                if ($val != '') {

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

                                                 }

                                             }

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

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

                                                                                         

                                             // Add new attachment

-                                            $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

+                                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

                                                                                         

                                             $order++;

                                         }

                                     }

 

-                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

+                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/", $saved_post_images_arr) . "' )" : '';

                                     // Remove previous attachment

-                                    $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

+                                    $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int) $saved_post_id . " " . $saved_post_images_sql);

                                     

-                                    if ( !empty( $saved_post_images_arr ) ) {

+                                    if (!empty($saved_post_images_arr)) {

                                         $menu_order = 1;

                                         

-                                        foreach ( $saved_post_images_arr as $img_name ) {

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

+                                        foreach ($saved_post_images_arr as $img_name) {

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

                                             

-                                            if( $menu_order == 1 ) {

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

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

+                                            if ($menu_order == 1) {

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

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

                                                 }

                                             }

                                             $menu_order++;

                                         }

                                     }

                                     

-                                    if ( $order > 1 ) {

+                                    if ($order > 1) {

                                         $images++;

                                     }

                                 }

 

                                 /** This action is documented in geodirectory-functions/post-functions.php */

-                                do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

+                                do_action('geodir_after_save_listing', $saved_post_id, $gd_post);

                                 

                                 if (isset($is_featured)) {

                                     geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

@@ -5609,10 +5609,10 @@ 
                 }

 

                 //undo some stuff to make the import quicker

-                wp_defer_term_counting( false );

-                wp_defer_comment_counting( false );

-                $wpdb->query( 'COMMIT;' );

-                $wpdb->query( 'SET autocommit = 1;' );

+                wp_defer_term_counting(false);

+                wp_defer_comment_counting(false);

+                $wpdb->query('COMMIT;');

+                $wpdb->query('SET autocommit = 1;');

 

                 $json = array();

                 $json['processed'] = $processed_actual;

@@ -5623,9 +5623,9 @@ 
                 $json['invalid_addr'] = $invalid_addr;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

                 exit;

-            } else if ( $task == 'import_loc' ) {

+            } else if ($task == 'import_loc') {

                 global $gd_post_types;

                 $gd_post_types = $post_types;

                 

@@ -5634,7 +5634,7 @@ 
                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

+                        wp_send_json($json);

                     }

                     

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

@@ -5642,59 +5642,59 @@ 
                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             $data = array();

                             

-                            foreach ($columns as $c => $column ) {

+                            foreach ($columns as $c => $column) {

                                 if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta', 'city_desc', 'region_meta', 'region_desc', 'country_meta', 'country_desc'))) {

                                     $data[$column] = $row[$c];

                                 }

                             }

 

-                            if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

+                            if (empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude'])) {

                                 $invalid++;

                                 continue;

                             }

                             

                             $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

                             

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

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

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

+                                if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {

+                                    if ($location_id = geodir_location_update_city($data, true, $location)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

                                     }

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $data['location_id'] = (int)$location->location_id;

+                                } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {

+                                    $data['location_id'] = (int) $location->location_id;

                                     

-                                    if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

+                                    if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region']))) {

+                                        $data['location_id'] = (int) $location->location_id;

+                                    } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'region' => $data['region']))) {

+                                        $data['location_id'] = (int) $location->location_id;

+                                    } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country']))) {

+                                        $data['location_id'] = (int) $location->location_id;

                                     }

                                     

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+                                    if ($location_id = geodir_location_update_city($data, true, $location)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

                                     }

                                 } else {

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

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

                                         $created++;

                                     } else {

                                         $invalid++;

                                     }

                                 }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+                            } elseif ($import_choice == 'skip') {

+                                if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {

                                     $skipped++;

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+                                } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {

                                     $skipped++;

                                 } else {

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

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

                                         $created++;

                                     } else {

                                         $invalid++;

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

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -5759,29 +5759,29 @@ 
  * }

  * @return int|bool Term id when success, false when fail.

  */

-function geodir_imex_insert_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

+function geodir_imex_insert_term($taxonomy, $term_data) {

+	if (empty($taxonomy) || empty($term_data)) {

 		return false;

 	}

 	

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

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

 	$args = array();

-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

+	$args['description'] = isset($term_data['description']) ? $term_data['description'] : '';

+	$args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : '';

+	$args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : '';

 	

-	if ( ( !empty( $args['slug'] ) && term_exists( $args['slug'], $taxonomy ) ) || empty( $args['slug'] ) ) {

-		$term_args = array_merge( $term_data, $args );

-		$defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');

-		$term_args = wp_parse_args( $term_args, $defaults );

-		$term_args = sanitize_term( $term_args, $taxonomy, 'db' );

-		$args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );

+	if ((!empty($args['slug']) && term_exists($args['slug'], $taxonomy)) || empty($args['slug'])) {

+		$term_args = array_merge($term_data, $args);

+		$defaults = array('alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');

+		$term_args = wp_parse_args($term_args, $defaults);

+		$term_args = sanitize_term($term_args, $taxonomy, 'db');

+		$args['slug'] = wp_unique_term_slug($args['slug'], (object) $term_args);

 	}

 	

-    if( !empty( $term ) ) {

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

-        if( !is_wp_error( $result ) ) {

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

+    if (!empty($term)) {

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

+        if (!is_wp_error($result)) {

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

         }

     }

 	

@@ -5811,37 +5811,37 @@ 
  * }

  * @return int|bool Term id when success, false when fail.

  */

-function geodir_imex_update_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

+function geodir_imex_update_term($taxonomy, $term_data) {

+	if (empty($taxonomy) || empty($term_data)) {

 		return false;

 	}

 	

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

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

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

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

 	

 	$args = array();

-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

+	$args['description'] = isset($term_data['description']) ? $term_data['description'] : '';

+	$args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : '';

+	$args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : '';

 	

-	if ( $term_id > 0 && $term_info = (array)get_term( $term_id, $taxonomy ) ) {

+	if ($term_id > 0 && $term_info = (array) get_term($term_id, $taxonomy)) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

+		$result = wp_update_term($term_data['term_id'], $taxonomy, $term_data);

 		

-		if( !is_wp_error( $result ) ) {

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

+		if (!is_wp_error($result)) {

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

         }

-	} else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+	} else if ($term_data['slug'] != '' && $term_info = (array) term_exists($term_data['slug'], $taxonomy)) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

+		$result = wp_update_term($term_data['term_id'], $taxonomy, $term_data);

 		

-		if( !is_wp_error( $result ) ) {

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

+		if (!is_wp_error($result)) {

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

         }

 	} else {

-		return geodir_imex_insert_term( $taxonomy, $term_data );

+		return geodir_imex_insert_term($taxonomy, $term_data);

 	}

 	

 	return false;

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

  * @return int Posts count.

  */

-function geodir_get_posts_count( $post_type ) {

-	$posts_count = wp_count_posts( $post_type );

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

+function geodir_get_posts_count($post_type) {

+	$posts_count = wp_count_posts($post_type);

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

 	

 	/**

 	 * Modify returned post counts for the current post type.

@@ -5869,7 +5869,7 @@ 
 	 * @param int $posts_count Post counts.

 	 * @param string $post_type Post type.

 	 */

-	$posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );	 

+	$posts_count = apply_filters('geodir_imex_count_posts', $posts_count, $post_type);	 

 	

 	return $posts_count;

 }

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

  * @return int Posts count.

  */

-function geodir_imex_count_events( $posts_count, $post_type ) {

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

+function geodir_imex_count_events($posts_count, $post_type) {

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

 		global $wpdb, $plugin_prefix;

 		

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

@@ -5896,7 +5896,7 @@ 
 

 		$query = "SELECT COUNT({$wpdb->posts}.ID) AS total FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s";

 		

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

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

 	}

 	

 	return $posts_count;

@@ -5918,15 +5918,15 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of posts data.

  */

-function geodir_imex_get_posts( $post_type, $per_page = 0, $page_no = 0 ) {	

+function geodir_imex_get_posts($post_type, $per_page = 0, $page_no = 0) {	

 	global $wp_filesystem;

 

-	$posts = geodir_get_export_posts( $post_type, $per_page, $page_no );

+	$posts = geodir_get_export_posts($post_type, $per_page, $page_no);

 

 	$csv_rows = array();

 	

-	if ( !empty( $posts ) ) {

-		$is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' );

+	if (!empty($posts)) {

+		$is_payment_plugin = is_plugin_active('geodir_payment_manager/geodir_payment_manager.php');

 		

 		$csv_row = array();

 		$csv_row[] = 'post_id';

@@ -5937,7 +5937,7 @@ 
 		$csv_row[] = 'default_category';

 		$csv_row[] = 'post_tags';

 		$csv_row[] = 'post_type';

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

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

 			$csv_row[] = 'event_date';

 			$csv_row[] = 'event_enddate';

 			$csv_row[] = 'starttime';

@@ -5986,15 +5986,15 @@ 
 		}

 		// WPML

 

-		$custom_fields = geodir_imex_get_custom_fields( $post_type );

-		if ( !empty( $custom_fields ) ) {

-			foreach ( $custom_fields as $custom_field ) {

+		$custom_fields = geodir_imex_get_custom_fields($post_type);

+		if (!empty($custom_fields)) {

+			foreach ($custom_fields as $custom_field) {

 				$csv_row[] = $custom_field->htmlvar_name;

 			}

 		}

 

 		// Export franchise fields

-		$is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+		$is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;

 		if ($is_franchise_active) {

 			$csv_row[] = 'gd_is_franchise';

 			$csv_row[] = 'gd_franchise_lock';

@@ -6004,12 +6004,12 @@ 
 		$csv_rows[] = $csv_row;

 

 		$images_count = 5;

-        $xx=0;

-		foreach ( $posts as $post ) {$xx++;

+        $xx = 0;

+		foreach ($posts as $post) {$xx++;

 			$post_id = $post['ID'];

 			

-			$gd_post_info = geodir_get_post_info( $post_id );

-			$post_info = (array)$gd_post_info;

+			$gd_post_info = geodir_get_post_info($post_id);

+			$post_info = (array) $gd_post_info;

 						

 			$taxonomy_category = $post_type . 'category';

 			$taxonomy_tags = $post_type . '_tags';

@@ -6018,14 +6018,14 @@ 
 			$default_category_id = $gd_post_info->default_category;

 			$default_category = '';

 			$post_tags = '';

-			$terms = wp_get_post_terms( $post_id, array( $taxonomy_category, $taxonomy_tags ) );

+			$terms = wp_get_post_terms($post_id, array($taxonomy_category, $taxonomy_tags));

 			

-			if ( !empty( $terms ) && !is_wp_error( $terms ) ) {

+			if (!empty($terms) && !is_wp_error($terms)) {

 				$post_category = array();

 				$post_tags = array();

 			

-				foreach ( $terms as $term ) {

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

+				foreach ($terms as $term) {

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

 						$post_category[] = $term->name;

 						

 						if ($default_category_id == $term->term_id) {

@@ -6033,7 +6033,7 @@ 
 						}

 					}

 					

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

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

 						$post_tags[] = $term->name;

 					}

 				}

@@ -6041,8 +6041,8 @@ 
 				if (empty($default_category) && !empty($post_category)) {

 					$default_category = $post_category[0]; // Set first one as default category.

 				}

-				$post_category = !empty( $post_category ) ? implode( ',', $post_category ) : '';

-				$post_tags = !empty( $post_tags ) ? implode( ',', $post_tags ) : '';

+				$post_category = !empty($post_category) ? implode(',', $post_category) : '';

+				$post_tags = !empty($post_tags) ? implode(',', $post_tags) : '';

 			}

 

 			// Franchise data

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

 			$locked_fields = array();

 			

-			if ($is_franchise_active && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 && geodir_franchise_check((int)$post_info['franchise'])) {

+			if ($is_franchise_active && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 && geodir_franchise_check((int) $post_info['franchise'])) {

 				$franchise_id = $post_info['franchise'];

 				$gd_franchise_info = geodir_get_post_info($franchise_id);

 

 				if (geodir_franchise_pkg_is_active($gd_franchise_info)) {

-					$franchise_info = (array)$gd_franchise_info;

+					$franchise_info = (array) $gd_franchise_info;

 					$locked_fields = geodir_franchise_get_locked_fields($franchise_id, true);

 					

 					if (!empty($locked_fields)) {

-						foreach( $locked_fields as $locked_field) {

+						foreach ($locked_fields as $locked_field) {

 							if (isset($post_info[$locked_field]) && isset($franchise_info[$locked_field])) {

 								$post_info[$locked_field] = $franchise_info[$locked_field];

 							}

 							

 							if (in_array($taxonomy_category, $locked_fields) || in_array('post_tags', $locked_fields)) {

-								$franchise_terms = wp_get_post_terms( $franchise_id, array( $taxonomy_category, $taxonomy_tags ) );

+								$franchise_terms = wp_get_post_terms($franchise_id, array($taxonomy_category, $taxonomy_tags));

 			

-								if ( !empty( $franchise_terms ) && !is_wp_error( $franchise_terms ) ) {

+								if (!empty($franchise_terms) && !is_wp_error($franchise_terms)) {

 									$franchise_post_category = array();

 									$franchise_post_tags = array();

 								

-									foreach ( $franchise_terms as $franchise_term ) {

-										if ( $franchise_term->taxonomy == $taxonomy_category ) {

+									foreach ($franchise_terms as $franchise_term) {

+										if ($franchise_term->taxonomy == $taxonomy_category) {

 											$franchise_post_category[] = $franchise_term->name;

 										}

 										

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

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

 											$franchise_post_tags[] = $franchise_term->name;

 										}

 									}

 									

 									if (in_array($taxonomy_category, $locked_fields)) {

-										$post_category = !empty( $franchise_post_category ) ? implode( ',', $franchise_post_category ) : '';

+										$post_category = !empty($franchise_post_category) ? implode(',', $franchise_post_category) : '';

 									}

 									if (in_array('post_tags', $locked_fields)) {

-										$post_tags = !empty( $franchise_post_tags ) ? implode( ',', $franchise_post_tags ) : '';

+										$post_tags = !empty($franchise_post_tags) ? implode(',', $franchise_post_tags) : '';

 									}

 								}

 							}

@@ -6094,18 +6094,18 @@ 
 				}

 			}

 						

-			$post_images = geodir_get_images( $post_id );

+			$post_images = geodir_get_images($post_id);

 			$current_images = array();

-			if ( !empty( $post_images ) ) {

-				foreach ( $post_images as $post_image ) {

-					$post_image = (array)$post_image;

-					$image = !empty( $post_image ) && isset( $post_image['path'] ) && $wp_filesystem->is_file( $post_image['path'] ) && $wp_filesystem->exists( $post_image['path'] ) ? $post_image['src'] : '';

-					if ( $image ) {

+			if (!empty($post_images)) {

+				foreach ($post_images as $post_image) {

+					$post_image = (array) $post_image;

+					$image = !empty($post_image) && isset($post_image['path']) && $wp_filesystem->is_file($post_image['path']) && $wp_filesystem->exists($post_image['path']) ? $post_image['src'] : '';

+					if ($image) {

 						$current_images[] = $image;

 					}

 				}

 				

-				$images_count = max( $images_count, count( $current_images ) );

+				$images_count = max($images_count, count($current_images));

 			}

 

 			$csv_row = array();

@@ -6117,7 +6117,7 @@ 
 			$csv_row[] = $default_category; // default_category

 			$csv_row[] = $post_tags; // post_tags

 			$csv_row[] = $post_type; // post_type

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

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

 				$event_data = geodir_imex_get_event_data($post, $gd_post_info);

 				$csv_row[] = $event_data['event_date']; // event_date

 				$csv_row[] = $event_data['event_enddate']; // enddate

@@ -6138,9 +6138,9 @@ 
 				$csv_row[] = $event_data['recurring_end_date']; // repeat_end

 			}

 			$csv_row[] = $post_info['post_status']; // post_status

-			$csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured

+			$csv_row[] = (int) $post_info['is_featured'] == 1 ? 1 : ''; // is_featured

 			if ($is_payment_plugin) {

-				$csv_row[] = (int)$post_info['package_id']; // package_id

+				$csv_row[] = (int) $post_info['package_id']; // package_id

 				$csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date

 			}

 			$csv_row[] = $post_info['geodir_video']; // geodir_video

@@ -6161,14 +6161,14 @@ 
 			$csv_row[] = $post_info['geodir_special_offers']; // geodir_special_offers

 			// WPML

 			if ($is_wpml) {

-				$csv_row[] = geodir_get_language_for_element( $post_id, 'post_' . $post_type );

-				$csv_row[] = geodir_imex_original_post_id( $post_id, 'post_' . $post_type );

+				$csv_row[] = geodir_get_language_for_element($post_id, 'post_' . $post_type);

+				$csv_row[] = geodir_imex_original_post_id($post_id, 'post_' . $post_type);

 			}

 			// WPML

 			

-			if ( !empty( $custom_fields ) ) {

-				foreach ( $custom_fields as $custom_field ) {

-					$csv_row[] = isset( $post_info[$custom_field->htmlvar_name] ) ? $post_info[$custom_field->htmlvar_name] : '';

+			if (!empty($custom_fields)) {

+				foreach ($custom_fields as $custom_field) {

+					$csv_row[] = isset($post_info[$custom_field->htmlvar_name]) ? $post_info[$custom_field->htmlvar_name] : '';

 				}

 			}

 			

@@ -6179,26 +6179,26 @@ 
 				$franchise = '';

 					

 				if (geodir_franchise_pkg_is_active($gd_post_info)) {

-					$gd_is_franchise = (int)get_post_meta( $post_id, 'gd_is_franchise', true );

-					$locaked_fields = $gd_is_franchise ? get_post_meta( $post_id, 'gd_franchise_lock', true ) : '';

+					$gd_is_franchise = (int) get_post_meta($post_id, 'gd_is_franchise', true);

+					$locaked_fields = $gd_is_franchise ? get_post_meta($post_id, 'gd_franchise_lock', true) : '';

 					$locaked_fields = (is_array($locaked_fields) && !empty($locaked_fields) ? implode(",", $locaked_fields) : '');

-					$franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 ? (int)$post_info['franchise'] : 0; // franchise id

+					$franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 ? (int) $post_info['franchise'] : 0; // franchise id

 				}

 				

-				$csv_row[] = (int)$gd_is_franchise; // gd_is_franchise

+				$csv_row[] = (int) $gd_is_franchise; // gd_is_franchise

 				$csv_row[] = $locaked_fields; // gd_franchise_lock fields

-				$csv_row[] = (int)$franchise; // franchise id

+				$csv_row[] = (int) $franchise; // franchise id

 			}

 			

-			for ( $c = 0; $c < $images_count; $c++ ) {

-				$csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE

+			for ($c = 0; $c < $images_count; $c++) {

+				$csv_row[] = isset($current_images[$c]) ? $current_images[$c] : ''; // IMAGE

 			}

 			

 			$csv_rows[] = $csv_row;

 

 		}

 

-		for ( $c = 0; $c < $images_count; $c++ ) {

+		for ($c = 0; $c < $images_count; $c++) {

 			$csv_rows[0][] = 'IMAGE';

 		}

 	}

@@ -6220,19 +6220,19 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of posts data.

  */

-function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

+function geodir_get_export_posts($post_type, $per_page = 0, $page_no = 0) {

 	global $wpdb, $plugin_prefix;

 

-	if ( ! post_type_exists( $post_type ) )

+	if (!post_type_exists($post_type))

 		return new stdClass;

 		

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

 	

 	$limit = '';

-	if ( $per_page > 0 && $page_no > 0 ) {

-		$offset = ( $page_no - 1 ) * $per_page;

+	if ($per_page > 0 && $page_no > 0) {

+		$offset = ($page_no - 1) * $per_page;

 		

-		if ( $offset > 0 ) {

+		if ($offset > 0) {

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

 		} else {

 			$limit = " LIMIT " . $per_page;

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

 	 * @param string $post_type Post type.

 	 */

-	$query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

+	$query = apply_filters('geodir_imex_export_posts_query', $query, $post_type);

 

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

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

 

 	/**

 	 * Modify returned post results for the current post type.

@@ -6262,7 +6262,7 @@ 
 	 * @param object $results An object containing all post ids.

 	 * @param string $post_type Post type.

 	 */

-	return apply_filters( 'geodir_export_posts', $results, $post_type );

+	return apply_filters('geodir_export_posts', $results, $post_type);

 }

 

 /**

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

  * @return string The SQL query.

  */

-function geodir_imex_get_events_query( $query, $post_type ) {

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

+function geodir_imex_get_events_query($query, $post_type) {

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

 		global $wpdb, $plugin_prefix;

 		

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

@@ -6301,15 +6301,15 @@ 
  * @param  string $post_type Post type.

  * @return int Total terms count.

  */

-function geodir_get_terms_count( $post_type ) {

-	$args = array( 'hide_empty' => 0 );

+function geodir_get_terms_count($post_type) {

+	$args = array('hide_empty' => 0);

 	

-	remove_all_filters( 'get_terms' );

+	remove_all_filters('get_terms');

 	

 	$taxonomy = $post_type . 'category';

 

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

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

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

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

 	 

 	return $count_terms;

 }

@@ -6326,23 +6326,23 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of terms data.

  */

-function geodir_imex_get_terms( $post_type, $per_page = 0, $page_no = 0 ) {

-	$args = array( 'hide_empty' => 0, 'orderby' => 'id' );

+function geodir_imex_get_terms($post_type, $per_page = 0, $page_no = 0) {

+	$args = array('hide_empty' => 0, 'orderby' => 'id');

 	

-	remove_all_filters( 'get_terms' );

+	remove_all_filters('get_terms');

 	

 	$taxonomy = $post_type . 'category';

 	

-	if ( $per_page > 0 && $page_no > 0 ) {

-		$args['offset'] = ( $page_no - 1 ) * $per_page;

+	if ($per_page > 0 && $page_no > 0) {

+		$args['offset'] = ($page_no - 1) * $per_page;

 		$args['number'] = $per_page;

 	}

 	

-	$terms = get_terms( $taxonomy, $args );

+	$terms = get_terms($taxonomy, $args);

 

 	$csv_rows = array();

 	

-	if ( !empty( $terms ) ) {

+	if (!empty($terms)) {

 		$csv_row = array();

 		$csv_row[] = 'cat_id';

 		$csv_row[] = 'cat_name';

@@ -6363,16 +6363,16 @@ 
 		

 		$csv_rows[] = $csv_row;

 		

-		foreach ( $terms as $term ) {			

-			$cat_icon = get_tax_meta( $term->term_id, 'ct_cat_icon', false, $post_type );

-			$cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+		foreach ($terms as $term) {			

+			$cat_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $post_type);

+			$cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : '';

 			

-			$cat_image = geodir_get_default_catimage( $term->term_id, $post_type );

-			$cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; 

+			$cat_image = geodir_get_default_catimage($term->term_id, $post_type);

+			$cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : ''; 

 			

 			$cat_parent = '';

-			if (isset($term->parent) && (int)$term->parent > 0 && term_exists((int)$term->parent, $taxonomy)) {

-				$parent_term = (array)get_term_by( 'id', (int)$term->parent, $taxonomy );

+			if (isset($term->parent) && (int) $term->parent > 0 && term_exists((int) $term->parent, $taxonomy)) {

+				$parent_term = (array) get_term_by('id', (int) $term->parent, $taxonomy);

 				$cat_parent = !empty($parent_term) && isset($parent_term['name']) ? $parent_term['name'] : '';

 			}

 			

@@ -6382,14 +6382,14 @@ 
 			$csv_row[] = $term->slug;

 			$csv_row[] = $post_type;

 			$csv_row[] = $cat_parent;

-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );

+			$csv_row[] = get_tax_meta($term->term_id, 'ct_cat_schema', false, $post_type);

 			$csv_row[] = $term->description;

-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type );

+			$csv_row[] = get_tax_meta($term->term_id, 'ct_cat_top_desc', false, $post_type);

 			$csv_row[] = $cat_image;

 			$csv_row[] = $cat_icon;

 			// WPML

 			if ($is_wpml) {

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

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

 			}

 			// WPML

 			

@@ -6408,7 +6408,7 @@ 
  * @param  bool $relative True for relative path & False for absolute path.

  * @return string Path to the cache directory.

  */

-function geodir_path_import_export( $relative = true ) {

+function geodir_path_import_export($relative = true) {

 	$upload_dir = wp_upload_dir();

 	

 	return $relative ? $upload_dir['baseurl'] . '/cache' : $upload_dir['basedir'] . '/cache';

@@ -6427,8 +6427,8 @@ 
  * @param  bool $clear If true then it overwrite data otherwise add rows at the end of file.

  * @return bool true if success otherwise false.

  */

-function geodir_save_csv_data( $file_path, $csv_data = array(), $clear = true ) {

-	if ( empty( $csv_data ) ) {

+function geodir_save_csv_data($file_path, $csv_data = array(), $clear = true) {

+	if (empty($csv_data)) {

 		return false;

 	}

 	

@@ -6436,17 +6436,17 @@ 
 	

 	$mode = $clear ? 'w+' : 'a+';

 	

-	if ( function_exists( 'fputcsv' ) ) {

-		$file = fopen( $file_path, $mode );

-		foreach( $csv_data as $csv_row ) {

+	if (function_exists('fputcsv')) {

+		$file = fopen($file_path, $mode);

+		foreach ($csv_data as $csv_row) {

 			//$csv_row = array_map( 'utf8_decode', $csv_row );

-			$write_successful = fputcsv( $file, $csv_row, ",", $enclosure = '"' );

+			$write_successful = fputcsv($file, $csv_row, ",", $enclosure = '"');

 		}

-		fclose( $file );

+		fclose($file);

 	} else {

-		foreach( $csv_data as $csv_row ) {

+		foreach ($csv_data as $csv_row) {

 			//$csv_row = array_map( 'utf8_decode', $csv_row );

-			$wp_filesystem->put_contents( $file_path, $csv_row );

+			$wp_filesystem->put_contents($file_path, $csv_row);

 		}

 	}

 		

@@ -6464,14 +6464,14 @@ 
  * @param  string $file Full path to file.

  * @return int No of file rows.

  */

-function geodir_import_export_line_count( $file ) {

+function geodir_import_export_line_count($file) {

 	global $wp_filesystem;

 	

-	if ( $wp_filesystem->is_file( $file ) && $wp_filesystem->exists( $file ) ) {

-		$contents = $wp_filesystem->get_contents_array( $file );

+	if ($wp_filesystem->is_file($file) && $wp_filesystem->exists($file)) {

+		$contents = $wp_filesystem->get_contents_array($file);

 		

-		if ( !empty( $contents ) && is_array( $contents ) ) {

-			return count( $contents ) - 1;

+		if (!empty($contents) && is_array($contents)) {

+			return count($contents) - 1;

 		}

 	}

 	

@@ -6488,11 +6488,11 @@ 
  * @param string $post_type The post type.

  * @return object Queried object.

  */

-function geodir_imex_get_custom_fields( $post_type ) {

+function geodir_imex_get_custom_fields($post_type) {

 	global $wpdb;

 	 

-	$sql = $wpdb->prepare("SELECT htmlvar_name FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array( $post_type ) );

-	$rows = $wpdb->get_results( $sql );

+	$sql = $wpdb->prepare("SELECT htmlvar_name FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array($post_type));

+	$rows = $wpdb->get_results($sql);

 	 

 	return $rows;

 }

@@ -6574,9 +6574,9 @@ 
 	$post_table = $plugin_prefix . $post_type . '_detail';

 	

 	$query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));

-	$data = (array)$wpdb->get_row($query);

+	$data = (array) $wpdb->get_row($query);

 	

-	if ( !empty( $data ) ) {

+	if (!empty($data)) {

 		$data['post_id'] = $tr_post_id;

 		unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category'], $data['overall_rating'], $data['rating_count'], $data['ratings']);

 		

@@ -6604,7 +6604,7 @@ 
 	global $sitepress, $wpdb;

 	$post_type = get_post_type($master_post_id);

 	

-	remove_filter('get_term', array($sitepress,'get_term_adjust_id')); // AVOID filtering to current language

+	remove_filter('get_term', array($sitepress, 'get_term_adjust_id')); // AVOID filtering to current language

 

 	$taxonomies = get_object_taxonomies($post_type);

 	foreach ($taxonomies as $taxonomy) {

@@ -6613,9 +6613,9 @@ 
 		

 		if ($terms) {

 			foreach ($terms as $term) {

-				$tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang);

+				$tr_id = apply_filters('translate_object_id', $term->term_id, $taxonomy, false, $lang);

 				

-				if (!is_null($tr_id)){

+				if (!is_null($tr_id)) {

 					// not using get_term - unfiltered get_term

 					$translated_term = $wpdb->get_row($wpdb->prepare("

 						SELECT * FROM {$wpdb->terms} t JOIN {$wpdb->term_taxonomy} x ON x.term_id = t.term_id WHERE t.term_id = %d AND x.taxonomy = %s", $tr_id, $taxonomy));

@@ -6624,8 +6624,8 @@ 
 				}

 			}

 

-			if (!is_taxonomy_hierarchical($taxonomy)){

-				$terms_array = array_unique( array_map( 'intval', $terms_array ) );

+			if (!is_taxonomy_hierarchical($taxonomy)) {

+				$terms_array = array_unique(array_map('intval', $terms_array));

 			}

 

 			wp_set_post_terms($tr_post_id, $terms_array, $taxonomy);

@@ -6658,9 +6658,9 @@ 
 	$query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

 	$post_images = $wpdb->get_results($query);

 	

-	if ( !empty( $post_images ) ) {

-		foreach ( $post_images as $post_image) {

-			$image_data = (array)$post_image;

+	if (!empty($post_images)) {

+		foreach ($post_images as $post_image) {

+			$image_data = (array) $post_image;

 			unset($image_data['ID']);

 			$image_data['post_id'] = $tr_post_id;

 			

@@ -6686,10 +6686,10 @@ 
  * @return array Event data array.

  */

 function geodir_imex_get_event_data($post, $gd_post_info) {

-	$event_date = isset( $post['event_date'] ) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $post['event_date'] ) ) : '';

+	$event_date = isset($post['event_date']) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($post['event_date'])) : '';

 	$event_enddate = $event_date;

-	$starttime = isset( $post['starttime'] ) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['starttime'] ) ) : '';

-	$endtime = isset( $post['endtime'] ) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['endtime'] ) ) : '';

+	$starttime = isset($post['starttime']) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['starttime'])) : '';

+	$endtime = isset($post['endtime']) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['endtime'])) : '';

 	

 	$is_recurring_event = '';

 	$event_duration_days = '';

@@ -6707,15 +6707,15 @@ 
 		

 	$recurring_data = isset($gd_post_info->recurring_dates) ? maybe_unserialize($gd_post_info->recurring_dates) : array();

 	if (!empty($recurring_data)) {

-		$event_date = isset( $recurring_data['event_start'] ) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_start'] ) ) : $event_date;

-		$event_enddate = isset( $recurring_data['event_end'] ) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_end'] ) ) : $event_date;

-		$starttime = isset( $recurring_data['starttime'] ) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['starttime'] ) ) : $starttime;

-		$endtime = isset( $recurring_data['endtime'] ) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['endtime'] ) ) : $endtime;

+		$event_date = isset($recurring_data['event_start']) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_start'])) : $event_date;

+		$event_enddate = isset($recurring_data['event_end']) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_end'])) : $event_date;

+		$starttime = isset($recurring_data['starttime']) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['starttime'])) : $starttime;

+		$endtime = isset($recurring_data['endtime']) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['endtime'])) : $endtime;

 		$is_whole_day_event = !empty($recurring_data['all_day']) ? 1 : '';

 		$different_times = !empty($recurring_data['different_times']) ? true : false;

 	

-		$recurring_pkg = geodir_event_recurring_pkg( $gd_post_info );

-		$is_recurring = isset( $gd_post_info->is_recurring ) && (int)$gd_post_info->is_recurring == 0 ? false : true;

+		$recurring_pkg = geodir_event_recurring_pkg($gd_post_info);

+		$is_recurring = isset($gd_post_info->is_recurring) && (int) $gd_post_info->is_recurring == 0 ? false : true;

 			

 		if ($recurring_pkg && $is_recurring) {

 			$recurring_dates = $event_date;

@@ -6725,13 +6725,13 @@ 
 			$recurring_type = !empty($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'custom';

 			

 			if (!empty($recurring_data['event_recurring_dates'])) {

-				$event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] );

+				$event_recurring_dates = explode(',', $recurring_data['event_recurring_dates']);

 				

 				if (!empty($event_recurring_dates)) {

 					$recurring_dates = array();

 					

 					foreach ($event_recurring_dates as $date) {

-						$recurring_dates[] = date_i18n( 'd/m/Y', strtotime( $date ) );

+						$recurring_dates[] = date_i18n('d/m/Y', strtotime($date));

 					}

 					

 					$recurring_dates = implode(",", $recurring_dates);

@@ -6747,7 +6747,7 @@ 
 						$times = array();

 						

 						foreach ($recurring_data['starttimes'] as $time) {

-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

+							$times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';

 						}

 						

 						$event_starttimes = implode(",", $times);

@@ -6757,7 +6757,7 @@ 
 						$times = array();

 						

 						foreach ($recurring_data['endtimes'] as $time) {

-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

+							$times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';

 						}

 						

 						$event_endtimes = implode(",", $times);

@@ -6769,8 +6769,8 @@ 
 					}

 				}

 			} else {

-				$event_duration_days = isset($recurring_data['duration_x']) ? (int)$recurring_data['duration_x'] : 1;

-				$recurring_interval = !empty($recurring_data['repeat_x']) && (int)$recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;

+				$event_duration_days = isset($recurring_data['duration_x']) ? (int) $recurring_data['duration_x'] : 1;

+				$recurring_interval = !empty($recurring_data['repeat_x']) && (int) $recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;

 				

 				if (($recurring_type == 'week' || $recurring_type == 'month') && !empty($recurring_data['repeat_days'])) {

 					$week_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');

@@ -6786,11 +6786,11 @@ 
 				}

 				

 				$recurring_week_nos = $recurring_type == 'month' && !empty($recurring_data['repeat_weeks']) ? implode(",", $recurring_data['repeat_weeks']) : $recurring_week_nos;

-				if (!empty($recurring_data['repeat_end_type']) && (int)$recurring_data['repeat_end_type'] == 1) {

-					$recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['repeat_end'] ) ) : '';

+				if (!empty($recurring_data['repeat_end_type']) && (int) $recurring_data['repeat_end_type'] == 1) {

+					$recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['repeat_end'])) : '';

 					$max_recurring_count = empty($recurring_end_date) ? 1 : '';

 				} else {

-					$max_recurring_count = (!empty($recurring_data['max_repeat']) && (int)$recurring_data['max_repeat'] > 0 ? (int)$recurring_data['max_repeat'] : 1);

+					$max_recurring_count = (!empty($recurring_data['max_repeat']) && (int) $recurring_data['max_repeat'] > 0 ? (int) $recurring_data['max_repeat'] : 1);

 				}

 			}

 		}

@@ -6854,9 +6854,9 @@ 
  * @return array Event data array.

  */

 function geodir_imex_process_event_data($gd_post) {

-	$recurring_pkg = geodir_event_recurring_pkg( (object)$gd_post );

+	$recurring_pkg = geodir_event_recurring_pkg((object) $gd_post);

 

-	$is_recurring = isset( $gd_post['is_recurring_event'] ) && (int)$gd_post['is_recurring_event'] == 0 ? false : true;

+	$is_recurring = isset($gd_post['is_recurring_event']) && (int) $gd_post['is_recurring_event'] == 0 ? false : true;

 	$event_date = isset($gd_post['event_date']) && $gd_post['event_date'] != '' ? geodir_imex_get_date_ymd($gd_post['event_date']) : '';

 	$event_enddate = isset($gd_post['event_enddate']) && $gd_post['event_enddate'] != '' ? geodir_imex_get_date_ymd($gd_post['event_enddate']) : $event_date;

 	$all_day = isset($gd_post['is_whole_day_event']) && !empty($gd_post['is_whole_day_event']) ? true : false;

@@ -6903,17 +6903,17 @@ 
 				$event_recurring_dates = implode(",", $event_recurring_dates);

 			}

 		} else {

-			$duration_x = !empty( $gd_post['event_duration_days'] ) ? (int)$gd_post['event_duration_days'] : 1;

-			$repeat_x = !empty( $gd_post['recurring_interval'] ) ? (int)$gd_post['recurring_interval'] : 1;

-			$max_repeat = !empty( $gd_post['max_recurring_count'] ) ? (int)$gd_post['max_recurring_count'] : 1;

-			$repeat_end = !empty( $gd_post['recurring_end_date'] ) ? geodir_imex_get_date_ymd($gd_post['recurring_end_date']) : '';

+			$duration_x = !empty($gd_post['event_duration_days']) ? (int) $gd_post['event_duration_days'] : 1;

+			$repeat_x = !empty($gd_post['recurring_interval']) ? (int) $gd_post['recurring_interval'] : 1;

+			$max_repeat = !empty($gd_post['max_recurring_count']) ? (int) $gd_post['max_recurring_count'] : 1;

+			$repeat_end = !empty($gd_post['recurring_end_date']) ? geodir_imex_get_date_ymd($gd_post['recurring_end_date']) : '';

 			

 			$repeat_end_type = $repeat_end != '' ? 1 : 0;

 			$max_repeat = $repeat_end != '' ? '' : $max_repeat;

 			

 			$week_days = array_flip(array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'));

 			

-			$a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days'])!='' ? explode(',', trim($gd_post['recurring_week_days'])) : array();

+			$a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days']) != '' ? explode(',', trim($gd_post['recurring_week_days'])) : array();

 			$repeat_days = array();

 			if (!empty($a_repeat_days)) {

 				foreach ($a_repeat_days as $repeat_day) {

@@ -6931,7 +6931,7 @@ 
 			$repeat_weeks = array();

 			if (!empty($a_repeat_weeks)) {

 				foreach ($a_repeat_weeks as $repeat_week) {

-					$repeat_weeks[] = (int)$repeat_week;

+					$repeat_weeks[] = (int) $repeat_week;

 				}

 				

 				$repeat_weeks = array_unique($repeat_weeks);

@@ -7052,7 +7052,7 @@ 
  */

 function geodir_admin_upgrade_notice() {

     $class = "error";

-    $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");

+    $message = __("Please update core GeoDirectory or some addons may not function correctly.", "geodirectory");

     echo"<div class=\"$class\"> <p>$message</p></div>";

 }

 

@@ -7067,7 +7067,7 @@ 
  * @param (object) $r

  * @return (string) $output

  */

-function geodire_admin_upgrade_notice( $plugin_data, $r )

+function geodire_admin_upgrade_notice($plugin_data, $r)

 {

     // readme contents

     $args = array(

@@ -7075,7 +7075,7 @@ 
         'redirection' => 5

     );

     $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";

-    $data       = wp_remote_get( $url, $args );

+    $data = wp_remote_get($url, $args);

 

     if (!is_wp_error($data) && $data['response']['code'] == 200) {

 

@@ -7090,20 +7090,20 @@ 
 function geodir_in_plugin_update_message($content) {

     // Output Upgrade Notice

     $matches        = null;

-    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';

+    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote(GEODIRECTORY_VERSION) . '\s*=|$)~Uis';

     $upgrade_notice = '';

-    if ( preg_match( $regexp, $content, $matches ) ) {

-        if(empty($matches)){return;}

+    if (preg_match($regexp, $content, $matches)) {

+        if (empty($matches)) {return; }

         //print_r($matches );

-        $version = trim( $matches[1] );

-        if($version && $version>GEODIRECTORY_VERSION){

+        $version = trim($matches[1]);

+        if ($version && $version > GEODIRECTORY_VERSION) {

 

 

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

-        if ( version_compare( WC_VERSION, $version, '<' ) ) {

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

+        if (version_compare(WC_VERSION, $version, '<')) {

             $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

-            foreach ( $notices as $index => $line ) {

-                $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

+            foreach ($notices as $index => $line) {

+                $upgrade_notice .= wp_kses_post(preg_replace('~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line));

             }

             $upgrade_notice .= '</div> ';

         }

@@ -7127,7 +7127,7 @@ 
 		$default_language = $sitepress->get_default_language();

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

 	?>

-	<div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory');?></strong></p></div>

+	<div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory'); ?></strong></p></div>

 	<?php

 		}

 	}

geodirectory-admin/admin_hooks_actions.php

Indentation +23 added lines, -23 removed lines

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

 /**

- * GeoDirectory Admin.

- *

- * Main admin file which loads all settings panels and sets up admin menus.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * GeoDirectory Admin.

+     *

+     * Main admin file which loads all settings panels and sets up admin menus.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

 

 add_action('admin_init', 'geodir_admin_init');

 if (!function_exists('geodir_admin_init')) {

@@ -85,11 +85,11 @@ 
 {

     global $pagenow;

 	

-	// Get the current post type

-	$post_type = geodir_admin_current_post_type();

-	$geodir_post_types = geodir_get_posttypes();

+    // Get the current post type

+    $post_type = geodir_admin_current_post_type();

+    $geodir_post_types = geodir_get_posttypes();

     

-	if ((isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') || (($pagenow == 'post.php' || $pagenow == 'post-new.php' || $pagenow == 'edit.php') && $post_type && in_array($post_type, $geodir_post_types)) || ($pagenow == 'edit-tags.php' || $pagenow == 'edit-comments.php' || $pagenow == 'comment.php')) {

+    if ((isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') || (($pagenow == 'post.php' || $pagenow == 'post-new.php' || $pagenow == 'edit.php') && $post_type && in_array($post_type, $geodir_post_types)) || ($pagenow == 'edit-tags.php' || $pagenow == 'edit-comments.php' || $pagenow == 'comment.php')) {

         add_action('admin_enqueue_scripts', 'geodir_admin_scripts');

         add_action('admin_enqueue_scripts', 'geodir_admin_styles');

     }

@@ -1517,20 +1517,20 @@ 
 function geodir_diagnose_load_db_language() {

     global $wpdb;

 	

-	$is_error_during_diagnose = geodirectory_load_db_language();

+    $is_error_during_diagnose = geodirectory_load_db_language();

 

     $output_str = '';

 

     if ($is_error_during_diagnose) {

         $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";

-		$info_div_class = "geodir_problem_info";

+        $info_div_class = "geodir_problem_info";

     } else {

         $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";

-		$info_div_class = "geodir_noproblem_info";

+        $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

     }

     

-	echo "<ul class='$info_div_class'>";

+    echo "<ul class='$info_div_class'>";

     echo $output_str;

     echo $fix_button_txt;

     echo "</ul>";

@@ -1655,7 +1655,7 @@ 
     $uploads = wp_upload_dir();

     ini_set('auto_detect_line_endings', true);

 	

-	$wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

+    $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

 

     $task = isset($_POST['task']) ? $_POST['task'] : '';

     $uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL;

@@ -1855,8 +1855,8 @@ 
                             $post_longitude = addslashes($buffer[$c]);

                         }

 						

-						// Post status

-						if ($customKeyarray[$c] == 'post_status') {

+                        // Post status

+                        if ($customKeyarray[$c] == 'post_status') {

                             $post_status = sanitize_key( $buffer[$c] );

                         }

                     }

@@ -1873,10 +1873,10 @@ 
                         }

                     }

 					

-					// Default post status

-					$default_status = 'publish';

-					$post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

-					$post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

+                    // Default post status

+                    $default_status = 'publish';

+                    $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

+                    $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

 

                     $my_post['post_title'] = $post_title;

                     $my_post['post_content'] = $post_desc;

@@ -2099,5 +2099,5 @@ 
 add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 );

 

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

-	add_action('geodir_before_admin_panel', 'geodir_wpml_permalink_setting_notice');

+    add_action('geodir_before_admin_panel', 'geodir_wpml_permalink_setting_notice');

 }
\ No newline at end of file

Spacing +82 added lines, -82 removed lines

@@ -62,7 +62,7 @@ 
  */

 function geodir_get_admin_option_form($current_tab)

 {

-    geodir_admin_option_form($current_tab);// defined in admin template tags.php

+    geodir_admin_option_form($current_tab); // defined in admin template tags.php

 }

 

 

@@ -70,7 +70,7 @@ 
 add_action('geodir_update_options_compatibility_settings', 'geodir_update_options_compatibility_settings');

 add_action('geodir_update_options_default_location_settings', 'geodir_location_form_submit');

 add_action('geodir_before_admin_panel', 'geodir_before_admin_panel'); // this function is in admin_functions.php

-add_action('geodir_before_update_options', 'geodir_before_update_options',10,2);

+add_action('geodir_before_update_options', 'geodir_before_update_options', 10, 2);

 

 //add_action('geodir_before_admin_panel', 'geodir_autoinstall_admin_header');

 

@@ -236,7 +236,7 @@ 
 

 }

 

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

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

 

 

 

@@ -263,7 +263,7 @@ 
 

             $gd_taxonomy = geodir_get_taxonomies($geodir_post_type);

 

-            if(!empty($gd_taxonomy)) {

+            if (!empty($gd_taxonomy)) {

                 foreach ($gd_taxonomy as $tax) {

 

                     remove_meta_box($tax . 'div', $geodir_post_type, 'normal');

@@ -415,7 +415,7 @@ 
     global $wpdb;

     $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

     ?>

-    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>

+    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul>

     <?php

@@ -433,11 +433,11 @@ 
             

             $display = $check_html_variable ? ' style="display:none;"' : '';

             ?>

-            <li <?php echo $display;?>>

-            <a id="gt-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>"

-               title="<?php echo $val['site_title'];?>"

-               class="gt-draggable-form-items gt-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>"

-               href="javascript:void(0);"><b></b><?php _e($val['site_title'], 'geodirectory');?></a>

+            <li <?php echo $display; ?>>

+            <a id="gt-<?php echo $val['field_type']; ?>-_-<?php echo $val['htmlvar_name']; ?>"

+               title="<?php echo $val['site_title']; ?>"

+               class="gt-draggable-form-items gt-<?php echo $val['field_type']; ?> geodir-sort-<?php echo $val['htmlvar_name']; ?>"

+               href="javascript:void(0);"><b></b><?php _e($val['site_title'], 'geodirectory'); ?></a>

             </li>

             <?php

         }

@@ -491,39 +491,39 @@ 
 {

     $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

     ?>

-    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>

+    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul class="full">

-        <li><a id="gt-fieldset" class="gt-draggable-form-items gt-fieldset" href="javascript:void(0);"><?php _e('Fieldset', 'geodirectory');?></a></li>

+        <li><a id="gt-fieldset" class="gt-draggable-form-items gt-fieldset" href="javascript:void(0);"><?php _e('Fieldset', 'geodirectory'); ?></a></li>

     </ul>

     <ul>

         <li><a id="gt-text" class="gt-draggable-form-items gt-text"

-               href="javascript:void(0);"><b></b><?php _e('Text', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Text', 'geodirectory'); ?></a></li>

         <li><a id="gt-datepicker" class="gt-draggable-form-items gt-datepicker"

-               href="javascript:void(0);"><b></b><?php _e('Date', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Date', 'geodirectory'); ?></a></li>

         <li><a id="gt-textarea" class="gt-draggable-form-items gt-textarea"

-               href="javascript:void(0);"><b></b><?php _e('Textarea', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Textarea', 'geodirectory'); ?></a></li>

         <li><a id="gt-time" class="gt-draggable-form-items gt-time"

-               href="javascript:void(0);"><b></b><?php _e('Time', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Time', 'geodirectory'); ?></a></li>

         <li><a id="gt-checkbox" class="gt-draggable-form-items gt-checkbox"

-               href="javascript:void(0);"><b></b><?php _e('Checkbox', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Checkbox', 'geodirectory'); ?></a></li>

         <li><a id="gt-phone" class="gt-draggable-form-items gt-phone"

-               href="javascript:void(0);"><b></b><?php _e('Phone', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Phone', 'geodirectory'); ?></a></li>

         <li><a id="gt-radio" class="gt-draggable-form-items gt-radio"

-               href="javascript:void(0);"><b></b><?php _e('Radio', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Radio', 'geodirectory'); ?></a></li>

         <li><a id="gt-email" class="gt-draggable-form-items gt-email"

-               href="javascript:void(0);"><b></b><?php _e('Email', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Email', 'geodirectory'); ?></a></li>

         <li><a id="gt-select" class="gt-draggable-form-items gt-select"

-               href="javascript:void(0);"><b></b><?php _e('Select', 'geodirectory');?></a></li>

-        <!--<li><a id="gt-taxonomy" class="gt-draggable-form-items gt-select" href="javascript:void(0);"><b></b><?php _e('Taxonomy', 'geodirectory');?></a></li>-->

+               href="javascript:void(0);"><b></b><?php _e('Select', 'geodirectory'); ?></a></li>

+        <!--<li><a id="gt-taxonomy" class="gt-draggable-form-items gt-select" href="javascript:void(0);"><b></b><?php _e('Taxonomy', 'geodirectory'); ?></a></li>-->

         <li><a id="gt-multiselect" class="gt-draggable-form-items gt-multiselect"

-               href="javascript:void(0);"><b></b><?php _e('Multi Select', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Multi Select', 'geodirectory'); ?></a></li>

         <li><a id="gt-url" class="gt-draggable-form-items gt-url"

-               href="javascript:void(0);"><b></b><?php _e('URL', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('URL', 'geodirectory'); ?></a></li>

         <li><a id="gt-html" class="gt-draggable-form-items gt-html"

-               href="javascript:void(0);"><b></b><?php _e('HTML', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('HTML', 'geodirectory'); ?></a></li>

         <li><a id="gt-file" class="gt-draggable-form-items gt-file"

-               href="javascript:void(0);"><b></b><?php _e('File Upload', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('File Upload', 'geodirectory'); ?></a></li>

 

     </ul>

 

@@ -634,7 +634,7 @@ 
 

     switch ($sub_tab) {

         case 'custom_fields':

-            $note = sprintf(__('Click on any box below to add a field of that type on add %s listing form. You must be use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type));;

+            $note = sprintf(__('Click on any box below to add a field of that type on add %s listing form. You must be use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type)); ;

             break;

 

         case 'sorting_options':

@@ -688,7 +688,7 @@ 
 

     switch ($sub_tab) {

         case 'custom_fields':

-            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type));;

+            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type)); ;

             break;

 

         case 'sorting_options':

@@ -787,13 +787,13 @@ 
         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

-            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count

-            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count

+            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak"); // get backup table count

+            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table"); // get new table count

 

             if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2

                 //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;

 

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table

+                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2"); // rename bak table to new table

 

                 if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

                     $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";

@@ -803,8 +803,8 @@ 
 

             } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it

 

-                $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table

+                $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2"); // rename new table to bak2

+                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table"); // rename bak table to new table

 

                 if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

                     $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";

@@ -814,7 +814,7 @@ 
 

             } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors

 

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2

+                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2"); // rename ms_bak table to ms_bak2

 

                 if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

                     $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";

@@ -998,7 +998,7 @@ 
                             $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);

                             foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {

                                 if (is_numeric($cat_part)) {

-                                    $raw_cats[] = (int)$cat_part;

+                                    $raw_cats[] = (int) $cat_part;

                                 }

                             }

 

@@ -1308,9 +1308,9 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_home_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

         $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

     else {

         $is_error_during_diagnose = true;

@@ -1333,9 +1333,9 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_add_listing_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

         $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

     else {

         $is_error_during_diagnose = true;

@@ -1359,9 +1359,9 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_preview_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

         $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

     else {

         $is_error_during_diagnose = true;

@@ -1384,9 +1384,9 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_success_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

         $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

     else {

         $is_error_during_diagnose = true;

@@ -1409,9 +1409,9 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_info_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

         $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

     else {

         $is_error_during_diagnose = true;

@@ -1434,9 +1434,9 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_login_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

         $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

     else {

         $is_error_during_diagnose = true;

@@ -1459,9 +1459,9 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_location_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

         $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

     else {

         $is_error_during_diagnose = true;

@@ -1479,13 +1479,13 @@ 
     /* Diagnose Location Page Ends */

     ////////////////////////////////

 

-    $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );

+    $page_chk_arr = array('output_str'=>$output_str, 'is_error_during_diagnose'=>$is_error_during_diagnose);

     /**

      * This action is called at the end of the GD Tools page check function.

      *

      * @since 1.5.2

      */

-    $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);

+    $page_chk_arr = apply_filters('geodir_diagnose_default_pages', $page_chk_arr);

 

     $output_str = $page_chk_arr['output_str'];

     $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];

@@ -1682,7 +1682,7 @@ 
 

                 if (($handle = fopen($target_path, "r")) !== FALSE) {

                     while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {

-                        if(is_array($data) && !empty($data)) {

+                        if (is_array($data) && !empty($data)) {

                             $file[] = '"' . implode('","', $data) . '"';

                         }

                     }

@@ -1857,7 +1857,7 @@ 
 						

 						// Post status

 						if ($customKeyarray[$c] == 'post_status') {

-                            $post_status = sanitize_key( $buffer[$c] );

+                            $post_status = sanitize_key($buffer[$c]);

                         }

                     }

 

@@ -1875,8 +1875,8 @@ 
 					

 					// Default post status

 					$default_status = 'publish';

-					$post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

-					$post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

+					$post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status;

+					$post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status;

 

                     $my_post['post_title'] = $post_title;

                     $my_post['post_content'] = $post_desc;

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

                     $package_info = array();

 

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

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

                     $package_id = '';

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

                         $package_id = $gd_post_info['package_id'];

@@ -2021,11 +2021,11 @@ 
 }

 

 // Add the tab in left sidebar menu fro import & export page.

-add_filter( 'geodir_settings_tabs_array', 'geodir_import_export_tab', 94 );

+add_filter('geodir_settings_tabs_array', 'geodir_import_export_tab', 94);

 

 // Handle ajax request for impot/export.

-add_action( 'wp_ajax_geodir_import_export', 'geodir_ajax_import_export' );

-add_action( 'wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export' );

+add_action('wp_ajax_geodir_import_export', 'geodir_ajax_import_export');

+add_action('wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export');

 

 

 /**

@@ -2036,40 +2036,40 @@ 
  * @param $post_id int $post_id The post ID of the post being saved.

  * @param $post object $post The post object of the post being saved.

  */

-function geodir_update_location_prefix($post_id,$post){

-    if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){

-        update_option('geodir_location_prefix',$post->post_name);

+function geodir_update_location_prefix($post_id, $post) {

+    if ($post->post_type == 'page' && $post->post_name && $post_id == get_option('geodir_location_page')) {

+        update_option('geodir_location_prefix', $post->post_name);

     }

 

 }

 

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

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

 

-add_action( 'wp_ajax_geodir_ga_callback', 'geodir_ga_callback' );

+add_action('wp_ajax_geodir_ga_callback', 'geodir_ga_callback');

 

-function geodir_ga_callback(){

+function geodir_ga_callback() {

 

-if(isset($_REQUEST['code']) && $_REQUEST['code']) {

+if (isset($_REQUEST['code']) && $_REQUEST['code']) {

     $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";

-    $code = "code=".$_REQUEST['code'];

+    $code = "code=" . $_REQUEST['code'];

     $grant_type = "&grant_type=authorization_code";

     $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

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

-    $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');

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

+    $client_secret = "&client_secret=" . get_option('geodir_ga_client_secret');

 

-    $auth_url = $oAuthURL . $code . $redirect_uri .  $grant_type . $client_id .$client_secret;

+    $auth_url = $oAuthURL . $code . $redirect_uri . $grant_type . $client_id . $client_secret;

 

     $response = wp_remote_post($auth_url, array('timeout' => 15));

 

     //print_r($response);

 

-    $error_msg =  __('Something went wrong','geodirectory');

-    if(!empty($response['response']['code']) && $response['response']['code']==200){

+    $error_msg = __('Something went wrong', 'geodirectory');

+    if (!empty($response['response']['code']) && $response['response']['code'] == 200) {

 

         $parts = json_decode($response['body']);

         //print_r($parts);

-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}

-        else{

+        if (!isset($parts->access_token)) {echo $error_msg . " - #1"; exit; }

+        else {

 

             update_option('gd_ga_access_token', $parts->access_token);

             update_option('gd_ga_refresh_token', $parts->refresh_token);

@@ -2078,25 +2078,25 @@ 
 

 

     }

-    elseif(!empty($response['response']['code'])) {

+    elseif (!empty($response['response']['code'])) {

         $parts = json_decode($response['body']);

 

-        if(isset($parts->error)){

-            echo $parts->error.": ".$parts->error_description;exit;

-        }else{

-            echo $error_msg." - #2";exit;

+        if (isset($parts->error)) {

+            echo $parts->error . ": " . $parts->error_description; exit;

+        } else {

+            echo $error_msg . " - #2"; exit;

         }

 

-    }else{

+    } else {

 

-        echo $error_msg." - #3";exit;

+        echo $error_msg . " - #3"; exit;

 

     }

 }

     exit;

 }

 

-add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 );

+add_filter('icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4);

 

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

 	add_action('geodir_before_admin_panel', 'geodir_wpml_permalink_setting_notice');

Braces +58 added lines, -50 removed lines

@@ -24,8 +24,11 @@ 
             global $current_tab;

             geodir_redirect_to_admin_panel_on_installed();

             $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';

-            if (!(isset($_REQUEST['action']))) // this will avoide Ajax requests

-                geodir_handle_option_form_submit($current_tab); // located in admin function.php

+            if (!(isset($_REQUEST['action']))) {
+                // this will avoide Ajax requests

+                geodir_handle_option_form_submit($current_tab);
+            }
+            // located in admin function.php

             /**

              * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.

              *

@@ -313,8 +316,9 @@ 
     if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {

 

         foreach ($notification as $key => $value) {

-            if ($value['type'] == 'textarea')

-                $notification[$key]['type'] = 'editor';

+            if ($value['type'] == 'textarea') {
+                            $notification[$key]['type'] = 'editor';
+            }
         }

 

     }

@@ -339,8 +343,9 @@ 
     if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {

 

         foreach ($design_setting as $key => $value) {

-            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')

-                $design_setting[$key]['type'] = 'editor';

+            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content') {
+                            $design_setting[$key]['type'] = 'editor';
+            }
         }

 

     }

@@ -715,8 +720,9 @@ 
 

     if (!get_option('geodir_remove_unnecessary_fields')) {

 

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))

-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");

+        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'")) {
+                    $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
+        }
 

         update_option('geodir_remove_unnecessary_fields', '1');

 

@@ -742,15 +748,17 @@ 
         $geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action'];

         switch ($geodir_admin_ajax_action) {

             case 'diagnosis' :

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

-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

+                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
+                                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
+                }
                 call_user_func('geodir_diagnose_' . $diagnose_this);

                 exit();

                 break;

 

             case 'diagnosis-fix' :

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

-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

+                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
+                                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
+                }
                 call_user_func('geodir_diagnose_' . $diagnose_this);

                 exit();

                 break;

@@ -1308,11 +1316,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_home_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1333,11 +1341,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_add_listing_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1359,11 +1367,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_preview_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1384,11 +1392,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_success_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1409,11 +1417,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_info_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1434,11 +1442,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_login_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1459,11 +1467,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_location_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1907,8 +1915,9 @@ 
                             );

 

                             $post_location_info = $request_info['post_location'];

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

-                                $post_location_id = $location_id;

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

                             $post_location_id = 0;

                         }

@@ -1971,8 +1980,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, ", ");

 

@@ -2068,8 +2078,7 @@ 
 

         $parts = json_decode($response['body']);

         //print_r($parts);

-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}

-        else{

+        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;} else{

 

             update_option('gd_ga_access_token', $parts->access_token);

             update_option('gd_ga_refresh_token', $parts->refresh_token);

@@ -2077,17 +2086,16 @@ 
         }

 

 

-    }

-    elseif(!empty($response['response']['code'])) {

+    } elseif(!empty($response['response']['code'])) {

         $parts = json_decode($response['body']);

 

         if(isset($parts->error)){

             echo $parts->error.": ".$parts->error_description;exit;

-        }else{

+        } else{

             echo $error_msg." - #2";exit;

         }

 

-    }else{

+    } else{

 

         echo $error_msg." - #3";exit;

 

geodirectory-admin/admin_template_tags.php

Indentation +13 added lines, -13 removed lines

@@ -152,12 +152,12 @@ 
                         } ?>">

                             <form method="post" id="mainform"

                                   class="geodir_optionform <?php echo $current_tab . ' '; ?><?php if (isset($sub['subtab'])) {

-                                      echo sanitize_text_field($sub['subtab']);

-                                  } ?>" action="<?php echo $form_action; ?>" enctype="multipart/form-data">

+                                        echo sanitize_text_field($sub['subtab']);

+                                    } ?>" action="<?php echo $form_action; ?>" enctype="multipart/form-data">

                                 <input type="hidden" class="active_tab" name="active_tab"

                                        value="<?php if (isset($_REQUEST['active_tab'])) {

-                                           echo sanitize_text_field($_REQUEST['active_tab']);

-                                       } ?>"/>

+                                            echo sanitize_text_field($_REQUEST['active_tab']);

+                                        } ?>"/>

                                 <?php wp_nonce_field('geodir-settings', '_wpnonce', true, true); ?>

                                 <?php wp_nonce_field('geodir-settings-' . $current_tab, '_wpnonce-' . $current_tab, true, true); ?>

                                 <?php

@@ -415,8 +415,8 @@ 
                                     <input class="require" type="text" size="80" style="width:440px"

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

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

-                                               echo $location_result->city;

-                                           } ?>"/>

+                                                echo $location_result->city;

+                                            } ?>"/>

 

                                     <div

                                         class="gd-location_message_error"> <?php _e('This field is required.', 'geodirectory'); ?></div>

@@ -431,8 +431,8 @@ 
                                     <input class="require" type="text" size="80" style="width:440px"

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

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

-                                               echo $location_result->region;

-                                           } ?>"/>

+                                                echo $location_result->region;

+                                            } ?>"/>

 

                                     <div

                                         class="gd-location_message_error"> <?php _e('This field is required.', 'geodirectory'); ?></div>

@@ -485,8 +485,8 @@ 
                                     <input type="text" class="require" size="80" style="width:440px"

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

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

-                                               echo $location_result->city_latitude;

-                                           } ?>"/>

+                                                echo $location_result->city_latitude;

+                                            } ?>"/>

 

                                     <div

                                         class="gd-location_message_error"><?php _e('This field is required.', 'geodirectory'); ?></div>

@@ -502,8 +502,8 @@ 
                                     <input type="text" class="require" size="80" style="width:440px"

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

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

-                                               echo $location_result->city_longitude;

-                                           } ?>"/>

+                                                echo $location_result->city_longitude;

+                                            } ?>"/>

 

                                     <div

                                         class="gd-location_message_error"><?php _e('This field is required.', 'geodirectory'); ?></div>

@@ -546,7 +546,7 @@ 
         case 'compatibility_settings' :

             geodir_theme_compatibility_setting_page();

             break;		

-		case 'import_export' :

+        case 'import_export' :

             geodir_import_export_page();

             break;

 

Spacing +96 added lines, -96 removed lines

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

                          */

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

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

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

 

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

                             $label = $args['label'];

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

                         if (changed) {

                             window.onbeforeunload = function () {

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

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

                             }

                         } else {

                             window.onbeforeunload = '';

@@ -327,7 +327,7 @@ 
             ?>

 

             <p class="submit">

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

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

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

             </p>

             

@@ -396,7 +396,7 @@ 
 

                     ?>

 

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

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

 

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

 

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

                     } ?>">

 

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

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

 

                     <table class="form-table default_location_form">

                         <tbody>

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

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

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

                             <td class="forminp">

                                 <div class="gtd-formfeild required">

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

-                                           id="<?php echo $prefix;?>city" name="city"

+                                           id="<?php echo $prefix; ?>city" name="city"

                                            value="<?php if (isset($location_result->city)) {

                                                echo $location_result->city;

                                            } ?>"/>

@@ -425,11 +425,11 @@ 
                             </td>

                         </tr>

                         <tr valign="top" class="single_select_page">

-                            <th class="titledesc" scope="row"><?php _e('Region', 'geodirectory');?></th>

+                            <th class="titledesc" scope="row"><?php _e('Region', 'geodirectory'); ?></th>

                             <td class="forminp">

                                 <div class="gtd-formfeild required">

                                     <input class="require" type="text" size="80" style="width:440px"

-                                           id="<?php echo $prefix;?>region" name="region"

+                                           id="<?php echo $prefix; ?>region" name="region"

                                            value="<?php if (isset($location_result->region)) {

                                                echo $location_result->region;

                                            } ?>"/>

@@ -441,7 +441,7 @@ 
                             </td>

                         </tr>

                         <tr valign="top" class="single_select_page">

-                            <th class="titledesc" scope="row"><?php _e('Country', 'geodirectory');?></th>

+                            <th class="titledesc" scope="row"><?php _e('Country', 'geodirectory'); ?></th>

                             <td class="forminp">

                                 <div class="gtd-formfeild required" style="padding-top:10px;">

                                     <?php

@@ -450,7 +450,7 @@ 
                                     ?>

                                     <select id="<?php echo $prefix ?>country" class="chosen_select"

                                             data-location_type="country" name="<?php echo $prefix ?>country"

-                                            data-placeholder="<?php _e('Choose a country.', 'geodirectory');?>"

+                                            data-placeholder="<?php _e('Choose a country.', 'geodirectory'); ?>"

                                             data-addsearchtermonnorecord="1" data-ajaxchosen="0" data-autoredirect="0"

                                             data-showeverywhere="0">

                                         <?php geodir_get_country_dl($country, $prefix); ?>

@@ -467,7 +467,7 @@ 
                         </tr>

                         <tr valign="top" class="single_select_page">

                             <th class="titledesc"

-                                scope="row"><?php _e('Set Location on Map', 'geodirectory');?></th>

+                                scope="row"><?php _e('Set Location on Map', 'geodirectory'); ?></th>

                             <td class="forminp">

                                 <?php

                                 /**

@@ -475,15 +475,15 @@ 
                                  *

                                  * @since 1.0.0

                                  */

-                                include(geodir_plugin_path() . "/geodirectory-functions/map-functions/map_on_add_listing_page.php");?>

+                                include(geodir_plugin_path() . "/geodirectory-functions/map-functions/map_on_add_listing_page.php"); ?>

                             </td>

                         </tr>

                         <tr valign="top" class="single_select_page">

-                            <th class="titledesc" scope="row"><?php _e('City Latitude', 'geodirectory');?></th>

+                            <th class="titledesc" scope="row"><?php _e('City Latitude', 'geodirectory'); ?></th>

                             <td class="forminp">

                                 <div class="gtd-formfeild required" style="padding-top:10px;">

                                     <input type="text" class="require" size="80" style="width:440px"

-                                           id="<?php echo $prefix;?>latitude" name="latitude"

+                                           id="<?php echo $prefix; ?>latitude" name="latitude"

                                            value="<?php if (isset($location_result->city_latitude)) {

                                                echo $location_result->city_latitude;

                                            } ?>"/>

@@ -496,11 +496,11 @@ 
                         </tr>

                         <tr valign="top" class="single_select_page">

                             <th class="titledesc"

-                                scope="row"><?php _e('City Longitude', 'geodirectory');?></th>

+                                scope="row"><?php _e('City Longitude', 'geodirectory'); ?></th>

                             <td class="forminp">

                                 <div class="gtd-formfeild required" style="padding-top:10px;">

                                     <input type="text" class="require" size="80" style="width:440px"

-                                           id="<?php echo $prefix;?>longitude" name="longitude"

+                                           id="<?php echo $prefix; ?>longitude" name="longitude"

                                            value="<?php if (isset($location_result->city_longitude)) {

                                                echo $location_result->city_longitude;

                                            } ?>"/>

@@ -776,7 +776,7 @@ 
         <div class="gd-content-heading">

 

 

-            <h3><?php _e('Theme Compatability Settings', 'geodirectory');?></h3>

+            <h3><?php _e('Theme Compatability Settings', 'geodirectory'); ?></h3>

             <style>

                 .gd-theme-compat-table {

                     width: 100%;

@@ -807,11 +807,11 @@ 
                 </div>

             <?php }?>

 

-            <h4><?php _e('Select Theme Compatibility Pack', 'geodirectory');?></h4>

+            <h4><?php _e('Select Theme Compatibility Pack', 'geodirectory'); ?></h4>

 

             <select name="gd_theme_compat" id="gd_theme_compat">

-                <option value=""><?php _e('Select Theme', 'geodirectory');?></option>

-                <option value="custom"><?php _e('Custom', 'geodirectory');?></option>

+                <option value=""><?php _e('Select Theme', 'geodirectory'); ?></option>

+                <option value="custom"><?php _e('Custom', 'geodirectory'); ?></option>

                 <?php

                 $theme_arr = get_option('gd_theme_compats');

                 $theme_active = get_option('gd_theme_compat');

@@ -830,20 +830,20 @@ 
                 ?>

             </select>

             <button onclick="gd_comp_export();" type="button"

-                    class="button-primary"><?php _e('Export', 'geodirectory');?></button>

+                    class="button-primary"><?php _e('Export', 'geodirectory'); ?></button>

             <button onclick="gd_comp_import();" type="button"

-                    class="button-primary"><?php _e('Import', 'geodirectory');?></button>

+                    class="button-primary"><?php _e('Import', 'geodirectory'); ?></button>

 

             <div class="gd-comp-import-export">

                 <textarea id="gd-import-export-theme-comp"

-                          placeholder="<?php _e('Paste the JSON code here and then click import again', 'geodirectory');?>"></textarea>

+                          placeholder="<?php _e('Paste the JSON code here and then click import again', 'geodirectory'); ?>"></textarea>

             </div>

             <script>

 

                 function gd_comp_export() {

                     theme = jQuery('#gd_theme_compat').val();

                     if (theme == '' || theme == 'custom') {

-                        alert("<?php _e('Please select a theme to export','geodirectory');?>");

+                        alert("<?php _e('Please select a theme to export', 'geodirectory'); ?>");

                         return false;

                     }

                     jQuery('.gd-comp-import-export').show();

@@ -877,9 +877,9 @@ 
 

                     jQuery.post(ajaxurl, data, function (response) {

                         if (response == '0') {

-                            alert("<?php _e('Something went wrong','geodirectory');?>");

+                            alert("<?php _e('Something went wrong', 'geodirectory'); ?>");

                         } else {

-                            alert("<?php _e('Theme Compatibility Imported','geodirectory');?>");

+                            alert("<?php _e('Theme Compatibility Imported', 'geodirectory'); ?>");

                             jQuery('#gd-import-export-theme-comp').val('');

                             jQuery('.gd-comp-import-export').hide();

                             jQuery('#gd_theme_compat').append(new Option(response, response));

@@ -920,14 +920,14 @@ 
 

             </script>

 

-            <h4><?php _e('Main Wrapper Actions', 'geodirectory');?></h4>

+            <h4><?php _e('Main Wrapper Actions', 'geodirectory'); ?></h4>

 

             <table class="form-table gd-theme-compat-table">

                 <tbody>

                 <tr>

-                    <td><strong><?php _e('Hook', 'geodirectory');?></strong></td>

-                    <td><strong><?php _e('ID', 'geodirectory');?></strong></td>

-                    <td><strong><?php _e('Class', 'geodirectory');?></strong></td>

+                    <td><strong><?php _e('Hook', 'geodirectory'); ?></strong></td>

+                    <td><strong><?php _e('ID', 'geodirectory'); ?></strong></td>

+                    <td><strong><?php _e('Class', 'geodirectory'); ?></strong></td>

                 </tr>

 

 

@@ -945,7 +945,7 @@ 
 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_wrapper_open_replace"

                                   placeholder='<div id="[id]" class="[class]">'><?php if (isset($tc['geodir_wrapper_open_replace'])) {

                                 echo $tc['geodir_wrapper_open_replace'];

@@ -959,14 +959,14 @@ 
                         <small>geodir_wrapper_close</small>

                     </td>

                     <td><input disabled="disabled" type="text" name="geodir_wrapper_open_id"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                     <td><input disabled="disabled" type="text" name="geodir_wrapper_open_class"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_wrapper_close_replace"

                                   placeholder='</div><!-- wrapper ends here-->'><?php if (isset($tc['geodir_wrapper_close_replace'])) {

                                 echo $tc['geodir_wrapper_close_replace'];

@@ -990,7 +990,7 @@ 
 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_wrapper_content_open_replace"

                                   placeholder='<div id="[id]" class="[class]" role="main" [width_css]>'><?php if (isset($tc['geodir_wrapper_content_open_replace'])) {

                                 echo $tc['geodir_wrapper_content_open_replace'];

@@ -1004,14 +1004,14 @@ 
                         <small>geodir_wrapper_content_close</small>

                     </td>

                     <td><input disabled="disabled" type="text" name="geodir_wrapper_content_close_id"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                     <td><input disabled="disabled" type="text" name="geodir_wrapper_content_close_class"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_wrapper_content_close_replace"

                                   placeholder='</div><!-- content ends here-->'><?php if (isset($tc['geodir_wrapper_content_close_replace'])) {

                                 echo $tc['geodir_wrapper_content_close_replace'];

@@ -1033,7 +1033,7 @@ 
 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_article_open_replace"

                                   placeholder='<article  id="[id]" class="[class]" itemscope itemtype="[itemtype]">'><?php if (isset($tc['geodir_article_open_replace'])) {

                                 echo $tc['geodir_article_open_replace'];

@@ -1046,14 +1046,14 @@ 
                         <small>geodir_article_close</small>

                     </td>

                     <td><input disabled="disabled" type="text" name="geodir_article_close_id"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                     <td><input disabled="disabled" type="text" name="geodir_article_close_class"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_article_close_replace"

                                   placeholder='</article><!-- article ends here-->'><?php if (isset($tc['geodir_article_close_replace'])) {

                                 echo $tc['geodir_article_close_replace'];

@@ -1076,7 +1076,7 @@ 
 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_sidebar_right_open_replace"

                                   placeholder='<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>'><?php if (isset($tc['geodir_sidebar_right_open_replace'])) {

                                 echo $tc['geodir_sidebar_right_open_replace'];

@@ -1089,14 +1089,14 @@ 
                         <small>geodir_sidebar_right_close</small>

                     </td>

                     <td><input disabled="disabled" type="text" name="geodir_sidebar_right_close_id"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                     <td><input disabled="disabled" type="text" name="geodir_sidebar_right_close_class"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_sidebar_right_close_replace"

                                   placeholder='</aside><!-- sidebar ends here-->'><?php if (isset($tc['geodir_sidebar_right_close_replace'])) {

                                 echo $tc['geodir_sidebar_right_close_replace'];

@@ -1120,7 +1120,7 @@ 
 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_sidebar_left_open_replace"

                                   placeholder='<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>'><?php if (isset($tc['geodir_sidebar_left_open_replace'])) {

                                 echo $tc['geodir_sidebar_left_open_replace'];

@@ -1133,14 +1133,14 @@ 
                         <small>geodir_sidebar_left_close</small>

                     </td>

                     <td><input disabled="disabled" type="text" name="geodir_sidebar_left_close_id"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                     <td><input disabled="disabled" type="text" name="geodir_sidebar_left_close_class"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_sidebar_left_close_replace"

                                   placeholder='</aside><!-- sidebar ends here-->'><?php if (isset($tc['geodir_sidebar_left_close_replace'])) {

                                 echo $tc['geodir_sidebar_left_close_replace'];

@@ -1162,7 +1162,7 @@ 
 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_main_content_open_replace"

                                   placeholder='<main  id="[id]" class="[class]"  role="main">'><?php if (isset($tc['geodir_main_content_open_replace'])) {

                                 echo $tc['geodir_main_content_open_replace'];

@@ -1175,14 +1175,14 @@ 
                         <small>geodir_main_content_close</small>

                     </td>

                     <td><input disabled="disabled" type="text" name="geodir_main_content_close_id"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                     <td><input disabled="disabled" type="text" name="geodir_main_content_close_class"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_main_content_close_replace"

                                   placeholder='</main><!-- main ends here-->'><?php if (isset($tc['geodir_main_content_close_replace'])) {

                                 echo $tc['geodir_main_content_close_replace'];

@@ -1194,13 +1194,13 @@ 
                 </tbody>

             </table>

 

-            <h4><?php _e('Other Actions', 'geodirectory');?></h4>

+            <h4><?php _e('Other Actions', 'geodirectory'); ?></h4>

 

             <table class="form-table gd-theme-compat-table">

                 <tbody>

                 <tr>

-                    <td><strong><?php _e('Hook', 'geodirectory');?></strong></td>

-                    <td><strong><?php _e('Content', 'geodirectory');?></strong></td>

+                    <td><strong><?php _e('Hook', 'geodirectory'); ?></strong></td>

+                    <td><strong><?php _e('Content', 'geodirectory'); ?></strong></td>

                 </tr>

 

 

@@ -1229,13 +1229,13 @@ 
             </table>

 

 

-            <h4><?php _e('Other Filters', 'geodirectory');?></h4>

+            <h4><?php _e('Other Filters', 'geodirectory'); ?></h4>

 

             <table class="form-table gd-theme-compat-table">

                 <tbody>

                 <tr>

-                    <td><strong><?php _e('Filter', 'geodirectory');?></strong></td>

-                    <td><strong><?php _e('Content', 'geodirectory');?></strong></td>

+                    <td><strong><?php _e('Filter', 'geodirectory'); ?></strong></td>

+                    <td><strong><?php _e('Content', 'geodirectory'); ?></strong></td>

                 </tr>

 

                 <tr>

@@ -1389,13 +1389,13 @@ 
                  *

                  * @since 1.4.0

                  */

-                do_action('gd_compat_other_filters');?>

+                do_action('gd_compat_other_filters'); ?>

 

                 </tbody>

             </table>

 

 

-            <h4><?php _e('Required CSS', 'geodirectory');?></h4>

+            <h4><?php _e('Required CSS', 'geodirectory'); ?></h4>

 

             <table class="form-table gd-theme-compat-table">

                 <tbody>

@@ -1410,7 +1410,7 @@ 
                 </tbody>

             </table>

 

-            <h4><?php _e('Required JS', 'geodirectory');?></h4>

+            <h4><?php _e('Required JS', 'geodirectory'); ?></h4>

 

             <table class="form-table gd-theme-compat-table">

                 <tbody>

@@ -1428,7 +1428,7 @@ 
 

             <p class="submit">

                 <input name="save" class="button-primary" type="submit"

-                       value="<?php _e('Save changes', 'geodirectory');?>">

+                       value="<?php _e('Save changes', 'geodirectory'); ?>">

             </p>

 

         </div>

@@ -1462,7 +1462,7 @@ 
          * @param string $listing_type Post type.

          */

         ?>

-        <h3><?php echo apply_filters('geodir_custom_fields_panel_head', '', $sub_tab, $listing_type);?></h3>

+        <h3><?php echo apply_filters('geodir_custom_fields_panel_head', '', $sub_tab, $listing_type); ?></h3>

     </div>

     <div id="container_general" class="clearfix">

         <div class="general-form-builder-frame">

@@ -1477,7 +1477,7 @@ 
                  * @param string $listing_type Post type.

                  */

                 ?>

-                <h3 class="hndle"><span><?php echo apply_filters('geodir_cf_panel_available_fields_head', '', $sub_tab, $listing_type);?>

+                <h3 class="hndle"><span><?php echo apply_filters('geodir_cf_panel_available_fields_head', '', $sub_tab, $listing_type); ?>

 							</span></h3>

                 <?php

                 /**

@@ -1488,7 +1488,7 @@ 
                  * @param string $listing_type Post type.

                  */

                 ?>

-                <p><?php echo apply_filters('geodir_cf_panel_available_fields_note', '', $sub_tab, $listing_type);?></p>

+                <p><?php echo apply_filters('geodir_cf_panel_available_fields_note', '', $sub_tab, $listing_type); ?></p>

 

                 <div class="inside">

 

@@ -1522,7 +1522,7 @@ 
                      * @param string $listing_type Post type.

                      */

                     ?>

-                    <span><?php echo apply_filters('geodir_cf_panel_selected_fields_head', '', $sub_tab, $listing_type);?></span>

+                    <span><?php echo apply_filters('geodir_cf_panel_selected_fields_head', '', $sub_tab, $listing_type); ?></span>

                 </h3>

                 <?php

                 /**

@@ -1533,7 +1533,7 @@ 
                  * @param string $listing_type Post type.

                  */

                 ?>

-                <p><?php echo apply_filters('geodir_cf_panel_selected_fields_note', '', $sub_tab, $listing_type);?></p>

+                <p><?php echo apply_filters('geodir_cf_panel_selected_fields_note', '', $sub_tab, $listing_type); ?></p>

 

                 <div class="inside">

 

@@ -1574,7 +1574,7 @@ 
         <div class="gd-content-heading">

 

 

-            <h3><?php _e('GD Diagnostic Tools', 'geodirectory');?></h3>

+            <h3><?php _e('GD Diagnostic Tools', 'geodirectory'); ?></h3>

             <style>

                 .gd-tools-table {

                     width: 100%;

@@ -1593,81 +1593,81 @@ 
             <table class="form-table gd-tools-table">

                 <tbody>

                 <tr>

-                    <td><strong><?php _e('Tool', 'geodirectory');?></strong></td>

-                    <td><strong><?php _e('Description', 'geodirectory');?></strong></td>

-                    <td><strong><?php _e('Action', 'geodirectory');?></strong></td>

+                    <td><strong><?php _e('Tool', 'geodirectory'); ?></strong></td>

+                    <td><strong><?php _e('Description', 'geodirectory'); ?></strong></td>

+                    <td><strong><?php _e('Action', 'geodirectory'); ?></strong></td>

                 </tr>

 

 

                 <tr>

-                    <td><?php _e('GD pages check', 'geodirectory');?></td>

+                    <td><?php _e('GD pages check', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('Checks if the GD pages are installed correctly or not.', 'geodirectory');?></small>

+                        <small><?php _e('Checks if the GD pages are installed correctly or not.', 'geodirectory'); ?></small>

                     </td>

                     <td>

-                        <input type="button" value="<?php _e('Run', 'geodirectory');?>"

+                        <input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                class="button-primary geodir_diagnosis_button" data-diagnose="default_pages"/>

                     </td>

                 </tr>

 

 

                 <tr>

-                    <td><?php _e('Multisite DB conversion check', 'geodirectory');?></td>

+                    <td><?php _e('Multisite DB conversion check', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('Checks if the GD database tables have been converted to use multisite correctly.', 'geodirectory');?></small>

+                        <small><?php _e('Checks if the GD database tables have been converted to use multisite correctly.', 'geodirectory'); ?></small>

                     </td>

-                    <td><input type="button" value="<?php _e('Run', 'geodirectory');?>"

+                    <td><input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                class="button-primary geodir_diagnosis_button" data-diagnose="multisite_conversion"/>

                     </td>

                 </tr>

 

                 <tr>

-                    <td><?php _e('Ratings check', 'geodirectory');?></td>

+                    <td><?php _e('Ratings check', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('Checks ratings for correct location and content settings', 'geodirectory');?></small>

+                        <small><?php _e('Checks ratings for correct location and content settings', 'geodirectory'); ?></small>

                     </td>

-                    <td><input type="button" value="<?php _e('Run', 'geodirectory');?>"

+                    <td><input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                class="button-primary geodir_diagnosis_button" data-diagnose="ratings"/>

                     </td>

                 </tr>

 

                 <tr>

-                    <td><?php _e('Sync GD tags', 'geodirectory');?></td>

+                    <td><?php _e('Sync GD tags', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('This tool can be used when tags are showing in the backend but missing from the front end.', 'geodirectory');?></small>

+                        <small><?php _e('This tool can be used when tags are showing in the backend but missing from the front end.', 'geodirectory'); ?></small>

                     </td>

-                    <td><input type="button" value="<?php _e('Run', 'geodirectory');?>"

+                    <td><input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                class="button-primary geodir_diagnosis_button" data-diagnose="tags_sync"/>

                     </td>

                 </tr>

 

                 <tr>

-                    <td><?php _e('Sync GD Categories', 'geodirectory');?></td>

+                    <td><?php _e('Sync GD Categories', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('This tool can be used when categories are missing from the details table but showing in other places in the backend (only checks posts with missing category info in details table)', 'geodirectory');?></small>

+                        <small><?php _e('This tool can be used when categories are missing from the details table but showing in other places in the backend (only checks posts with missing category info in details table)', 'geodirectory'); ?></small>

                     </td>

-                    <td><input type="button" value="<?php _e('Run', 'geodirectory');?>"

+                    <td><input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                class="button-primary geodir_diagnosis_button" data-diagnose="cats_sync"/>

                     </td>

                 </tr>

 

 

                 <tr>

-                    <td><?php _e('Clear all GD version numbers', 'geodirectory');?></td>

+                    <td><?php _e('Clear all GD version numbers', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('This tool will clear all GD version numbers so any upgrade functions will run again.', 'geodirectory');?></small>

+                        <small><?php _e('This tool will clear all GD version numbers so any upgrade functions will run again.', 'geodirectory'); ?></small>

                     </td>

-                    <td><input type="button" value="<?php _e('Run', 'geodirectory');?>"

+                    <td><input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                class="button-primary geodir_diagnosis_button" data-diagnose="version_clear"/>

                     </td>

                 </tr>

 				<tr>

-					<td><?php _e('Load custom fields translation', 'geodirectory');?></td>

+					<td><?php _e('Load custom fields translation', 'geodirectory'); ?></td>

 					<td>

-						<small><?php _e('This tool will load strings from the database into a file to translate via po editor.Ex: custom fields', 'geodirectory');?></small>

+						<small><?php _e('This tool will load strings from the database into a file to translate via po editor.Ex: custom fields', 'geodirectory'); ?></small>

 					</td>

 					<td>

-						<input type="button" value="<?php _e('Run', 'geodirectory');?>" class="button-primary geodir_diagnosis_button" data-diagnose="load_db_language"/>

+						<input type="button" value="<?php _e('Run', 'geodirectory'); ?>" class="button-primary geodir_diagnosis_button" data-diagnose="load_db_language"/>

 					</td>

 				</tr>

                 <?php

@@ -1677,7 +1677,7 @@ 
                  * Called after the last setting on the GD>Tools page.

                  * @since 1.0.0

                  */

-                do_action('geodir_diagnostic_tool');?>

+                do_action('geodir_diagnostic_tool'); ?>

 

                 </tbody>

             </table>

Braces +21 added lines, -13 removed lines

@@ -74,17 +74,20 @@ 
                                 $tab_link = $args['url'];

                             }

 

-                            if (!empty($args['request']))

-                                $tab_link = geodir_getlink($tab_link, $args['request']);

+                            if (!empty($args['request'])) {
+                                                            $tab_link = geodir_getlink($tab_link, $args['request']);
+                            }
 

                             if (isset($args['target']) && $args['target'] != '') {

                                 $tab_target = " target='" . sanitize_text_field($args['target']) . "' ";

-                            } else

-                                $tab_target = '';

+                            } else {
+                                                            $tab_target = '';
+                            }
 

                             $tab_active = '';

-                            if ($current_tab == $name)

-                                $tab_active = ' class="tab-active" ';

+                            if ($current_tab == $name) {
+                                                            $tab_active = ' class="tab-active" ';
+                            }
                             /**

                              * Called before the individual settings tabs are output.

                              *

@@ -122,8 +125,9 @@ 
 

                         <?php

                         unset($subtabs);

-                        if (isset($tabs[$current_tab]['subtabs']))

-                            $subtabs = $tabs[$current_tab]['subtabs'];

+                        if (isset($tabs[$current_tab]['subtabs'])) {
+                                                    $subtabs = $tabs[$current_tab]['subtabs'];
+                        }
                         $form_action = '';

 

                         if (!empty($subtabs)):

@@ -189,7 +193,10 @@ 
                      jQuery('#last_tab').val( jQuery(this).attr('href') );

                      return false;*/

                 });

-                <?php if (isset($_GET['subtab']) && $_GET['subtab']) echo 'jQuery("ul.subsubsub li a[href=#' . sanitize_text_field($_GET['subtab']) . ']").click();'; ?>

+                <?php if (isset($_GET['subtab']) && $_GET['subtab']) {
+    echo 'jQuery("ul.subsubsub li a[href=#' . sanitize_text_field($_GET['subtab']) . ']").click();';
+}
+?>

                 // Countries

                 jQuery('select#geodirectory_allowed_countries').change(function () {

                     if (jQuery(this).val() == "specific") {

@@ -312,10 +319,11 @@ 
                 geodir_register_defaults();

             }*/

 

-            if (isset($_REQUEST['active_tab']) && ($_REQUEST['active_tab'] == 'dummy_data_settings' || $_REQUEST['active_tab'] == 'csv_upload_settings'))

-                $hide_save_button = "style='display:none;'";

-            else

-                $hide_save_button = '';

+            if (isset($_REQUEST['active_tab']) && ($_REQUEST['active_tab'] == 'dummy_data_settings' || $_REQUEST['active_tab'] == 'csv_upload_settings')) {
+                            $hide_save_button = "style='display:none;'";
+            } else {
+                            $hide_save_button = '';
+            }
 

             /**

              * Filter weather the default save button in the GD admin settings pages should be shown.

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])) {

geodirectory-functions/ajax_handler_functions.php

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
  */

 function geodir_on_wp()

 {

-    if(geodir_is_page('login')) {

+    if (geodir_is_page('login')) {

         geodir_user_signup();

     }

 

@@ -228,10 +228,10 @@ 
         if (is_user_logged_in()) {

             switch ($_REQUEST['ajax_action']):

                 case "add" :

-                    geodir_add_to_favorite((int)$_REQUEST['pid']);

+                    geodir_add_to_favorite((int) $_REQUEST['pid']);

                     break;

                 case "remove" :

-                    geodir_remove_from_favorite((int)$_REQUEST['pid']);

+                    geodir_remove_from_favorite((int) $_REQUEST['pid']);

                     break;

             endswitch;

         } else {

@@ -244,7 +244,7 @@ 
 

         $is_current_user_owner = true;

         if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-            $is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);

+            $is_current_user_owner = geodir_listing_belong_to_current_user((int) $_REQUEST['pid']);

         }

 

         $request = $gd_session->get('listing');

geodirectory-functions/custom_fields_functions.php

Indentation +318 added lines, -318 removed lines

@@ -1,26 +1,26 @@ 
 <?php

 /**

- * Custom fields functions

- *

- * @since 1.0.0

- * @package GeoDirectory

- * @global object $wpdb WordPress Database object.

- * @global string $table_prefix WordPress Database Table prefix.

- */

+                     * Custom fields functions

+                     *

+                     * @since 1.0.0

+                     * @package GeoDirectory

+                     * @global object $wpdb WordPress Database object.

+                     * @global string $table_prefix WordPress Database Table prefix.

+                     */

 global $wpdb, $table_prefix;

 

 if (!function_exists('geodir_column_exist')) {

-	/**

-	 * Check table column exist or not.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Check table column exist or not.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

-	 * @param string $db The table name.

-	 * @param string $column The column name.

-	 * @return bool If column exists returns true. Otherwise false.

-	 */

-	function geodir_column_exist($db, $column)

+     * @param string $db The table name.

+     * @param string $column The column name.

+     * @return bool If column exists returns true. Otherwise false.

+     */

+    function geodir_column_exist($db, $column)

     {

         global $wpdb;

         $exists = false;

@@ -36,17 +36,17 @@ 
 }

 

 if (!function_exists('geodir_add_column_if_not_exist')) {

-	/**

-	 * Add column if table column not exist.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Add column if table column not exist.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

-	 * @param string $db The table name.

-	 * @param string $column The column name.

-	 * @param string $column_attr The column attributes.

-	 */

-	function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")

+     * @param string $db The table name.

+     * @param string $column The column name.

+     * @param string $column_attr The column attributes.

+     */

+    function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")

     {

         global $wpdb;

         $result = 0;// no rows affected

@@ -152,18 +152,18 @@ 
 }

 

 if (!function_exists('geodir_custom_field_adminhtml')) {

-	/**

-	 * Adds admin html for custom fields.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Adds admin html for custom fields.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

-	 * @param string $field_type The form field type.

-	 * @param object|int $result_str The custom field results object or row id.

-	 * @param string $field_ins_upd When set to "submit" displays form.

-	 * @param bool $default when set to true field will be for admin use only.

-	 */

-	function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $default = false)

+     * @param string $field_type The form field type.

+     * @param object|int $result_str The custom field results object or row id.

+     * @param string $field_ins_upd When set to "submit" displays form.

+     * @param bool $default when set to true field will be for admin use only.

+     */

+    function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $default = false)

     {

         global $wpdb;

         $cf = $result_str;

@@ -186,32 +186,32 @@ 
 }

 

 if (!function_exists('geodir_custom_field_delete')) {

-	/**

-	 * Delete custom field using field id.

-	 *

-	 * @since 1.0.0

-	 * @since 1.5.7 Delete field from sorting fields table when custom field deleted.

-	 * @package GeoDirectory

+    /**

+     * Delete custom field using field id.

+     *

+     * @since 1.0.0

+     * @since 1.5.7 Delete field from sorting fields table when custom field deleted.

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global string $plugin_prefix Geodirectory plugin table prefix.

-	 * @param string $field_id The custom field ID.

-	 * @return int|string If field deleted successfully, returns field id. Otherwise returns 0.

-	 */

-	function geodir_custom_field_delete($field_id = '') {

+     * @param string $field_id The custom field ID.

+     * @return int|string If field deleted successfully, returns field id. Otherwise returns 0.

+     */

+    function geodir_custom_field_delete($field_id = '') {

         global $wpdb, $plugin_prefix;

         

-		if ($field_id != '') {

+        if ($field_id != '') {

             $cf = trim($field_id, '_');

 

             if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {

                 $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));

 

                 $post_type = $field->post_type;

-				$htmlvar_name = $field->htmlvar_name;

+                $htmlvar_name = $field->htmlvar_name;

 				

-				if ($post_type != '' && $htmlvar_name != '') {

-					$wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

-				}

+                if ($post_type != '' && $htmlvar_name != '') {

+                    $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

+                }

 

                 /**

                  * Called after a custom field is deleted.

@@ -248,15 +248,15 @@ 
 }

 

 if (!function_exists('geodir_custom_field_save')) {

-	/**

-	 * Save or Update custom fields into the database.

-	 *

-	 * @since 1.0.0

+    /**

+     * Save or Update custom fields into the database.

+     *

+     * @since 1.0.0

      * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt.

-	 * @package GeoDirectory

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global string $plugin_prefix Geodirectory plugin table prefix.

-	 * @param array $request_field {

+     * @param array $request_field {

      *    Attributes of the request field array.

      *

      *    @type string $action Ajax Action name. Default "geodir_ajax_action".

@@ -289,10 +289,10 @@ 
      *    @type string $css_class Enter custom css class for field custom style.

      *

      * }

-	 * @param bool $default Not yet implemented.

-	 * @return int|string If field is unique returns inserted row id. Otherwise returns error string.

-	 */

-	function geodir_custom_field_save($request_field = array(), $default = false)

+     * @param bool $default Not yet implemented.

+     * @return int|string If field is unique returns inserted row id. Otherwise returns error string.

+     */

+    function geodir_custom_field_save($request_field = array(), $default = false)

     {

 

         global $wpdb, $plugin_prefix;

@@ -976,27 +976,27 @@ 
                         if (isset($option_values) && $option_values && $field_type == 'select') {

                             $option_values_arr = explode(',', $option_values);

                             

-							if (is_array($option_values_arr)) {

+                            if (is_array($option_values_arr)) {

                                 $op_max = 0;

                                 

-								foreach ($option_values_arr as $op_val) {

+                                foreach ($option_values_arr as $op_val) {

                                     if (strlen($op_val) && strlen($op_val) > $op_max) {

-										$op_max = strlen($op_val);

-									}

+                                        $op_max = strlen($op_val);

+                                    }

                                 }

                                 

-								if ($op_max) {

-									$op_size = $op_max;

-								}

+                                if ($op_max) {

+                                    $op_size = $op_max;

+                                }

                             }

                         } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

                             if (strlen($option_values)) {

                                 $op_size =  strlen($option_values);

                             }

 							

-							if (isset($request_field['multi_display_type'])) {

-								$extra_fields = $request_field['multi_display_type'];

-							}

+                            if (isset($request_field['multi_display_type'])) {

+                                $extra_fields = $request_field['multi_display_type'];

+                            }

                         }

 

                         $meta_field_add = $data_type . "( $op_size ) NULL ";

@@ -1214,10 +1214,10 @@ 
     $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type);

 

     $fieldset_id = '';

-	$fieldset_field_class = 'gd-fieldset-details';

-	foreach ($custom_fields as $key => $val) {

+    $fieldset_field_class = 'gd-fieldset-details';

+    foreach ($custom_fields as $key => $val) {

         $val = stripslashes_deep($val); // strip slashes from labels

-		$name = $val['name'];

+        $name = $val['name'];

         $site_title = $val['site_title'];

         $type = $val['type'];

         $admin_desc = $val['desc'];

@@ -1582,15 +1582,15 @@ 
 				<?php if ($option_values) {

                     $option_values = geodir_string_values_to_options($option_values, true);

 					

-					if (!empty($option_values)) {

-						foreach ($option_values as $option_value) {

-							if (empty($option_value['optgroup'])) {

-							?>

+                    if (!empty($option_values)) {

+                        foreach ($option_values as $option_value) {

+                            if (empty($option_value['optgroup'])) {

+                            ?>

 							<input name="<?php echo $name;?>" id="<?php echo $name;?>" <?php checked($value, $option_value['value']);?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $type;?>" type="radio" /><?php echo $option_value['label']; ?>

 							<?php

-							}

-						}

-					}

+                            }

+                        }

+                    }

                 }

                 ?>

                 <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

@@ -2033,8 +2033,8 @@ 
                     $file_totImg = count($curImages);

             }

 			

-			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';

-			$display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';

+            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';

+            $display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';

 

             ?>

             <?php /*?> <h5 class="geodir-form_title"> <?php echo $site_title; ?>

@@ -2062,10 +2062,10 @@ 
 					<?php } ?>

                     <input type="hidden" name="<?php echo $file_id; ?>totImg" id="<?php echo $file_id; ?>totImg"

                            value="<?php if (isset($file_totImg)) {

-                               echo esc_attr($file_totImg);

-                           } else {

-                               echo '0';

-                           } ?>"/>

+                                echo esc_attr($file_totImg);

+                            } else {

+                                echo '0';

+                            } ?>"/>

 

                     <div style="float:left; width:55%;">

                         <div

@@ -2124,18 +2124,18 @@ 
 

 

 if (!function_exists('geodir_get_field_infoby')) {

-	/**

-	 * Get custom field using key and value.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Get custom field using key and value.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

-	 * @param string $key The key you want to look for.

-	 * @param string $value The value of the key you want to look for.

-	 * @param string $geodir_post_type The post type.

-	 * @return bool|mixed Returns field info when available. otherwise returns false.

-	 */

-	function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '')

+     * @param string $key The key you want to look for.

+     * @param string $value The value of the key you want to look for.

+     * @param string $geodir_post_type The post type.

+     * @return bool|mixed Returns field info when available. otherwise returns false.

+     */

+    function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '')

     {

 

         global $wpdb;

@@ -2158,21 +2158,21 @@ 
 

 

 if (!function_exists('geodir_show_listing_info')) {

-	/**

-	 * Show listing info depending on field location.

-	 *

-	 * @since 1.0.0

-	 * @since 1.5.7 Custom fields option values added to db translation.

+    /**

+     * Show listing info depending on field location.

+     *

+     * @since 1.0.0

+     * @since 1.5.7 Custom fields option values added to db translation.

      *              Changes to display url fields title.

-	 * @package GeoDirectory

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global object $post The current post object.

      * @global bool $send_to_friend True if send to friend link already rendered. Otherwise false.

      *

-	 * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc.

-	 * @return string Returns listing info html.

-	 */

-	function geodir_show_listing_info($fields_location = '') {

+     * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc.

+     * @return string Returns listing info html.

+     */

+    function geodir_show_listing_info($fields_location = '') {

         global $post, $preview, $wpdb, $send_to_friend;

 

         $payment_info = array();

@@ -2181,7 +2181,7 @@ 
         $package_info = geodir_post_package_info($package_info, $post);

         $post_package_id = $package_info->pid;

         $p_type = (geodir_get_current_posttype()) ? geodir_get_current_posttype() : $post->post_type;

-		$send_to_friend = false;

+        $send_to_friend = false;

 

         ob_start();

         $fields_info = geodir_post_custom_fields($post_package_id, 'default', $p_type, $fields_location);

@@ -2195,7 +2195,7 @@ 
 

                 $i = 1;

             foreach ($fields_info as $type) {

-				$type = stripslashes_deep($type); // strip slashes

+                $type = stripslashes_deep($type); // strip slashes

                 $html = '';

                 $html_var = '';

                 $field_icon = '';

@@ -2400,13 +2400,13 @@ 
                                 $field_icon = '';

                             }

 							

-							$a_url = geodir_parse_custom_field_url($post->{$type['htmlvar_name']});

+                            $a_url = geodir_parse_custom_field_url($post->{$type['htmlvar_name']});

 

 

-							$website = !empty($a_url['url']) ? $a_url['url'] : '';

-							$title = !empty($a_url['label']) ? $a_url['label'] : $type['site_title'];

+                            $website = !empty($a_url['url']) ? $a_url['url'] : '';

+                            $title = !empty($a_url['label']) ? $a_url['label'] : $type['site_title'];

                             if(!empty($type['default_value'])){$title = $type['default_value'];}

-							$title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';

+                            $title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';

 

 

                             $geodir_odd_even = '';

@@ -2624,22 +2624,22 @@ 
                         if ($post->{$type['htmlvar_name']} != ''):

 

                             if ($post->{$type['htmlvar_name']} == 'f' || $post->{$type['htmlvar_name']} == '0') {

-								$html_val = __('No', 'geodirectory');

-							} else if ($post->{$type['htmlvar_name']} == 't' || $post->{$type['htmlvar_name']} == '1') {

-								$html_val = __('Yes', 'geodirectory');

-							} else {								

-								if (!empty($type['option_values'])) {

-									$cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

+                                $html_val = __('No', 'geodirectory');

+                            } else if ($post->{$type['htmlvar_name']} == 't' || $post->{$type['htmlvar_name']} == '1') {

+                                $html_val = __('Yes', 'geodirectory');

+                            } else {								

+                                if (!empty($type['option_values'])) {

+                                    $cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

 									

-									if (!empty($cf_option_values)) {

-										foreach ($cf_option_values as $cf_option_value) {

-											if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$type['htmlvar_name']}) {

-												$html_val = $cf_option_value['label'];

-											}

-										}

-									}

-								}

-							}

+                                    if (!empty($cf_option_values)) {

+                                        foreach ($cf_option_values as $cf_option_value) {

+                                            if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$type['htmlvar_name']}) {

+                                                $html_val = $cf_option_value['label'];

+                                            }

+                                        }

+                                    }

+                                }

+                            }

 

                             if (strpos($field_icon, 'http') !== false) {

                                 $field_icon_af = '';

@@ -2710,19 +2710,19 @@ 
                         $html_var = $type['htmlvar_name'];

 

                         if ($post->{$type['htmlvar_name']}):

-							$field_value = __($post->$type['htmlvar_name'], 'geodirectory');

+                            $field_value = __($post->$type['htmlvar_name'], 'geodirectory');

 							

-							if (!empty($type['option_values'])) {

-								$cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

+                            if (!empty($type['option_values'])) {

+                                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

 								

-								if (!empty($cf_option_values)) {

-									foreach ($cf_option_values as $cf_option_value) {

-										if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->$type['htmlvar_name']) {

-											$field_value = $cf_option_value['label'];

-										}

-									}

-								}

-							}

+                                if (!empty($cf_option_values)) {

+                                    foreach ($cf_option_values as $cf_option_value) {

+                                        if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->$type['htmlvar_name']) {

+                                            $field_value = $cf_option_value['label'];

+                                        }

+                                    }

+                                }

+                            }

 							

                             if (strpos($field_icon, 'http') !== false) {

                                 $field_icon_af = '';

@@ -2770,19 +2770,19 @@ 
                                 $field_icon = '';

                             }

 							

-							$field_values = explode(',', trim($post->$type['htmlvar_name'], ","));

+                            $field_values = explode(',', trim($post->$type['htmlvar_name'], ","));

 

                             $option_values = array();

-							if (!empty($type['option_values'])) {

-								$cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

+                            if (!empty($type['option_values'])) {

+                                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

 								

-								if (!empty($cf_option_values)) {

-									foreach ($cf_option_values as $cf_option_value) {

-										if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {

-											$option_values[] = $cf_option_value['label'];

-										}

-									}

-								}

+                                if (!empty($cf_option_values)) {

+                                    foreach ($cf_option_values as $cf_option_value) {

+                                        if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {

+                                            $option_values[] = $cf_option_value['label'];

+                                        }

+                                    }

+                                }

                             }

 							

                             $geodir_odd_even = '';

@@ -2802,11 +2802,11 @@ 
                             if (count($option_values) > 1) {

                                 $html .= '<ul>';

                                 

-								foreach ($option_values as $val) {

+                                foreach ($option_values as $val) {

                                     $html .= '<li>' . $val . '</li>';

                                 }

                                 

-								$html .= '</ul>';

+                                $html .= '</ul>';

                             } else {

                                 $html .= $post->$type['htmlvar_name'];

                             }

@@ -2815,13 +2815,13 @@ 
                         endif;

                         break;

                     case 'email':

-						if ($type['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {

-							continue; // Remove Send Enquiry | Send To Friend from listings page

-						}

+                        if ($type['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {

+                            continue; // Remove Send Enquiry | Send To Friend from listings page

+                        }

                        

-					    if ($type['htmlvar_name'] == 'geodir_email' && ((isset($package_info->sendtofriend) && $package_info->sendtofriend) || $post->{$type['htmlvar_name']})) {

-						    $send_to_friend = true;

-							$b_send_inquiry = '';

+                        if ($type['htmlvar_name'] == 'geodir_email' && ((isset($package_info->sendtofriend) && $package_info->sendtofriend) || $post->{$type['htmlvar_name']})) {

+                            $send_to_friend = true;

+                            $b_send_inquiry = '';

                             $b_sendtofriend = '';

 

                             $html = '';

@@ -2859,7 +2859,7 @@ 
 

                             if (isset($package_info->sendtofriend) && $package_info->sendtofriend) {

                                 $html .= $seperator . '<a href="javascript:void(0);" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';

-							}

+                            }

 

                             $html .= '</span></div>';

 

@@ -2932,13 +2932,13 @@ 
                             if (!empty($files)):

 

                                $extra_fields = !empty($type['extra_fields']) ? maybe_unserialize($type['extra_fields']) : NULL;

-							   $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+                                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

 								

-								$file_paths = '';

+                                $file_paths = '';

                                 foreach ($files as $file) {

                                     if (!empty($file)) {

 

-                                       // $filetype = wp_check_filetype($file);

+                                        // $filetype = wp_check_filetype($file);

 

                                         $image_name_arr = explode('/', $file);

                                         $curr_img_dir = $image_name_arr[count($image_name_arr) - 2];

@@ -2947,29 +2947,29 @@ 
 

                                         $arr_file_type = wp_check_filetype($filename);

                                         if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

-											continue;

-										}

+                                            continue;

+                                        }

 										

-										$uploaded_file_type = $arr_file_type['type'];

-										$uploaded_file_ext = $arr_file_type['ext'];

+                                        $uploaded_file_type = $arr_file_type['type'];

+                                        $uploaded_file_ext = $arr_file_type['ext'];

 										

-										if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

-											continue; // Invalid file type.

-										}

+                                        if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

+                                            continue; // Invalid file type.

+                                        }

 

                                         //$allowed_file_types = array('application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

-										$image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');

+                                        $image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');

 

                                         // If the uploaded file is image

                                         if (in_array($uploaded_file_type, $image_file_types)) {

                                             $file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';

                                             $file_paths .= '<a href="'.$file.'">';

-											$file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);

-											$file_paths .= '</a>';

+                                            $file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);

+                                            $file_paths .= '</a>';

                                             //$file_paths .= '<img src="'.$file.'"  />';	

                                             $file_paths .= '</div>';

                                         } else {

-											$ext_path = '_' . $html_var . '_';

+                                            $ext_path = '_' . $html_var . '_';

                                             $filename = explode($ext_path, $filename);

                                             $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';

                                         }

@@ -3174,14 +3174,14 @@ 
 }

 

 if (!function_exists('geodir_default_date_format')) {

-	/**

-	 * Returns default date format.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

-	 * @return mixed|string|void Returns default date format.

-	 */

-	function geodir_default_date_format()

+    /**

+     * Returns default date format.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     * @return mixed|string|void Returns default date format.

+     */

+    function geodir_default_date_format()

     {

         if ($format = get_option('date_format'))

             return $format;

@@ -3191,30 +3191,30 @@ 
 }

 

 if (!function_exists('geodir_get_formated_date')) {

-	/**

-	 * Returns formatted date.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

-	 * @param string $date Date string to convert.

-	 * @return bool|int|string Returns formatted date.

-	 */

-	function geodir_get_formated_date($date)

+    /**

+     * Returns formatted date.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     * @param string $date Date string to convert.

+     * @return bool|int|string Returns formatted date.

+     */

+    function geodir_get_formated_date($date)

     {

         return mysql2date(get_option('date_format'), $date);

     }

 }

 

 if (!function_exists('geodir_get_formated_time')) {

-	/**

-	 * Returns formatted time.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

-	 * @param string $time Time string to convert.

-	 * @return bool|int|string Returns formatted time.

-	 */

-	function geodir_get_formated_time($time)

+    /**

+     * Returns formatted time.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     * @param string $time Time string to convert.

+     * @return bool|int|string Returns formatted time.

+     */

+    function geodir_get_formated_time($time)

     {

         return mysql2date(get_option('time_format'), $time, $translate = true);

     }

@@ -3222,21 +3222,21 @@ 
 

 

 if (!function_exists('geodir_save_post_file_fields')) {

-	/**

-	 * Save post file fields

-	 *

-	 * @since 1.0.0

-	 * @since 1.4.7 Added `$extra_fields` parameter.

-	 * @package GeoDirectory

+    /**

+     * Save post file fields

+     *

+     * @since 1.0.0

+     * @since 1.4.7 Added `$extra_fields` parameter.

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global string $plugin_prefix Geodirectory plugin table prefix.

      * @global object $current_user Current user object.

-	 * @param int $post_id

-	 * @param string $field_id

-	 * @param array $post_image

-	 * @param array $extra_fields Array of extra fields.

-	 */

-	function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array())

+     * @param int $post_id

+     * @param string $field_id

+     * @param array $post_image

+     * @param array $extra_fields Array of extra fields.

+     */

+    function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array())

     {

 

         global $wpdb, $plugin_prefix, $current_user;

@@ -3262,7 +3262,7 @@ 
             $geodir_uploadurl = $uploads['url'];

             $sub_dir = $uploads['subdir'];

 			

-			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

 

             for ($m = 0; $m < count($post_image); $m++) {

 

@@ -3279,47 +3279,47 @@ 
 

                     $arr_file_type = wp_check_filetype($filename);

 					

-					if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

-						continue;

-					}

+                    if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

+                        continue;

+                    }

 					

-					$uploaded_file_type = $arr_file_type['type'];

-					$uploaded_file_ext = $arr_file_type['ext'];

+                    $uploaded_file_type = $arr_file_type['type'];

+                    $uploaded_file_ext = $arr_file_type['ext'];

 					

-					if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

-						continue; // Invalid file type.

-					}

+                    if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

+                        continue; // Invalid file type.

+                    }

 

                     // Set an array containing a list of acceptable formats

                     //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

 

-					if (!function_exists('wp_handle_upload'))

-						require_once(ABSPATH . 'wp-admin/includes/file.php');

+                    if (!function_exists('wp_handle_upload'))

+                        require_once(ABSPATH . 'wp-admin/includes/file.php');

 

-					if (!is_dir($geodir_uploadpath))

-						mkdir($geodir_uploadpath);

+                    if (!is_dir($geodir_uploadpath))

+                        mkdir($geodir_uploadpath);

 

-					$new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

-					$explode_sub_dir = explode("/", $sub_dir);

-					if ($curr_img_dir == end($explode_sub_dir)) {

-						$img_path = $geodir_uploadpath . '/' . $filename;

-						$img_url = $geodir_uploadurl . '/' . $filename;

-					} else {

-						$img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

-						$img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

-					}

+                    $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

+                    $explode_sub_dir = explode("/", $sub_dir);

+                    if ($curr_img_dir == end($explode_sub_dir)) {

+                        $img_path = $geodir_uploadpath . '/' . $filename;

+                        $img_url = $geodir_uploadurl . '/' . $filename;

+                    } else {

+                        $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

+                        $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

+                    }

 

-					$uploaded_file = '';

-					if (file_exists($img_path))

-						$uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+                    $uploaded_file = '';

+                    if (file_exists($img_path))

+                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

 

-					if ($curr_img_dir != $geodir_uploaddir) {

-						if (file_exists($img_path))

-							unlink($img_path);

-					}

+                    if ($curr_img_dir != $geodir_uploaddir) {

+                        if (file_exists($img_path))

+                            unlink($img_path);

+                    }

 

-					if (!empty($uploaded_file))

-						$file_urls = $geodir_uploadurl . '/' . $new_name;

+                    if (!empty($uploaded_file))

+                        $file_urls = $geodir_uploadurl . '/' . $new_name;

 

                 } else {

                     $file_urls = $post_image[$m];

@@ -3374,16 +3374,16 @@ 
 

 if (!function_exists('geodir_plupload_action')) {

 

-	/**

-	 * Get upload directory path details

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Get upload directory path details

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $current_user Current user object.

-	 * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'.

-	 * @return mixed Returns upload directory details as an array.

-	 */

-	function geodir_upload_dir($upload)

+     * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'.

+     * @return mixed Returns upload directory details as an array.

+     */

+    function geodir_upload_dir($upload)

     {

         global $current_user;

         $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;

@@ -3483,14 +3483,14 @@ 
 }

 

 if (!function_exists('geodir_max_upload_size')) {

-	/**

-	 * Get max upload file size

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

-	 * @return mixed|void Returns max upload file size.

-	 */

-	function geodir_max_upload_size()

+    /**

+     * Get max upload file size

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     * @return mixed|void Returns max upload file size.

+     */

+    function geodir_max_upload_size()

     {

         $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);

 

@@ -3663,14 +3663,14 @@ 
 

 

 if (!function_exists('geodir_custom_sort_field_save')) {

-	/**

-	 * Save or Update custom sort fields into the database.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Save or Update custom sort fields into the database.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global string $plugin_prefix Geodirectory plugin table prefix.

-	 * @param array $request_field {

+     * @param array $request_field {

      *    Attributes of the Request field.

      *

      *    @type string $action Ajax action name.

@@ -3689,10 +3689,10 @@ 
      *    @type string $sort_order Sort Order.

      *

      * }

-	 * @param bool $default Not yet implemented.

-	 * @return int Returns the last affected db table row id.

-	 */

-	function geodir_custom_sort_field_save($request_field = array(), $default = false)

+     * @param bool $default Not yet implemented.

+     * @return int Returns the last affected db table row id.

+     */

+    function geodir_custom_sort_field_save($request_field = array(), $default = false)

     {

 

         global $wpdb, $plugin_prefix;

@@ -3810,16 +3810,16 @@ 
 

 

 if (!function_exists('geodir_custom_sort_field_delete')) {

-	/**

-	 * Delete a custom sort field using field id.

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Delete a custom sort field using field id.

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global string $plugin_prefix Geodirectory plugin table prefix.

-	 * @param string $field_id The field ID.

-	 * @return int|string Returns field id when successful deletion, else returns 0.

-	 */

-	function geodir_custom_sort_field_delete($field_id = '')

+     * @param string $field_id The field ID.

+     * @return int|string Returns field id when successful deletion, else returns 0.

+     */

+    function geodir_custom_sort_field_delete($field_id = '')

     {

 

         global $wpdb, $plugin_prefix;

@@ -3838,18 +3838,18 @@ 
 

 

 if (!function_exists('geodir_custom_sort_field_adminhtml')) {

-	/**

-	 * Custom sort field admin html.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Custom sort field admin html.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

-	 * @param string $field_type The form field type.

-	 * @param object|int $result_str The custom field results object or row id.

-	 * @param string $field_ins_upd When set to "submit" displays form.

-	 * @param bool $default when set to true field will be for admin use only.

-	 */

-	function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $default = false)

+     * @param string $field_type The form field type.

+     * @param object|int $result_str The custom field results object or row id.

+     * @param string $field_ins_upd When set to "submit" displays form.

+     * @param bool $default when set to true field will be for admin use only.

+     */

+    function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $default = false)

     {

         global $wpdb;

         $cf = $result_str;

@@ -3914,10 +3914,10 @@ 
 

             <div id="field_frm<?php echo $result_str;?>" class="field_frm"

                  style="display:<?php if ($field_ins_upd == 'submit') {

-                     echo 'block;';

-                 } else {

-                     echo 'none;';

-                 } ?>">

+                        echo 'block;';

+                    } else {

+                        echo 'none;';

+                    } ?>">

                 <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/>

                 <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/>

                 <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/>

@@ -3945,8 +3945,8 @@ 
                                 <input type="text" name="asc_title" id="asc_title"

                                        placeholder="<?php esc_attr_e('Ascending title', 'geodirectory'); ?>"

                                        value="<?php if (isset($field_info->asc_title)) {

-                                           echo esc_attr($field_info->asc_title);

-                                       } ?>" style="width:45%;"/>

+                                            echo esc_attr($field_info->asc_title);

+                                        } ?>" style="width:45%;"/>

 

                                 <input type="radio" name="is_default"

                                        value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {

@@ -3969,8 +3969,8 @@ 
                                 <input type="text" name="desc_title" id="desc_title"

                                        placeholder="<?php esc_attr_e('Descending title', 'geodirectory'); ?>"

                                        value="<?php if (isset($field_info->desc_title)) {

-                                           echo esc_attr($field_info->desc_title);

-                                       } ?>" style="width:45%;"/>

+                                            echo esc_attr($field_info->desc_title);

+                                        } ?>" style="width:45%;"/>

                                 <input type="radio" name="is_default"

                                        value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {

                                     echo 'checked="checked"';

@@ -4056,19 +4056,19 @@ 
 }

 

 if (!function_exists('check_field_visibility')) {

-	/**

-	 * Check field visibility as per price package.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Check field visibility as per price package.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global array $geodir_addon_list List of active GeoDirectory extensions.

-	 * @param int|string $package_id The package ID.

-	 * @param string $field_name The field name.

-	 * @param string $post_type Optional. The wordpress post type.

-	 * @return bool Returns true when field visible, otherwise false.

-	 */

-	function check_field_visibility($package_id, $field_name, $post_type)

+     * @param int|string $package_id The package ID.

+     * @param string $field_name The field name.

+     * @param string $post_type Optional. The wordpress post type.

+     * @return bool Returns true when field visible, otherwise false.

+     */

+    function check_field_visibility($package_id, $field_name, $post_type)

     {

         global $wpdb, $geodir_addon_list;

         if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {

@@ -4116,15 +4116,15 @@ 
                 $input_str = explode("/", $input_str, 2);

                 $label = trim($input_str[0]);

                 if ($translated && $label != '') {

-					$label = __($label, 'geodirectory');

-				}

-				$label = ucfirst($label);

+                    $label = __($label, 'geodirectory');

+                }

+                $label = ucfirst($label);

                 $value = trim($input_str[1]);

             } else {

                 if ($translated && $input_str != '') {

-					$input_str = __($input_str, 'geodirectory');

-				}

-				$label = ucfirst($input_str);

+                    $input_str = __($input_str, 'geodirectory');

+                }

+                $label = ucfirst($input_str);

                 $value = $input_str;

             }

 

@@ -4170,9 +4170,9 @@ 
                     if (strpos($optgroup_str, "|") !== false) {

                         $optgroup_str_arr = explode("|", $optgroup_str, 2);

                         $optgroup_label = trim($optgroup_str_arr[0]);

-						if ($translated && $optgroup_label != '') {

-							$optgroup_label = __($optgroup_label, 'geodirectory');

-						}

+                        if ($translated && $optgroup_label != '') {

+                            $optgroup_label = __($optgroup_label, 'geodirectory');

+                        }

                         $optgroup_label = ucfirst($optgroup_label);

                         $optgroup_str = $optgroup_str_arr[1];

                     }

Spacing +183 added lines, -183 removed lines

@@ -49,7 +49,7 @@ 
 	function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")

     {

         global $wpdb;

-        $result = 0;// no rows affected

+        $result = 0; // no rows affected

         if (!geodir_column_exist($db, $column)) {

             if (!empty($db) && !empty($column))

                 $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");

@@ -427,7 +427,7 @@ 
 

                 $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);

 

-                $sort_order = (int)$last_order + 1;

+                $sort_order = (int) $last_order + 1;

             }

 

             $default_value_add = '';

@@ -679,18 +679,18 @@ 
                     $op_size = '500';

 

                     // only make the field as big as it needs to be.

-                    if(isset($option_values) && $option_values && $field_type=='select'){

-                        $option_values_arr = explode(',',$option_values);

-                        if(is_array($option_values_arr)){

+                    if (isset($option_values) && $option_values && $field_type == 'select') {

+                        $option_values_arr = explode(',', $option_values);

+                        if (is_array($option_values_arr)) {

                             $op_max = 0;

-                            foreach($option_values_arr as $op_val){

-                                if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}

+                            foreach ($option_values_arr as $op_val) {

+                                if (strlen($op_val) && strlen($op_val) > $op_max) {$op_max = strlen($op_val); }

                             }

-                            if($op_max){$op_size =$op_max; }

+                            if ($op_max) {$op_size = $op_max; }

                         }

-                    }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

-                        if(strlen($option_values)){

-                            $op_size =  strlen($option_values);

+                    }elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

+                        if (strlen($option_values)) {

+                            $op_size = strlen($option_values);

                         }

                     }

 

@@ -701,8 +701,8 @@ 
                         }

 

                     $alter_result = $wpdb->query($meta_field_add);

-                    if($alter_result===false){

-                        return __('Column change failed, you may have too many columns.','geodirectory');

+                    if ($alter_result === false) {

+                        return __('Column change failed, you may have too many columns.', 'geodirectory');

                     }

 

                         if (isset($request_field['cat_display_type']))

@@ -718,8 +718,8 @@ 
                     case 'html':

 

                     $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");

-                    if($alter_result===false){

-                        return __('Column change failed, you may have too many columns.','geodirectory');

+                    if ($alter_result === false) {

+                        return __('Column change failed, you may have too many columns.', 'geodirectory');

                     }

                         if (isset($request_field['advanced_editor']))

                             $extra_fields = $request_field['advanced_editor'];

@@ -733,7 +733,7 @@ 
                     default:

                         if ($data_type != 'VARCHAR' && $data_type != '') {

                             if ($data_type == 'FLOAT' && $decimal_point > 0) {

-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL";

+                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int) $decimal_point . ") NULL";

                             } else {

                                 $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL";

                             }

@@ -749,8 +749,8 @@ 
                         }

 

                         $alter_result = $wpdb->query($default_value_add);

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

+                        if ($alter_result === false) {

+                            return __('Column change failed, you may have too many columns.', 'geodirectory');

                         }

                         break;

                 endswitch;

@@ -798,7 +798,7 @@ 
 					for_admin_use = %s

 					where id = %d",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf)

+                        array($post_type, $admin_title, $site_title, $field_type, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use, $cf)

                     )

 

                 );

@@ -958,7 +958,7 @@ 
                         $data_type = 'TINYINT';

 

                         $meta_field_add = $data_type . "( 1 ) NOT NULL ";

-                        if ((int)$default_value === 1) {

+                        if ((int) $default_value === 1) {

                             $meta_field_add .= " DEFAULT '1'";

                         }

 

@@ -991,7 +991,7 @@ 
                             }

                         } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

                             if (strlen($option_values)) {

-                                $op_size =  strlen($option_values);

+                                $op_size = strlen($option_values);

                             }

 							

 							if (isset($request_field['multi_display_type'])) {

@@ -1064,7 +1064,7 @@ 
                             $meta_field_add = $data_type . " NULL ";

 

                             if ($data_type == 'FLOAT' && $decimal_point > 0) {

-                                $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL ";

+                                $meta_field_add = "DECIMAL(11, " . (int) $decimal_point . ") NULL ";

                             }

 

                             if (is_numeric($default_value) && $default_value != '') {

@@ -1129,7 +1129,7 @@ 
 					validation_msg = %s,

 					for_admin_use = %s ",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use)

+                        array($post_type, $admin_title, $site_title, $field_type, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use)

 

                     )

 

@@ -1141,7 +1141,7 @@ 
 

             }

 

-            return (int)$lastid;

+            return (int) $lastid;

 

 

         } else {

@@ -1230,7 +1230,7 @@ 
         $value = '';

 

         /* field available to site admin only for edit */

-        $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false;

+        $for_admin_use = isset($val['for_admin_use']) && (int) $val['for_admin_use'] == 1 ? true : false;

         if ($for_admin_use && !is_super_admin()) {

             continue;

         }

@@ -1267,11 +1267,11 @@ 
         do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);

 

         if ($type == 'fieldset') {

-            $fieldset_id = (int)$val['id'];

+            $fieldset_id = (int) $val['id'];

             $fieldset_field_class = 'gd-fieldset-' . $fieldset_id;

             ?>

-            <h5 id="geodir_fieldset_<?php echo $fieldset_id;?>" class="geodir-fieldset-row" gd-fieldset="<?php echo $fieldset_id;?>"><?php echo $site_title;?>

-            <?php if ($admin_desc != '') echo '<small>( ' . $admin_desc . ' )</small>';?></h5>

+            <h5 id="geodir_fieldset_<?php echo $fieldset_id; ?>" class="geodir-fieldset-row" gd-fieldset="<?php echo $fieldset_id; ?>"><?php echo $site_title; ?>

+            <?php if ($admin_desc != '') echo '<small>( ' . $admin_desc . ' )</small>'; ?></h5>

             <?php

         } else if ($type == 'address') {

             $prefix = $name . '_';

@@ -1297,7 +1297,7 @@ 
                 $mapview = isset($post[$prefix . 'mapview']) ? $post[$prefix . 'mapview'] : '';

                 $mapzoom = isset($post[$prefix . 'mapzoom']) ? $post[$prefix . 'mapzoom'] : '';

             } else if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && $post_info = geodir_get_post_info($_REQUEST['pid'])) {

-                $post_info = (array)$post_info;

+                $post_info = (array) $post_info;

 

                 $address = $post_info[$prefix . 'address'];

                 $zip = isset($post_info[$prefix . 'zip']) ? $post_info[$prefix . 'zip'] : '';

@@ -1341,16 +1341,16 @@ 
 

             ?>

 

-            <div id="geodir_<?php echo $prefix . 'address';?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="geodir_<?php echo $prefix . 'address'; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php _e($address_title, 'geodirectory'); ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input type="text" field_type="<?php echo $type;?>" name="<?php echo $prefix . 'address';?>"

-                       id="<?php echo $prefix . 'address';?>" class="geodir_textfield"

+                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'address'; ?>"

+                       id="<?php echo $prefix . 'address'; ?>" class="geodir_textfield"

                        value="<?php echo esc_attr(stripslashes($address)); ?>"/>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1371,7 +1371,7 @@ 
             if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) { ?>

 

                 <div id="geodir_<?php echo $prefix . 'zip'; ?>_row"

-                     class="<?php /*if($is_required) echo 'required_field';*/ ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                     class="<?php /*if($is_required) echo 'required_field';*/ ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                     <label>

                         <?php _e($zip_title, 'geodirectory'); ?>

                         <?php /*if($is_required) echo '<span>*</span>';*/ ?>

@@ -1387,7 +1387,7 @@ 
 

             <?php if (isset($extra_fields['show_map']) && $extra_fields['show_map']) { ?>

 

-                <div id="geodir_<?php echo $prefix . 'map'; ?>_row" class="geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                <div id="geodir_<?php echo $prefix . 'map'; ?>_row" class="geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                     <?php

                     /**

                      * Contains add listing page map functions.

@@ -1406,7 +1406,7 @@ 
                 /* show lat lng */

                 $style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>

                 <div id="geodir_<?php echo $prefix . 'latitude'; ?>_row"

-                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

+                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>" <?php echo $style_latlng; ?>>

                     <label>

                         <?php echo PLACE_ADDRESS_LAT; ?>

                         <?php if ($is_required) echo '<span>*</span>'; ?>

@@ -1421,7 +1421,7 @@ 
                 </div>

 

                 <div id="geodir_<?php echo $prefix . 'longitude'; ?>_row"

-                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

+                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>" <?php echo $style_latlng; ?>>

                     <label>

                         <?php echo PLACE_ADDRESS_LNG; ?>

                         <?php if ($is_required) echo '<span>*</span>'; ?>

@@ -1437,7 +1437,7 @@ 
             <?php } ?>

 

             <?php if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) { ?>

-                <div id="geodir_<?php echo $prefix . 'mapview'; ?>_row" class="geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                <div id="geodir_<?php echo $prefix . 'mapview'; ?>_row" class="geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                     <label><?php _e($mapview_title, 'geodirectory'); ?></label>

 

 

@@ -1479,30 +1479,30 @@ 
         <?php } elseif ($type == 'text') {

 

             //number and float validation $validation_pattern

-            if(isset($val['data_type']) && $val['data_type']=='INT'){$type = 'number';}

-            elseif(isset($val['data_type']) && $val['data_type']=='FLOAT'){$type = 'float';}

+            if (isset($val['data_type']) && $val['data_type'] == 'INT') {$type = 'number'; }

+            elseif (isset($val['data_type']) && $val['data_type'] == 'FLOAT') {$type = 'float'; }

             //print_r($val);

             //validation

-            if(isset($val['validation_pattern']) && $val['validation_pattern']){

-                $validation = 'pattern="'.$val['validation_pattern'].'"';

-            }else{$validation='';}

+            if (isset($val['validation_pattern']) && $val['validation_pattern']) {

+                $validation = 'pattern="' . $val['validation_pattern'] . '"';

+            } else {$validation = ''; }

 

             // validation message

-            if(isset($val['validation_msg']) && $val['validation_msg']){

-                $validation_msg = 'title="'.$val['validation_msg'].'"';

-            }else{$validation_msg='';}

+            if (isset($val['validation_msg']) && $val['validation_msg']) {

+                $validation_msg = 'title="' . $val['validation_msg'] . '"';

+            } else {$validation_msg = ''; }

             ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr(stripslashes($value));?>" type="<?php echo $type;?>" class="geodir_textfield" <?php echo $validation;echo $validation_msg;?> />

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr(stripslashes($value)); ?>" type="<?php echo $type; ?>" class="geodir_textfield" <?php echo $validation; echo $validation_msg; ?> />

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1513,16 +1513,16 @@ 
                 $value = '';

             }?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr(stripslashes($value));?>" type="email" class="geodir_textfield"/>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr(stripslashes($value)); ?>" type="email" class="geodir_textfield"/>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1533,16 +1533,16 @@ 
                 $value = '';

             } ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr(stripslashes($value));?>" type="tel" class="geodir_textfield"/>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr(stripslashes($value)); ?>" type="tel" class="geodir_textfield"/>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1553,31 +1553,31 @@ 
                 $value = '';

             }?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr(stripslashes($value));?>" type="url" class="geodir_textfield"

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr(stripslashes($value)); ?>" type="url" class="geodir_textfield"

                        oninvalid="setCustomValidity('<?php _e('Please enter a valid URL including http://', 'geodirectory'); ?>')"

                        onchange="try{setCustomValidity('')}catch(e){}"

                     />

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

             </div>

 

         <?php } elseif ($type == 'radio') { ?>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

 				<?php if ($option_values) {

                     $option_values = geodir_string_values_to_options($option_values, true);

@@ -1586,14 +1586,14 @@ 
 						foreach ($option_values as $option_value) {

 							if (empty($option_value['optgroup'])) {

 							?>

-							<input name="<?php echo $name;?>" id="<?php echo $name;?>" <?php checked($value, $option_value['value']);?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $type;?>" type="radio" /><?php echo $option_value['label']; ?>

+							<input name="<?php echo $name; ?>" id="<?php echo $name; ?>" <?php checked($value, $option_value['value']); ?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $type; ?>" type="radio" /><?php echo $option_value['label']; ?>

 							<?php

 							}

 						}

 					}

                 }

                 ?>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1601,22 +1601,22 @@ 
 

         <?php } elseif ($type == 'checkbox') { ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

                 <?php if ($value != '1') {

                     $value = '0';

                 }?>

-                <input type="hidden" name="<?php echo $name;?>" id="<?php echo $name;?>" value="<?php echo esc_attr($value);?>"/>

+                <input type="hidden" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr($value); ?>"/>

                 <input  <?php if ($value == '1') {

                     echo 'checked="checked"';

-                }?>  value="1" class="gd-checkbox" field_type="<?php echo $type;?>" type="checkbox"

-                     onchange="if(this.checked){jQuery('#<?php echo $name;?>').val('1');} else{ jQuery('#<?php echo $name;?>').val('0');}"/>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                }?>  value="1" class="gd-checkbox" field_type="<?php echo $type; ?>" type="checkbox"

+                     onchange="if(this.checked){jQuery('#<?php echo $name; ?>').val('1');} else{ jQuery('#<?php echo $name; ?>').val('0');}"/>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1625,44 +1625,44 @@ 
         <?php } elseif ($type == 'textarea') {

             ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label><?php

 

 

                 if (is_array($extra_fields) && in_array('1', $extra_fields)) {

 

-                    $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);?>

+                    $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10); ?>

 

-                <div class="editor" field_id="<?php echo $name;?>" field_type="editor">

+                <div class="editor" field_id="<?php echo $name; ?>" field_type="editor">

                     <?php wp_editor(stripslashes($value), $name, $editor_settings); ?>

                     </div><?php

 

                 } else {

 

-                    ?><textarea field_type="<?php echo $type;?>" class="geodir_textarea" name="<?php echo $name;?>"

-                                id="<?php echo $name;?>"><?php echo stripslashes($value);?></textarea><?php

+                    ?><textarea field_type="<?php echo $type; ?>" class="geodir_textarea" name="<?php echo $name; ?>"

+                                id="<?php echo $name; ?>"><?php echo stripslashes($value); ?></textarea><?php

 

                 }?>

 

 

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

             </div>

 

         <?php } elseif ($type == 'select') { ?>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row geodir_custom_fields clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row geodir_custom_fields clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

                 <?php

                 $option_values_arr = geodir_string_values_to_options($option_values, true);

@@ -1683,11 +1683,11 @@ 
                     }

                 }

                 ?>

-                <select field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

+                <select field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

                         class="geodir_textfield textfield_x chosen_select"

-                        data-placeholder="<?php echo __('Choose', 'geodirectory') . ' ' . $site_title . '&hellip;';?>"

-                        option-ajaxchosen="false"><?php echo $select_options;?></select>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                        data-placeholder="<?php echo __('Choose', 'geodirectory') . ' ' . $site_title . '&hellip;'; ?>"

+                        option-ajaxchosen="false"><?php echo $select_options; ?></select>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1701,7 +1701,7 @@ 
             }

             ?>

             <div id="<?php echo $name; ?>_row"

-                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

@@ -1775,7 +1775,7 @@ 
             ?>

 

             <div id="<?php echo $name; ?>_row"

-                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

@@ -1805,8 +1805,8 @@ 
 

             $date_format = str_replace($search, $replace, $extra_fields['date_format']);

 

-            if($value=='0000-00-00'){$value='';}//if date not set, then mark it empty

-            if($value && !isset($_REQUEST['backandedit'])) {

+            if ($value == '0000-00-00') {$value = ''; }//if date not set, then mark it empty

+            if ($value && !isset($_REQUEST['backandedit'])) {

                 $time = strtotime($value);

                 $value = date($date_format, $time);

             }

@@ -1816,37 +1816,37 @@ 
 

                 jQuery(function () {

 

-                    jQuery("#<?php echo $name;?>").datepicker({changeMonth: true, changeYear: true <?php

+                    jQuery("#<?php echo $name; ?>").datepicker({changeMonth: true, changeYear: true <?php

                     /**

                      * Used to add extra option to datepicker per custom field.

                      *

                      * @since 1.5.7

                      * @param string $name The custom field name.

                      */

-                    echo apply_filters("gd_datepicker_extra_{$name}",'');?>});

+                    echo apply_filters("gd_datepicker_extra_{$name}", ''); ?>});

 

-                    jQuery("#<?php echo $name;?>").datepicker("option", "dateFormat", '<?php echo $extra_fields['date_format'];?>');

+                    jQuery("#<?php echo $name; ?>").datepicker("option", "dateFormat", '<?php echo $extra_fields['date_format']; ?>');

 

-                    <?php if(!empty($value)){?>

-                    jQuery("#<?php echo $name;?>").datepicker("setDate", "<?php echo $value;?>");

+                    <?php if (!empty($value)) {?>

+                    jQuery("#<?php echo $name; ?>").datepicker("setDate", "<?php echo $value; ?>");

                     <?php } ?>

 

                 });

 

             </script>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

 

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

 

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr($value); ?>" type="text" class="geodir_textfield"/>

 

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1860,25 +1860,25 @@ 
             <script type="text/javascript">

                 jQuery(document).ready(function () {

 

-                    jQuery('#<?php echo $name;?>').timepicker({

+                    jQuery('#<?php echo $name; ?>').timepicker({

                         showPeriod: true,

                         showLeadingZero: true,

                         showPeriod: true,

                     });

                 });

             </script>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

 

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input readonly="readonly" field_type="<?php echo $type;?>" name="<?php echo $name;?>"

-                       id="<?php echo $name;?>" value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>

+                <input readonly="readonly" field_type="<?php echo $type; ?>" name="<?php echo $name; ?>"

+                       id="<?php echo $name; ?>" value="<?php echo esc_attr($value); ?>" type="text" class="geodir_textfield"/>

 

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1888,15 +1888,15 @@ 
             if ($value == $val['default']) {

                 $value = '';

             } ?>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

 

-                <div id="<?php echo $name;?>" class="geodir_taxonomy_field" style="float:left; width:70%;">

+                <div id="<?php echo $name; ?>" class="geodir_taxonomy_field" style="float:left; width:70%;">

                     <?php

                     global $wpdb, $post, $cat_display, $post_cat, $package_id, $exclude_cats;

 

@@ -1908,7 +1908,7 @@ 
 

                         $package_info = array();

 

-                        $package_info = (array)geodir_post_package_info($package_info, $post, $post_type);

+                        $package_info = (array) geodir_post_package_info($package_info, $post, $post_type);

 

                         if (!empty($package_info)) {

 

@@ -1991,7 +1991,7 @@ 
                     ?>

                 </div>

 

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -2033,7 +2033,7 @@ 
                     $file_totImg = count($curImages);

             }

 			

-			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';

+			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? implode(",", $extra_fields['gd_file_types']) : '';

 			$display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';

 

             ?>

@@ -2044,13 +2044,13 @@ 
 			</h5>   <?php */

             ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

 

                 <div id="<?php echo $file_id; ?>dropbox" style="text-align:center;">

                     <label

                         style="text-align:left; padding-top:10px;"><?php $site_title = __($site_title, 'geodirectory');

-                        echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>

+                        echo $site_title; ?><?php if ($is_required) echo '<span>*</span>'; ?></label>

                     <input class="geodir-custom-file-upload" field_type="file" type="hidden"

                            name="<?php echo $file_id; ?>" id="<?php echo $file_id; ?>"

                            value="<?php echo esc_attr($file_value); ?>"/>

@@ -2058,7 +2058,7 @@ 
                            id="<?php echo $file_id; ?>image_limit" value="<?php echo $file_image_limit; ?>"/>

 					<?php if ($allowed_file_types != '') { ?>

 					<input type="hidden" name="<?php echo $file_id; ?>_allowed_types"

-                           id="<?php echo $file_id; ?>_allowed_types" value="<?php echo esc_attr($allowed_file_types); ?>" data-exts="<?php echo esc_attr($display_file_types);?>"/>

+                           id="<?php echo $file_id; ?>_allowed_types" value="<?php echo esc_attr($allowed_file_types); ?>" data-exts="<?php echo esc_attr($display_file_types); ?>"/>

 					<?php } ?>

                     <input type="hidden" name="<?php echo $file_id; ?>totImg" id="<?php echo $file_id; ?>totImg"

                            value="<?php if (isset($file_totImg)) {

@@ -2074,7 +2074,7 @@ 
                             <?php /*?><h4><?php _e('Drop files to upload');?></h4><br/><?php */

                             ?>

                             <input id="<?php echo $file_id; ?>plupload-browse-button" type="button"

-                                   value="<?php ($file_image_limit > 1 ? esc_attr_e('Select Files', 'geodirectory') : esc_attr_e('Select File', 'geodirectory') ); ?>"

+                                   value="<?php ($file_image_limit > 1 ? esc_attr_e('Select Files', 'geodirectory') : esc_attr_e('Select File', 'geodirectory')); ?>"

                                    class="geodir_button" style="margin-top:10px;"/>

                             <span class="ajaxnonceplu"

                                   id="ajaxnonceplu<?php echo wp_create_nonce($file_id . 'pluploadan'); ?>"></span>

@@ -2097,7 +2097,7 @@ 
 

                     </div>

                 </div>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?> <?php echo ( $display_file_types != '' ? __('Allowed file types:', 'geodirectory') . ' ' . $display_file_types : '' );?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?> <?php echo ($display_file_types != '' ? __('Allowed file types:', 'geodirectory') . ' ' . $display_file_types : ''); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -2202,7 +2202,7 @@ 
 

                 $variables_array = array();

 

-                if ($fields_location == 'detail' && isset($type['show_as_tab']) && (int)$type['show_as_tab'] == 1 && in_array($type['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

+                if ($fields_location == 'detail' && isset($type['show_as_tab']) && (int) $type['show_as_tab'] == 1 && in_array($type['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

                     continue;

                 }

 

@@ -2228,12 +2228,12 @@ 
 

                     case 'fieldset':

 

-                        $fieldset_class = 'fieldset-'.sanitize_title_with_dashes($type['site_title']);

+                        $fieldset_class = 'fieldset-' . sanitize_title_with_dashes($type['site_title']);

 

                         if ($field_set_start == 1) {

-                            echo '</div><div class="geodir-company_info field-group ' . $type['htmlvar_name'] . '"><h2 class="'.$fieldset_class.'">' . __($type['site_title'], 'geodirectory') . '</h2>';

+                            echo '</div><div class="geodir-company_info field-group ' . $type['htmlvar_name'] . '"><h2 class="' . $fieldset_class . '">' . __($type['site_title'], 'geodirectory') . '</h2>';

                         } else {

-                            echo '<h2 class="'.$fieldset_class.'">' . __($type['site_title'], 'geodirectory') . '</h2>';

+                            echo '<h2 class="' . $fieldset_class . '">' . __($type['site_title'], 'geodirectory') . '</h2>';

                             $field_set_start = 1;

                         }

 

@@ -2405,7 +2405,7 @@ 
 

 							$website = !empty($a_url['url']) ? $a_url['url'] : '';

 							$title = !empty($a_url['label']) ? $a_url['label'] : $type['site_title'];

-                            if(!empty($type['default_value'])){$title = $type['default_value'];}

+                            if (!empty($type['default_value'])) {$title = $type['default_value']; }

 							$title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';

 

 

@@ -2518,17 +2518,17 @@ 
                                 $date_format = $date_format['date_format'];

                             }

 

-                            $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format

-                            $replace = array('d','j','l','m','n','F','Y');//PHP date format

+                            $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format

+                            $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format

 

                             $date_format = str_replace($search, $replace, $date_format);

 

                             $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $post->{$type['htmlvar_name']}) : $post->{$type['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format

 

                             $value = '';

-                            if ($post->{$type['htmlvar_name']} != '' && $post->{$type['htmlvar_name']}!="0000-00-00") {

+                            if ($post->{$type['htmlvar_name']} != '' && $post->{$type['htmlvar_name']} != "0000-00-00") {

                                 $value = date($date_format, strtotime($post_htmlvar_value));

-                            }else{

+                            } else {

                                 continue;

                             }

 

@@ -2671,7 +2671,7 @@ 
 

                         $html_var = $type['htmlvar_name'];

 

-                        if ((int)$post->$html_var == 1):

+                        if ((int) $post->$html_var == 1):

 

                             if ($post->{$type['htmlvar_name']} == '1'):

                                 $html_val = __('Yes', 'geodirectory');

@@ -2899,8 +2899,8 @@ 
                                 $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;

                                 $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

                                 $html .= '</span><span class="geodir-email-address-output">';

-                                $email = stripslashes($post->{$type['htmlvar_name']}) ;

-                                if($e_split = explode('@',$email)){

+                                $email = stripslashes($post->{$type['htmlvar_name']});

+                                if ($e_split = explode('@', $email)) {

                                     /**

                                      * Filter email custom field name output.

                                      *

@@ -2909,10 +2909,10 @@ 
                                      * @param string $email The email string being output.

                                      * @param array $type Custom field variables array.

                                      */

-                                    $email_name = apply_filters('geodir_email_field_name_output',$email,$type);

-                                    $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";

-                                }else{

-                                    $html .=  $email;

+                                    $email_name = apply_filters('geodir_email_field_name_output', $email, $type);

+                                    $html .= "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";

+                                } else {

+                                    $html .= $email;

                                 }

                                 $html .= '</span></div>';

                             }

@@ -2932,7 +2932,7 @@ 
                             if (!empty($files)):

 

                                $extra_fields = !empty($type['extra_fields']) ? maybe_unserialize($type['extra_fields']) : NULL;

-							   $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+							   $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';

 								

 								$file_paths = '';

                                 foreach ($files as $file) {

@@ -2963,7 +2963,7 @@ 
                                         // If the uploaded file is image

                                         if (in_array($uploaded_file_type, $image_file_types)) {

                                             $file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';

-                                            $file_paths .= '<a href="'.$file.'">';

+                                            $file_paths .= '<a href="' . $file . '">';

 											$file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);

 											$file_paths .= '</a>';

                                             //$file_paths .= '<img src="'.$file.'"  />';	

@@ -3100,7 +3100,7 @@ 
                                     $terms = $termsOrdered;

                                 }

                             }

-                            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';

+                            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object) $terms) : '';

 

                             if ($html_value != '') {

                                 if (strpos($field_icon, 'http') !== false) {

@@ -3262,7 +3262,7 @@ 
             $geodir_uploadurl = $uploads['url'];

             $sub_dir = $uploads['subdir'];

 			

-			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';

 

             for ($m = 0; $m < count($post_image); $m++) {

 

@@ -3333,8 +3333,8 @@ 
         if (!empty($postcurr_images)) {

 

             if ($file_urls != $postcurr_images) {

-                $invalid_files[] = (object)array('src' => $postcurr_images);

-                $invalid_files = (object)$invalid_files;

+                $invalid_files[] = (object) array('src' => $postcurr_images);

+                $invalid_files = (object) $invalid_files;

             }

         }

 

@@ -3416,7 +3416,7 @@ 
         // remove handle custom file uploaddir

         remove_filter('upload_dir', 'geodir_upload_dir');

 

-        if(!isset($status['url']) && isset($status['error'])){

+        if (!isset($status['url']) && isset($status['error'])) {

             print_r($status);

         }

 

@@ -3492,10 +3492,10 @@ 
 	 */

 	function geodir_max_upload_size()

     {

-        $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);

+        $max_filesize = (float) get_option('geodir_upload_max_filesize', 2);

 

         if ($max_filesize > 0 && $max_filesize < 1) {

-            $max_filesize = (int)($max_filesize * 1024) . 'kb';

+            $max_filesize = (int) ($max_filesize * 1024) . 'kb';

         } else {

             $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';

         }

@@ -3803,7 +3803,7 @@ 
         }

 

 

-        return (int)$lastid;

+        return (int) $lastid;

 

     }

 }

@@ -3894,38 +3894,38 @@ 
         $nonce = wp_create_nonce('custom_fields_' . $result_str);

         

         ?>

-        <li class="text" id="licontainer_<?php echo $result_str;?>">

-            <div class="title title<?php echo $result_str;?> gt-fieldset"

-                 title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory');?>"

-                 ondblclick="show_hide('field_frm<?php echo $result_str;?>')">

+        <li class="text" id="licontainer_<?php echo $result_str; ?>">

+            <div class="title title<?php echo $result_str; ?> gt-fieldset"

+                 title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory'); ?>"

+                 ondblclick="show_hide('field_frm<?php echo $result_str; ?>')">

                 <?php

 

                 $nonce = wp_create_nonce('custom_fields_' . $result_str);

                 ?>

 

-                <div title="<?php _e('Click to remove field', 'geodirectory');?>"

-                     onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"

+                <div title="<?php _e('Click to remove field', 'geodirectory'); ?>"

+                     onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"

                      class="handlediv close"></div>

 

                 <b style="cursor:pointer;"

-                   onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory') . ' (' . $site_title . ')');?></b>

+                   onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory') . ' (' . $site_title . ')'); ?></b>

 

             </div>

 

-            <div id="field_frm<?php echo $result_str;?>" class="field_frm"

+            <div id="field_frm<?php echo $result_str; ?>" class="field_frm"

                  style="display:<?php if ($field_ins_upd == 'submit') {

                      echo 'block;';

                  } else {

                      echo 'none;';

                  } ?>">

                 <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/>

-                <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/>

-                <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/>

-                <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str;?>"/>

+                <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type; ?>"/>

+                <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type; ?>"/>

+                <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str; ?>"/>

                 <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {

                     echo $field_info->data_type;

                 }?>"/>

-                <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name;?>"/>

+                <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name; ?>"/>

 

 

                 <table class="widefat post fixed" border="0" style="width:100%;">

@@ -4007,42 +4007,42 @@ 
                     <?php } ?>

 

                     <tr>

-                        <td><strong><?php _e('Is active :', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Is active :', 'geodirectory'); ?></strong></td>

                         <td align="left">

                             <select name="is_active" id="is_active">

                                 <option

                                     value="1" <?php if (isset($field_info->is_active) && $field_info->is_active == '1') {

                                     echo 'selected="selected"';

-                                }?>><?php _e('Yes', 'geodirectory');?></option>

+                                }?>><?php _e('Yes', 'geodirectory'); ?></option>

                                 <option

                                     value="0" <?php if (isset($field_info->is_active) && $field_info->is_active == '0') {

                                     echo 'selected="selected"';

-                                }?>><?php _e('No', 'geodirectory');?></option>

+                                }?>><?php _e('No', 'geodirectory'); ?></option>

                             </select>

                             <br/>

-                            <span><?php _e('Select yes or no. If no is selected then the field will not be displayed anywhere.', 'geodirectory');?></span>

+                            <span><?php _e('Select yes or no. If no is selected then the field will not be displayed anywhere.', 'geodirectory'); ?></span>

                         </td>

                     </tr>

 

                     <tr>

-                        <td><strong><?php _e('Display order :', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Display order :', 'geodirectory'); ?></strong></td>

                         <td align="left"><input type="text" readonly="readonly" name="sort_order" id="sort_order"

                                                 value="<?php if (isset($field_info->sort_order)) {

                                                     echo esc_attr($field_info->sort_order);

                                                 }?>" size="50"/>

                             <br/>

-                            <span><?php _e('Enter the display order of this field in backend. e.g. 5', 'geodirectory');?></span>

+                            <span><?php _e('Enter the display order of this field in backend. e.g. 5', 'geodirectory'); ?></span>

                         </td>

                     </tr>

 

                     <tr>

                         <td>&nbsp;</td>

                         <td align="left">

-                            <input type="button" class="button" name="save" id="save" value="<?php esc_attr_e('Save', 'geodirectory');?>"

-                                   onclick="save_sort_field('<?php echo $result_str;?>')"/>

+                            <input type="button" class="button" name="save" id="save" value="<?php esc_attr_e('Save', 'geodirectory'); ?>"

+                                   onclick="save_sort_field('<?php echo $result_str; ?>')"/>

 

-                            <a href="javascript:void(0)"><input type="button" name="delete" value="<?php esc_attr_e('Delete', 'geodirectory');?>"

-                                                                onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"

+                            <a href="javascript:void(0)"><input type="button" name="delete" value="<?php esc_attr_e('Delete', 'geodirectory'); ?>"

+                                                                onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"

                                                                 class="button_n"/></a>

 

                         </td>

@@ -4077,7 +4077,7 @@ 
         if (!$package_id || !$field_name || !$post_type) {

             return true;

         }

-        $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));

+        $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int) $package_id));

 

         if ($wpdb->get_var($sql)) {

             return true;

Braces +369 added lines, -184 removed lines

@@ -51,8 +51,9 @@ 
         global $wpdb;

         $result = 0;// no rows affected

         if (!geodir_column_exist($db, $column)) {

-            if (!empty($db) && !empty($column))

-                $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");

+            if (!empty($db) && !empty($column)) {
+                            $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");
+            }
         }

         return $result;

     }

@@ -82,10 +83,11 @@ 
 

     $default_query = '';

 

-    if ($default == 'default')

-        $default_query = " and is_default IN ('1') ";

-    elseif ($default == 'custom')

-        $default_query = " and is_default = '0' ";

+    if ($default == 'default') {
+            $default_query = " and is_default IN ('1') ";
+    } elseif ($default == 'custom') {
+            $default_query = " and is_default = '0' ";
+    }
 

     if ($fields_location == 'detail') {

         $default_query = " and show_on_detail='1' ";

@@ -240,10 +242,12 @@ 
                 }

 

                 return $field_id;

-            } else

-                return 0;

-        } else

-            return 0;

+            } else {
+                            return 0;
+            }
+        } else {
+                    return 0;
+        }
     }

 }

 

@@ -351,7 +355,9 @@ 
 		}*/

 

 

-            if ($post_type == '') $post_type = 'gd_place';

+            if ($post_type == '') {
+                $post_type = 'gd_place';
+            }
 

 

             $detail_table = $plugin_prefix . $post_type . '_detail';

@@ -384,20 +390,23 @@ 
             }

 

             $option_values = '';

-            if (isset($request_field['option_values']))

-                $option_values = $request_field['option_values'];

+            if (isset($request_field['option_values'])) {
+                            $option_values = $request_field['option_values'];
+            }
 

             $cat_sort = '';

-            if (isset($request_field['cat_sort']) && !empty($request_field['cat_sort']))

-                $cat_sort = implode(",", $request_field['cat_sort']);

+            if (isset($request_field['cat_sort']) && !empty($request_field['cat_sort'])) {
+                            $cat_sort = implode(",", $request_field['cat_sort']);
+            }
 

             $cat_filter = '';

-            if (isset($request_field['cat_filter']) && !empty($request_field['cat_filter']))

-                $cat_filter = implode(",", $request_field['cat_filter']);

+            if (isset($request_field['cat_filter']) && !empty($request_field['cat_filter'])) {
+                            $cat_filter = implode(",", $request_field['cat_filter']);
+            }
 

-            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg']))

-                $price_pkg = implode(",", $request_field['show_on_pkg']);

-            else {

+            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg'])) {
+                            $price_pkg = implode(",", $request_field['show_on_pkg']);
+            } else {

                 $package_info = array();

 

                 $package_info = geodir_post_package_info($package_info, '', $post_type);

@@ -405,22 +414,29 @@ 
             }

 

 

-            if (isset($request_field['extra']) && !empty($request_field['extra']))

-                $extra_fields = $request_field['extra'];

+            if (isset($request_field['extra']) && !empty($request_field['extra'])) {
+                            $extra_fields = $request_field['extra'];
+            }
 

-            if (isset($request_field['is_default']) && $request_field['is_default'] != '')

-                $is_default = $request_field['is_default'];

-            else

-                $is_default = '0';

+            if (isset($request_field['is_default']) && $request_field['is_default'] != '') {
+                            $is_default = $request_field['is_default'];
+            } else {
+                            $is_default = '0';
+            }
 

-            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '')

-                $is_admin = $request_field['is_admin'];

-            else

-                $is_admin = '0';

+            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '') {
+                            $is_admin = $request_field['is_admin'];
+            } else {
+                            $is_admin = '0';
+            }
 

 

-            if ($is_active == '') $is_active = 1;

-            if ($is_required == '') $is_required = 0;

+            if ($is_active == '') {
+                $is_active = 1;
+            }
+            if ($is_required == '') {
+                $is_required = 0;
+            }
 

 

             if ($sort_order == '') {

@@ -688,7 +704,7 @@ 
                             }

                             if($op_max){$op_size =$op_max; }

                         }

-                    }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

+                    } elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

                         if(strlen($option_values)){

                             $op_size =  strlen($option_values);

                         }

@@ -705,11 +721,13 @@ 
                         return __('Column change failed, you may have too many columns.','geodirectory');

                     }

 

-                        if (isset($request_field['cat_display_type']))

-                            $extra_fields = $request_field['cat_display_type'];

+                        if (isset($request_field['cat_display_type'])) {
+                                                    $extra_fields = $request_field['cat_display_type'];
+                        }
 

-                        if (isset($request_field['multi_display_type']))

-                            $extra_fields = $request_field['multi_display_type'];

+                        if (isset($request_field['multi_display_type'])) {
+                                                    $extra_fields = $request_field['multi_display_type'];
+                        }
 

 

                         break;

@@ -721,8 +739,9 @@ 
                     if($alter_result===false){

                         return __('Column change failed, you may have too many columns.','geodirectory');

                     }

-                        if (isset($request_field['advanced_editor']))

-                            $extra_fields = $request_field['advanced_editor'];

+                        if (isset($request_field['advanced_editor'])) {
+                                                    $extra_fields = $request_field['advanced_editor'];
+                        }
 

                         break;

 

@@ -816,8 +835,9 @@ 
                 );

 

 

-                if ($cat_sort == '')

-                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

+                if ($cat_sort == '') {
+                                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
+                }
 

 

                 /**

@@ -1184,8 +1204,10 @@ 
         }

 

         return $post_meta_info;

-    else:

-        return false;

+    else {
+        :

+        return false;
+    }
     endif;

 }

 

@@ -1238,8 +1260,9 @@ 
         if (is_admin()) {

             global $post;

 

-            if (isset($_REQUEST['post']))

-                $_REQUEST['pid'] = $_REQUEST['post'];

+            if (isset($_REQUEST['post'])) {
+                            $_REQUEST['pid'] = $_REQUEST['post'];
+            }
         }

 

         if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {

@@ -1271,7 +1294,10 @@ 
             $fieldset_field_class = 'gd-fieldset-' . $fieldset_id;

             ?>

             <h5 id="geodir_fieldset_<?php echo $fieldset_id;?>" class="geodir-fieldset-row" gd-fieldset="<?php echo $fieldset_id;?>"><?php echo $site_title;?>

-            <?php if ($admin_desc != '') echo '<small>( ' . $admin_desc . ' )</small>';?></h5>

+            <?php if ($admin_desc != '') {
+    echo '<small>( ' . $admin_desc . ' )</small>';
+}
+?></h5>

             <?php

         } else if ($type == 'address') {

             $prefix = $name . '_';

@@ -1308,17 +1334,27 @@ 
             }

 

             $location = geodir_get_default_location();

-            if (empty($city)) $city = isset($location->city) ? $location->city : '';

-            if (empty($region)) $region = isset($location->region) ? $location->region : '';

-            if (empty($country)) $country = isset($location->country) ? $location->country : '';

+            if (empty($city)) {
+                $city = isset($location->city) ? $location->city : '';
+            }
+            if (empty($region)) {
+                $region = isset($location->region) ? $location->region : '';
+            }
+            if (empty($country)) {
+                $country = isset($location->country) ? $location->country : '';
+            }
 

             $lat_lng_blank = false;

             if (empty($lat) && empty($lng)) {

                 $lat_lng_blank = true;

             }

 

-            if (empty($lat)) $lat = isset($location->city_latitude) ? $location->city_latitude : '';

-            if (empty($lng)) $lng = isset($location->city_longitude) ? $location->city_longitude : '';

+            if (empty($lat)) {
+                $lat = isset($location->city_latitude) ? $location->city_latitude : '';
+            }
+            if (empty($lng)) {
+                $lng = isset($location->city_longitude) ? $location->city_longitude : '';
+            }
 

             /**

              * Filter the default latitude.

@@ -1342,10 +1378,16 @@ 
             ?>

 

             <div id="geodir_<?php echo $prefix . 'address';?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php _e($address_title, 'geodirectory'); ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

                 <input type="text" field_type="<?php echo $type;?>" name="<?php echo $prefix . 'address';?>"

                        id="<?php echo $prefix . 'address';?>" class="geodir_textfield"

@@ -1406,10 +1448,16 @@ 
                 /* show lat lng */

                 $style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>

                 <div id="geodir_<?php echo $prefix . 'latitude'; ?>_row"

-                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

+                     class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

                     <label>

                         <?php echo PLACE_ADDRESS_LAT; ?>

-                        <?php if ($is_required) echo '<span>*</span>'; ?>

+                        <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                     </label>

                     <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'latitude'; ?>"

                            id="<?php echo $prefix . 'latitude'; ?>" class="geodir_textfield"

@@ -1421,10 +1469,16 @@ 
                 </div>

 

                 <div id="geodir_<?php echo $prefix . 'longitude'; ?>_row"

-                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

+                     class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

                     <label>

                         <?php echo PLACE_ADDRESS_LNG; ?>

-                        <?php if ($is_required) echo '<span>*</span>'; ?>

+                        <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                     </label>

                     <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'longitude'; ?>"

                            id="<?php echo $prefix . 'longitude'; ?>" class="geodir_textfield"

@@ -1479,26 +1533,31 @@ 
         <?php } elseif ($type == 'text') {

 

             //number and float validation $validation_pattern

-            if(isset($val['data_type']) && $val['data_type']=='INT'){$type = 'number';}

-            elseif(isset($val['data_type']) && $val['data_type']=='FLOAT'){$type = 'float';}

+            if(isset($val['data_type']) && $val['data_type']=='INT'){$type = 'number';} elseif(isset($val['data_type']) && $val['data_type']=='FLOAT'){$type = 'float';}

             //print_r($val);

             //validation

             if(isset($val['validation_pattern']) && $val['validation_pattern']){

                 $validation = 'pattern="'.$val['validation_pattern'].'"';

-            }else{$validation='';}

+            } else{$validation='';}

 

             // validation message

             if(isset($val['validation_msg']) && $val['validation_msg']){

                 $validation_msg = 'title="'.$val['validation_msg'].'"';

-            }else{$validation_msg='';}

+            } else{$validation_msg='';}

             ?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

                 <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

                        value="<?php echo esc_attr(stripslashes($value));?>" type="<?php echo $type;?>" class="geodir_textfield" <?php echo $validation;echo $validation_msg;?> />

@@ -1514,11 +1573,17 @@ 
             }?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

                 <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

                        value="<?php echo esc_attr(stripslashes($value));?>" type="email" class="geodir_textfield"/>

@@ -1534,11 +1599,17 @@ 
             } ?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

                 <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

                        value="<?php echo esc_attr(stripslashes($value));?>" type="tel" class="geodir_textfield"/>

@@ -1554,11 +1625,17 @@ 
             }?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

                 <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

                        value="<?php echo esc_attr(stripslashes($value));?>" type="url" class="geodir_textfield"

@@ -1573,11 +1650,17 @@ 
 

         <?php } elseif ($type == 'radio') { ?>

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

 				<?php if ($option_values) {

                     $option_values = geodir_string_values_to_options($option_values, true);

@@ -1602,11 +1685,17 @@ 
         <?php } elseif ($type == 'checkbox') { ?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

                 <?php if ($value != '1') {

                     $value = '0';

@@ -1626,11 +1715,17 @@ 
             ?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label><?php

 

 

@@ -1658,11 +1753,17 @@ 
 

         <?php } elseif ($type == 'select') { ?>

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row geodir_custom_fields clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row geodir_custom_fields clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

                 <?php

                 $option_values_arr = geodir_string_values_to_options($option_values, true);

@@ -1701,11 +1802,17 @@ 
             }

             ?>

             <div id="<?php echo $name; ?>_row"

-                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>'; ?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

                 <input type="hidden" name="gd_field_<?php echo $name; ?>" value="1"/>

                 <?php if ($multi_display == 'select') { ?>

@@ -1775,11 +1882,17 @@ 
             ?>

 

             <div id="<?php echo $name; ?>_row"

-                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>'; ?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

 

                 <?php $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10); ?>

@@ -1796,8 +1909,9 @@ 
             </div>

         <?php } elseif ($type == 'datepicker') {

 

-            if ($extra_fields['date_format'] == '')

-                $extra_fields['date_format'] = 'yy-mm-dd';

+            if ($extra_fields['date_format'] == '') {
+                            $extra_fields['date_format'] = 'yy-mm-dd';
+            }
 

 

             $search = array('dd', 'mm', 'yy');

@@ -1835,12 +1949,18 @@ 
 

             </script>

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

 

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

 

                 <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

@@ -1854,8 +1974,9 @@ 
 

         <?php } elseif ($type == 'time') {

 

-            if ($value != '')

-                $value = date('H:i', strtotime($value));

+            if ($value != '') {
+                            $value = date('H:i', strtotime($value));
+            }
             ?>

             <script type="text/javascript">

                 jQuery(document).ready(function () {

@@ -1868,12 +1989,18 @@ 
                 });

             </script>

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

 

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

                 <input readonly="readonly" field_type="<?php echo $type;?>" name="<?php echo $name;?>"

                        id="<?php echo $name;?>" value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>

@@ -1889,11 +2016,17 @@ 
                 $value = '';

             } ?>

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

 

                 <div id="<?php echo $name;?>" class="geodir_taxonomy_field" style="float:left; width:70%;">

@@ -1927,8 +2060,9 @@ 
                         $post_cat = implode(",", $post_cat[$name]);

 

                     } else {

-                        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')

-                            $post_cat = geodir_get_post_meta($_REQUEST['pid'], $name, true);

+                        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+                                                    $post_cat = geodir_get_post_meta($_REQUEST['pid'], $name, true);
+                        }
                     }

 

 

@@ -1966,21 +2100,24 @@ 
 

                             $cat_display == '';

                             $multiple = '';

-                            if ($cat_display == 'multiselect')

-                                $multiple = 'multiple="multiple"';

+                            if ($cat_display == 'multiselect') {
+                                                            $multiple = 'multiple="multiple"';
+                            }
 

                             echo '<select id="' . $name . '" ' . $multiple . ' type="' . $name . '" name="post_category[' . $name . '][]" alt="' . $name . '" field_type="' . $cat_display . '" class="geodir_textfield textfield_x chosen_select" data-placeholder="' . __('Select Category', 'geodirectory') . '">';

 

 

-                            if ($cat_display == 'select')

-                                echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';

+                            if ($cat_display == 'select') {
+                                                            echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';
+                            }
 

                         }

 

                         echo geodir_custom_taxonomy_walker($name, $catadd_limit = 0);

 

-                        if ($cat_display == 'select' || $cat_display == 'multiselect')

-                            echo '</select>';

+                        if ($cat_display == 'select' || $cat_display == 'multiselect') {
+                                                    echo '</select>';
+                        }
 

                     } else {

 

@@ -2010,18 +2147,23 @@ 
 

                 $file_value = trim($value, ","); // this will be initial value of the above form field. Image urls.

 

-            } else

-                $file_value = '';

+            } else {
+                            $file_value = '';
+            }
 

-            if (isset($extra_fields['file_multiple']) && $extra_fields['file_multiple'])

-                $file_multiple = true; // allow multiple files upload

-            else

-                $file_multiple = false;

+            if (isset($extra_fields['file_multiple']) && $extra_fields['file_multiple']) {
+                            $file_multiple = true;
+            }
+            // allow multiple files upload

+            else {
+                            $file_multiple = false;
+            }
 

-            if (isset($extra_fields['image_limit']) && $extra_fields['image_limit'])

-                $file_image_limit = $extra_fields['image_limit'];

-            else

-                $file_image_limit = 1;

+            if (isset($extra_fields['image_limit']) && $extra_fields['image_limit']) {
+                            $file_image_limit = $extra_fields['image_limit'];
+            } else {
+                            $file_image_limit = 1;
+            }
 

             $file_width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

 

@@ -2029,8 +2171,9 @@ 
 

             if (!empty($file_value)) {

                 $curImages = explode(',', $file_value);

-                if (!empty($curImages))

-                    $file_totImg = count($curImages);

+                if (!empty($curImages)) {
+                                    $file_totImg = count($curImages);
+                }
             }

 			

 			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';

@@ -2045,12 +2188,18 @@ 
             ?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

 

                 <div id="<?php echo $file_id; ?>dropbox" style="text-align:center;">

                     <label

                         style="text-align:left; padding-top:10px;"><?php $site_title = __($site_title, 'geodirectory');

-                        echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>

+                        echo $site_title; ?><?php if ($is_required) {
+                            echo '<span>*</span>';
+                        }
+                        ?></label>

                     <input class="geodir-custom-file-upload" field_type="file" type="hidden"

                            name="<?php echo $file_id; ?>" id="<?php echo $file_id; ?>"

                            value="<?php echo esc_attr($file_value); ?>"/>

@@ -2191,9 +2340,10 @@ 
             $field_set_start = 0;

 

 

-            if ($fields_location == 'detail')

-

-                $i = 1;

+            if ($fields_location == 'detail') {
+            

+                $i = 1;
+            }
             foreach ($fields_info as $type) {

 				$type = stripslashes_deep($type); // strip slashes

                 $html = '';

@@ -2210,8 +2360,9 @@ 
                     $variables_array['post_id'] = $post->ID;

                     $variables_array['label'] = __($type['site_title'], 'geodirectory');

                     $variables_array['value'] = '';

-                    if (isset($post->{$type['htmlvar_name']}))

-                        $variables_array['value'] = $post->{$type['htmlvar_name']};

+                    if (isset($post->{$type['htmlvar_name']})) {
+                                            $variables_array['value'] = $post->{$type['htmlvar_name']};
+                    }
                 endif;

 

                 //if($type['field_icon'])

@@ -2338,8 +2489,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2413,8 +2565,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2456,8 +2609,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2477,9 +2631,10 @@ 
                         if ($post->{$type['htmlvar_name']}):

 

                             $value = '';

-                            if ($post->{$type['htmlvar_name']} != '')

-                                //$value = date('h:i',strtotime($post->{$type['htmlvar_name']}));

-                                $value = date(get_option('time_format'), strtotime($post->{$type['htmlvar_name']}));

+                            if ($post->{$type['htmlvar_name']} != '') {
+                                                            //$value = date('h:i',strtotime($post->{$type['htmlvar_name']}));

+                                $value = date(get_option('time_format'), strtotime($post->{$type['htmlvar_name']}));
+                            }
 

                             if (strpos($field_icon, 'http') !== false) {

                                 $field_icon_af = '';

@@ -2494,8 +2649,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2528,7 +2684,7 @@ 
                             $value = '';

                             if ($post->{$type['htmlvar_name']} != '' && $post->{$type['htmlvar_name']}!="0000-00-00") {

                                 $value = date($date_format, strtotime($post_htmlvar_value));

-                            }else{

+                            } else{

                                 continue;

                             }

 

@@ -2545,8 +2701,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2578,8 +2735,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2603,8 +2761,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2654,8 +2813,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2675,8 +2835,10 @@ 
 

                             if ($post->{$type['htmlvar_name']} == '1'):

                                 $html_val = __('Yes', 'geodirectory');

-                            else:

-                                $html_val = __('No', 'geodirectory');

+                            else {
+                                :

+                                $html_val = __('No', 'geodirectory');
+                            }
                             endif;

 

                             if (strpos($field_icon, 'http') !== false) {

@@ -2692,8 +2854,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2737,8 +2900,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2789,8 +2953,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2844,8 +3009,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2890,8 +3056,9 @@ 
                                 if ($fields_location == 'detail') {

 

                                     $geodir_odd_even = 'geodir_more_info_odd';

-                                    if ($i % 2 == 0)

-                                        $geodir_odd_even = 'geodir_more_info_even';

+                                    if ($i % 2 == 0) {
+                                                                            $geodir_odd_even = 'geodir_more_info_even';
+                                    }
 

                                     $i++;

                                 }

@@ -2911,7 +3078,7 @@ 
                                      */

                                     $email_name = apply_filters('geodir_email_field_name_output',$email,$type);

                                     $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";

-                                }else{

+                                } else{

                                     $html .=  $email;

                                 }

                                 $html .= '</span></div>';

@@ -2989,8 +3156,9 @@ 
                                 if ($fields_location == 'detail') {

 

                                     $geodir_odd_even = 'geodir_more_info_odd';

-                                    if ($i % 2 == 0)

-                                        $geodir_odd_even = 'geodir_more_info_even';

+                                    if ($i % 2 == 0) {
+                                                                            $geodir_odd_even = 'geodir_more_info_even';
+                                    }
 

                                     $i++;

                                 }

@@ -3024,8 +3192,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -3053,8 +3222,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -3149,7 +3319,9 @@ 
                      * @param string $html Custom field unfiltered HTML.

                      * @param array $variables_array Custom field variables array.

                      */

-                    if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);

+                    if ($html) {
+                        echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
+                    }
 

                     /**

                      * Called after a custom fields is output on the frontend.

@@ -3183,10 +3355,11 @@ 
 	 */

 	function geodir_default_date_format()

     {

-        if ($format = get_option('date_format'))

-            return $format;

-        else

-            return 'dd-mm-yy';

+        if ($format = get_option('date_format')) {
+                    return $format;
+        } else {
+                    return 'dd-mm-yy';
+        }
     }

 }

 

@@ -3293,11 +3466,13 @@ 
                     // Set an array containing a list of acceptable formats

                     //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

 

-					if (!function_exists('wp_handle_upload'))

-						require_once(ABSPATH . 'wp-admin/includes/file.php');

+					if (!function_exists('wp_handle_upload')) {
+											require_once(ABSPATH . 'wp-admin/includes/file.php');
+					}
 

-					if (!is_dir($geodir_uploadpath))

-						mkdir($geodir_uploadpath);

+					if (!is_dir($geodir_uploadpath)) {
+											mkdir($geodir_uploadpath);
+					}
 

 					$new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

 					$explode_sub_dir = explode("/", $sub_dir);

@@ -3310,16 +3485,19 @@ 
 					}

 

 					$uploaded_file = '';

-					if (file_exists($img_path))

-						$uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+					if (file_exists($img_path)) {
+											$uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
+					}
 

 					if ($curr_img_dir != $geodir_uploaddir) {

-						if (file_exists($img_path))

-							unlink($img_path);

+						if (file_exists($img_path)) {
+													unlink($img_path);
+						}
 					}

 

-					if (!empty($uploaded_file))

-						$file_urls = $geodir_uploadurl . '/' . $new_name;

+					if (!empty($uploaded_file)) {
+											$file_urls = $geodir_uploadurl . '/' . $new_name;
+					}
 

                 } else {

                     $file_urls = $post_image[$m];

@@ -3340,8 +3518,9 @@ 
 

         geodir_save_post_meta($post_id, $field_id, $file_urls);

 

-        if (!empty($invalid_files))

-            geodir_remove_attachments($invalid_files);

+        if (!empty($invalid_files)) {
+                    geodir_remove_attachments($invalid_files);
+        }
 

     }

 }

@@ -3567,8 +3746,9 @@ 
 

         $all_postypes = geodir_get_posttypes();

 

-        if (!in_array($post_type, $all_postypes))

-            return false;

+        if (!in_array($post_type, $all_postypes)) {
+                    return false;
+        }
 

         $fields = array();

 

@@ -3656,8 +3836,10 @@ 
         }

 

         return $field_ids;

-    else:

-        return false;

+    else {
+        :

+        return false;
+    }
     endif;

 }

 

@@ -3830,8 +4012,9 @@ 
 

             return $field_id;

 

-        } else

-            return 0;

+        } else {
+                    return 0;
+        }
 

     }

 }

@@ -3873,8 +4056,9 @@ 
         $htmlvar_name = isset($field_types[1]) ? $field_types[1] : '';

 

         $site_title = '';

-        if ($site_title == '')

-            $site_title = isset($field_info->site_title) ? $field_info->site_title : '';

+        if ($site_title == '') {
+                    $site_title = isset($field_info->site_title) ? $field_info->site_title : '';
+        }
 

         if ($site_title == '') {

             $fields = geodir_get_custom_sort_options($post_type);

@@ -3888,8 +4072,9 @@ 
             }

         }

 

-        if ($htmlvar_name == '')

-            $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';

+        if ($htmlvar_name == '') {
+                    $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';
+        }
 

         $nonce = wp_create_nonce('custom_fields_' . $result_str);