GeoDirectory / geodirectory

geodirectory-widgets/geodirectory_listing_slider_widget.php

Indentation +109 added lines, -109 removed lines

@@ -15,40 +15,40 @@ 
 class geodir_listing_slider_widget extends WP_Widget

 {

 

-    /**

+	/**

 	 * Register the listing slider widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

 	 */

-    public function __construct() {

-        $widget_ops = array('classname' => 'geodir_listing_slider_view', 'description' => __('GD > Listing Slider', 'geodirectory'));

-        parent::__construct(

-            'listing_slider_view', // Base ID

-            __('GD > Listing Slider', 'geodirectory'), // Name

-            $widget_ops// Args

-        );

-    }

+	public function __construct() {

+		$widget_ops = array('classname' => 'geodir_listing_slider_view', 'description' => __('GD > Listing Slider', 'geodirectory'));

+		parent::__construct(

+			'listing_slider_view', // Base ID

+			__('GD > Listing Slider', 'geodirectory'), // Name

+			$widget_ops// Args

+		);

+	}

 	

 	/**

 	 * Front-end display content for listing slider widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $args     Widget arguments.

 	 * @param array $instance Saved values from database.

 	 */

-    public function widget($args, $instance)

-    {

-        geodir_listing_slider_widget_output($args, $instance);

-    }

+	public function widget($args, $instance)

+	{

+		geodir_listing_slider_widget_output($args, $instance);

+	}

 

 	/**

 	 * Sanitize listing slider widget form values as they are saved.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $new_instance Values just sent to be saved.

 	 * @param array $old_instance Previously saved values from database.

@@ -56,101 +56,101 @@ 
 	 * @return array Updated safe values to be saved.

 	 */

 	public function update($new_instance, $old_instance)

-    {

-        //save the widget

-        $instance = $old_instance;

-        $instance['title'] = strip_tags($new_instance['title']);

-        $instance['post_type'] = strip_tags($new_instance['post_type']);

-        $instance['category'] = strip_tags($new_instance['category']);

-        $instance['post_number'] = strip_tags($new_instance['post_number']);

-        $instance['max_show'] = strip_tags($new_instance['max_show']);

-        $instance['slide_width'] = strip_tags($new_instance['slide_width']);

-        $instance['show_title'] = isset($new_instance['show_title']) ? $new_instance['show_title'] : '';

-        $instance['slideshow'] = isset($new_instance['slideshow']) ? $new_instance['slideshow'] : '';

-        $instance['animationLoop'] = isset($new_instance['animationLoop']) ? $new_instance['animationLoop'] : '';

-        $instance['directionNav'] = isset($new_instance['directionNav']) ? $new_instance['directionNav'] : '';

-        $instance['slideshowSpeed'] = $new_instance['slideshowSpeed'];

-        $instance['animationSpeed'] = $new_instance['animationSpeed'];

-        $instance['animation'] = $new_instance['animation'];

-        $instance['list_sort'] = isset($new_instance['list_sort']) ? $new_instance['list_sort'] : '';

-        $instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;

-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')

-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);

-        else

-            $instance['add_location_filter'] = '0';

-

-        return $instance;

-    }

+	{

+		//save the widget

+		$instance = $old_instance;

+		$instance['title'] = strip_tags($new_instance['title']);

+		$instance['post_type'] = strip_tags($new_instance['post_type']);

+		$instance['category'] = strip_tags($new_instance['category']);

+		$instance['post_number'] = strip_tags($new_instance['post_number']);

+		$instance['max_show'] = strip_tags($new_instance['max_show']);

+		$instance['slide_width'] = strip_tags($new_instance['slide_width']);

+		$instance['show_title'] = isset($new_instance['show_title']) ? $new_instance['show_title'] : '';

+		$instance['slideshow'] = isset($new_instance['slideshow']) ? $new_instance['slideshow'] : '';

+		$instance['animationLoop'] = isset($new_instance['animationLoop']) ? $new_instance['animationLoop'] : '';

+		$instance['directionNav'] = isset($new_instance['directionNav']) ? $new_instance['directionNav'] : '';

+		$instance['slideshowSpeed'] = $new_instance['slideshowSpeed'];

+		$instance['animationSpeed'] = $new_instance['animationSpeed'];

+		$instance['animation'] = $new_instance['animation'];

+		$instance['list_sort'] = isset($new_instance['list_sort']) ? $new_instance['list_sort'] : '';

+		$instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;

+		if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')

+			$instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);

+		else

+			$instance['add_location_filter'] = '0';

+

+		return $instance;

+	}

 

 	/**

 	 * Back-end listing slider widget settings form.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $instance Previously saved values from database.

 	 */

 	public function form($instance)

-    {

+	{

 

-        //widgetform in backend

-        $instance = wp_parse_args((array)$instance,

-            array('title' => '',

-                'post_type' => '',

-                'category' => '',

-                'post_number' => '5',

-                'max_show' => '1',

-                'slide_width' => '',

-                'show_title' => '',

-                'slideshow' => '',

-                'animationLoop' => '',

-                'directionNav' => '',

-                'slideshowSpeed' => 5000,

-                'animationSpeed' => 600,

-                'animation' => '',

-                'list_sort' => 'latest',

-                'show_featured_only' => '',

-                'add_location_filter' => '0',

-            )

-        );

+		//widgetform in backend

+		$instance = wp_parse_args((array)$instance,

+			array('title' => '',

+				'post_type' => '',

+				'category' => '',

+				'post_number' => '5',

+				'max_show' => '1',

+				'slide_width' => '',

+				'show_title' => '',

+				'slideshow' => '',

+				'animationLoop' => '',

+				'directionNav' => '',

+				'slideshowSpeed' => 5000,

+				'animationSpeed' => 600,

+				'animation' => '',

+				'list_sort' => 'latest',

+				'show_featured_only' => '',

+				'add_location_filter' => '0',

+			)

+		);

 

-        $title = strip_tags($instance['title']);

+		$title = strip_tags($instance['title']);

 

-        $post_type = strip_tags($instance['post_type']);

+		$post_type = strip_tags($instance['post_type']);

 

-        $category = strip_tags($instance['category']);

+		$category = strip_tags($instance['category']);

 

-        $post_number = strip_tags($instance['post_number']);

+		$post_number = strip_tags($instance['post_number']);

 

-        $max_show = strip_tags($instance['max_show']);

+		$max_show = strip_tags($instance['max_show']);

 

-        $slide_width = strip_tags($instance['slide_width']);

+		$slide_width = strip_tags($instance['slide_width']);

 

-        $show_title = $instance['show_title'];

+		$show_title = $instance['show_title'];

 

-        $slideshow = $instance['slideshow'];

+		$slideshow = $instance['slideshow'];

 

-        $animationLoop = $instance['animationLoop'];

+		$animationLoop = $instance['animationLoop'];

 

-        $directionNav = $instance['directionNav'];

+		$directionNav = $instance['directionNav'];

 

-        $slideshowSpeed = $instance['slideshowSpeed'];

+		$slideshowSpeed = $instance['slideshowSpeed'];

 

-        $animationSpeed = $instance['animationSpeed'];

+		$animationSpeed = $instance['animationSpeed'];

 

-        $add_location_filter = strip_tags($instance['add_location_filter']);

+		$add_location_filter = strip_tags($instance['add_location_filter']);

 

-        $animation = $instance['animation'];

-        $list_sort = $instance['list_sort'];

-        $show_featured_only = isset($instance['show_featured_only']) && $instance['show_featured_only'] ? true : false;

+		$animation = $instance['animation'];

+		$list_sort = $instance['list_sort'];

+		$show_featured_only = isset($instance['show_featured_only']) && $instance['show_featured_only'] ? true : false;

 

-        $sort_fields = array();

-        $sort_fields[] = array('field' => 'latest', 'label' => __('Latest', 'geodirectory'));

-        $sort_fields[] = array('field' => 'featured', 'label' => __('Featured', 'geodirectory'));

-        $sort_fields[] = array('field' => 'high_review', 'label' => __('Review', 'geodirectory'));

-        $sort_fields[] = array('field' => 'high_rating', 'label' => __('Rating', 'geodirectory'));

-        $sort_fields[] = array('field' => 'random', 'label' => __('Random', 'geodirectory'));

-        ?>

+		$sort_fields = array();

+		$sort_fields[] = array('field' => 'latest', 'label' => __('Latest', 'geodirectory'));

+		$sort_fields[] = array('field' => 'featured', 'label' => __('Featured', 'geodirectory'));

+		$sort_fields[] = array('field' => 'high_review', 'label' => __('Review', 'geodirectory'));

+		$sort_fields[] = array('field' => 'high_rating', 'label' => __('Rating', 'geodirectory'));

+		$sort_fields[] = array('field' => 'random', 'label' => __('Random', 'geodirectory'));

+		?>

 

         <p>

             <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>

@@ -174,9 +174,9 @@ 
                     <?php foreach ($postypes as $postypes_obj) { ?>

 

                         <option <?php if ($post_type == $postypes_obj) {

-                            echo 'selected="selected"';

-                        } ?> value="<?php echo $postypes_obj; ?>"><?php $extvalue = explode('_', $postypes_obj);

-                            echo ucfirst($extvalue[1]); ?></option>

+							echo 'selected="selected"';

+						} ?> value="<?php echo $postypes_obj; ?>"><?php $extvalue = explode('_', $postypes_obj);

+							echo ucfirst($extvalue[1]); ?></option>

 

                     <?php } ?>

 

@@ -190,20 +190,20 @@ 
                 for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory');?>

 

                 <?php

-                $category_taxonomy = geodir_get_taxonomies('gd_place');

-                $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC'));

-                ?>

+				$category_taxonomy = geodir_get_taxonomies('gd_place');

+				$categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC'));

+				?>

 

                 <select class="widefat" id="<?php echo $this->get_field_id('category'); ?>"

                         name="<?php echo $this->get_field_name('category'); ?>">

                     <option <?php if ($category == '0') {

-                        echo 'selected="selected"';

-                    } ?> value="0"><?php _e('All', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="0"><?php _e('All', 'geodirectory'); ?></option>

                     <?php foreach ($categories as $category_obj) { ?>

 

                         <option <?php if ($category == $category_obj->term_id) {

-                            echo 'selected="selected"';

-                        } ?>

+							echo 'selected="selected"';

+						} ?>

                             value="<?php echo $category_obj->term_id; ?>"><?php echo ucfirst($category_obj->name); ?></option>

 

                     <?php } ?>

@@ -256,12 +256,12 @@ 
                 <select class="widefat" id="<?php echo $this->get_field_id('animation'); ?>"

                         name="<?php echo $this->get_field_name('animation'); ?>">

                     <option <?php if ($animation == 'slide') {

-                        echo 'selected="selected"';

-                    } ?> value="slide">Slide

+						echo 'selected="selected"';

+					} ?> value="slide">Slide

                     </option>

                     <option <?php if ($animation == 'fade') {

-                        echo 'selected="selected"';

-                    } ?> value="fade">Fade

+						echo 'selected="selected"';

+					} ?> value="fade">Fade

                     </option>

                 </select>

             </label>

@@ -292,8 +292,8 @@ 
                 for="<?php echo $this->get_field_id('slideshow'); ?>"><?php _e('SlideShow:', 'geodirectory');?>

 

                 <input type="checkbox" <?php if ($slideshow) {

-                    echo 'checked="checked"';

-                } ?> id="<?php echo $this->get_field_id('slideshow'); ?>" value="1"

+					echo 'checked="checked"';

+				} ?> id="<?php echo $this->get_field_id('slideshow'); ?>" value="1"

                        name="<?php echo $this->get_field_name('slideshow'); ?>"/>

 

             </label>

@@ -304,8 +304,8 @@ 
                 for="<?php echo $this->get_field_id('animationLoop'); ?>"><?php _e('AnimationLoop:', 'geodirectory');?>

 

                 <input type="checkbox" <?php if ($animationLoop) {

-                    echo 'checked="checked"';

-                } ?> id="<?php echo $this->get_field_id('animationLoop'); ?>" value="1"

+					echo 'checked="checked"';

+				} ?> id="<?php echo $this->get_field_id('animationLoop'); ?>" value="1"

                        name="<?php echo $this->get_field_name('animationLoop'); ?>"/>

 

             </label>

@@ -316,8 +316,8 @@ 
                 for="<?php echo $this->get_field_id('directionNav'); ?>"><?php _e('DirectionNav:', 'geodirectory');?>

 

                 <input type="checkbox" <?php if ($directionNav) {

-                    echo 'checked="checked"';

-                } ?> id="<?php echo $this->get_field_id('directionNav'); ?>" value="1"

+					echo 'checked="checked"';

+				} ?> id="<?php echo $this->get_field_id('directionNav'); ?>" value="1"

                        name="<?php echo $this->get_field_name('directionNav'); ?>"/>

 

             </label>

@@ -329,8 +329,8 @@ 
                 for="<?php echo $this->get_field_id('show_title'); ?>"><?php _e('Show Title:', 'geodirectory');?>

 

                 <input type="checkbox" <?php if ($show_title) {

-                    echo 'checked="checked"';

-                } ?> id="<?php echo $this->get_field_id('show_title'); ?>" value="1"

+					echo 'checked="checked"';

+				} ?> id="<?php echo $this->get_field_id('show_title'); ?>" value="1"

                        name="<?php echo $this->get_field_name('show_title'); ?>"/>

 

             </label>

@@ -378,7 +378,7 @@ 
 

 

     <?php

-    }

+	}

 } // class geodir_listing_slider_widget

 

 register_widget('geodir_listing_slider_widget');
\ No newline at end of file

Spacing +18 added lines, -18 removed lines

@@ -94,7 +94,7 @@ 
     {

 

         //widgetform in backend

-        $instance = wp_parse_args((array)$instance,

+        $instance = wp_parse_args((array) $instance,

             array('title' => '',

                 'post_type' => '',

                 'category' => '',

@@ -153,7 +153,7 @@ 
         ?>

 

         <p>

-            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>

+            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory'); ?>

 

                 <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"

                        name="<?php echo $this->get_field_name('title'); ?>" type="text"

@@ -163,7 +163,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory'); ?>

 

                 <?php $postypes = geodir_get_posttypes(); ?>

 

@@ -187,7 +187,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory'); ?>

 

                 <?php

                 $category_taxonomy = geodir_get_taxonomies('gd_place');

@@ -224,7 +224,7 @@ 
         </p>

         <p>

             <label

-                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts(total):', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts(total):', 'geodirectory'); ?>

                 <input class="widefat" id="<?php echo $this->get_field_id('post_number'); ?>"

                        name="<?php echo $this->get_field_name('post_number'); ?>" type="text"

                        value="<?php echo esc_attr($post_number); ?>"/>

@@ -233,7 +233,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('max_show'); ?>"><?php _e('Number of posts(shown at one time, requires a slide width to be set):', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('max_show'); ?>"><?php _e('Number of posts(shown at one time, requires a slide width to be set):', 'geodirectory'); ?>

                 <input class="widefat" id="<?php echo $this->get_field_id('max_show'); ?>"

                        name="<?php echo $this->get_field_name('max_show'); ?>" type="text"

                        value="<?php echo esc_attr($max_show); ?>"/>

@@ -242,7 +242,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('slide_width'); ?>"><?php _e('Slide width(leave blank unless showing more than one slide at a time, ex: 210):', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('slide_width'); ?>"><?php _e('Slide width(leave blank unless showing more than one slide at a time, ex: 210):', 'geodirectory'); ?>

                 <input class="widefat" id="<?php echo $this->get_field_id('slide_width'); ?>"

                        name="<?php echo $this->get_field_name('slide_width'); ?>" type="text"

                        value="<?php echo esc_attr($slide_width); ?>"/>

@@ -251,7 +251,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('animation'); ?>"><?php _e('Animation:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('animation'); ?>"><?php _e('Animation:', 'geodirectory'); ?>

 

                 <select class="widefat" id="<?php echo $this->get_field_id('animation'); ?>"

                         name="<?php echo $this->get_field_name('animation'); ?>">

@@ -269,7 +269,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('slideshowSpeed'); ?>"><?php _e('Slide Show Speed: (milliseconds)', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('slideshowSpeed'); ?>"><?php _e('Slide Show Speed: (milliseconds)', 'geodirectory'); ?>

 

                 <input class="widefat" id="<?php echo $this->get_field_id('slideshowSpeed'); ?>"

                        name="<?php echo $this->get_field_name('slideshowSpeed'); ?>" type="text"

@@ -279,7 +279,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('animationSpeed'); ?>"><?php _e('Animation Speed: (milliseconds)', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('animationSpeed'); ?>"><?php _e('Animation Speed: (milliseconds)', 'geodirectory'); ?>

 

                 <input class="widefat" id="<?php echo $this->get_field_id('animationSpeed'); ?>"

                        name="<?php echo $this->get_field_name('animationSpeed'); ?>" type="text"

@@ -289,7 +289,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('slideshow'); ?>"><?php _e('SlideShow:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('slideshow'); ?>"><?php _e('SlideShow:', 'geodirectory'); ?>

 

                 <input type="checkbox" <?php if ($slideshow) {

                     echo 'checked="checked"';

@@ -301,7 +301,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('animationLoop'); ?>"><?php _e('AnimationLoop:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('animationLoop'); ?>"><?php _e('AnimationLoop:', 'geodirectory'); ?>

 

                 <input type="checkbox" <?php if ($animationLoop) {

                     echo 'checked="checked"';

@@ -313,7 +313,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('directionNav'); ?>"><?php _e('DirectionNav:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('directionNav'); ?>"><?php _e('DirectionNav:', 'geodirectory'); ?>

 

                 <input type="checkbox" <?php if ($directionNav) {

                     echo 'checked="checked"';

@@ -326,7 +326,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('show_title'); ?>"><?php _e('Show Title:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('show_title'); ?>"><?php _e('Show Title:', 'geodirectory'); ?>

 

                 <input type="checkbox" <?php if ($show_title) {

                     echo 'checked="checked"';

@@ -345,9 +345,9 @@ 
         </p>

         <p>

             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">

-                <?php _e('Enable Location Filter:', 'geodirectory');?>

+                <?php _e('Enable Location Filter:', 'geodirectory'); ?>

                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"

-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>

+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"'; ?>

                        value="1"/>

             </label>

         </p>

@@ -368,10 +368,10 @@ 
 

             }

 

-            <?php if(is_active_widget( false, false, $this->id_base, true )){ ?>

+            <?php if (is_active_widget(false, false, $this->id_base, true)) { ?>

             var post_type = jQuery('#<?php echo $this->get_field_id('post_type'); ?>').val();

 

-            geodir_change_category_list(post_type, '<?php echo $category;?>');

+            geodir_change_category_list(post_type, '<?php echo $category; ?>');

             <?php } ?>

 

         </script>

Braces +13 added lines, -6 removed lines

@@ -74,10 +74,11 @@ 
         $instance['animation'] = $new_instance['animation'];

         $instance['list_sort'] = isset($new_instance['list_sort']) ? $new_instance['list_sort'] : '';

         $instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;

-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')

-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);

-        else

-            $instance['add_location_filter'] = '0';

+        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '') {
+                    $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
+        } else {
+                    $instance['add_location_filter'] = '0';
+        }
 

         return $instance;

     }

@@ -339,7 +340,10 @@ 
             <label

                 for="<?php echo $this->get_field_id('show_featured_only'); ?>"><?php _e('Show only featured listings:', 'geodirectory'); ?>

                 <input type="checkbox" id="<?php echo $this->get_field_id('show_featured_only'); ?>"

-                       name="<?php echo $this->get_field_name('show_featured_only'); ?>" <?php if ($show_featured_only) echo 'checked="checked"'; ?>

+                       name="<?php echo $this->get_field_name('show_featured_only'); ?>" <?php if ($show_featured_only) {
+	echo 'checked="checked"';
+}
+?>

                        value="1"/>

             </label>

         </p>

@@ -347,7 +351,10 @@ 
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">

                 <?php _e('Enable Location Filter:', 'geodirectory');?>

                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"

-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>

+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) {
+	echo 'checked="checked"';
+}
+?>

                        value="1"/>

             </label>

         </p>

geodirectory-admin/admin_hooks_actions.php

Braces +63 added lines, -55 removed lines

@@ -24,8 +24,11 @@ 
             global $current_tab;

             geodir_redirect_to_admin_panel_on_installed();

             $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';

-            if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests

-                geodir_handle_option_form_submit($current_tab); // located in admin function.php

+            if (!(isset($_REQUEST['action']))) {
+            	// this will avoid Ajax requests

+                geodir_handle_option_form_submit($current_tab);
+            }
+            // located in admin function.php

             /**

              * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.

              *

@@ -316,8 +319,9 @@ 
     if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {

 

         foreach ($notification as $key => $value) {

-            if ($value['type'] == 'textarea')

-                $notification[$key]['type'] = 'editor';

+            if ($value['type'] == 'textarea') {
+                            $notification[$key]['type'] = 'editor';
+            }
         }

 

     }

@@ -342,8 +346,9 @@ 
     if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {

 

         foreach ($design_setting as $key => $value) {

-            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')

-                $design_setting[$key]['type'] = 'editor';

+            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content') {
+                            $design_setting[$key]['type'] = 'editor';
+            }
         }

 

     }

@@ -462,9 +467,9 @@ 
                    class="gd-draggable-form-items  gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);">

                     <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {

                         echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';

-                    }elseif(isset($val['field_icon']) && $val['field_icon'] ){

+                    } elseif(isset($val['field_icon']) && $val['field_icon'] ){

                         echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';

-                    }else{

+                    } else{

                         echo '<i class="fa fa-cog" aria-hidden="true"></i>';

                     }?>

                     <?php echo $val['site_title'];?>

@@ -693,9 +698,9 @@ 
         <?php

         if($type=='predefined'){

             $cfs = geodir_custom_fields_predefined($listing_type);

-        }elseif($type=='custom'){

+        } elseif($type=='custom'){

             $cfs = geodir_custom_fields_custom($listing_type);

-        }else{

+        } else{

             $cfs = geodir_custom_fields($listing_type);

             ?>

             <ul class="full gd-cf-tooltip-wrap">

@@ -750,7 +755,7 @@ 
             </li>

             <?php

         }

-    }else{

+    } else{

         _e('There are no custom fields here yet.', 'geodirectory');

     }

         ?>

@@ -947,8 +952,9 @@ 
 

     if (!get_option('geodir_remove_unnecessary_fields')) {

 

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))

-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");

+        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'")) {
+                    $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
+        }
 

         update_option('geodir_remove_unnecessary_fields', '1');

 

@@ -974,15 +980,17 @@ 
         $geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action'];

         switch ($geodir_admin_ajax_action) {

             case 'diagnosis' :

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

-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

+                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
+                                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
+                }
                 call_user_func('geodir_diagnose_' . $diagnose_this);

                 exit();

                 break;

 

             case 'diagnosis-fix' :

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

-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

+                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
+                                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
+                }
                 call_user_func('geodir_diagnose_' . $diagnose_this);

                 exit();

                 break;

@@ -1540,11 +1548,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_home_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1565,11 +1573,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_add_listing_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1591,11 +1599,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_preview_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1616,11 +1624,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_success_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1641,11 +1649,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_info_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1666,11 +1674,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_login_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1691,11 +1699,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_location_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -2140,8 +2148,9 @@ 
                             );

 

                             $post_location_info = $request_info['post_location'];

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

-                                $post_location_id = $location_id;

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

                             $post_location_id = 0;

                         }

@@ -2204,8 +2213,9 @@ 
                             $attachment_set = '';

 

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

-                                if ($val != '')

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

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

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

 

@@ -2301,8 +2311,7 @@ 
 

         $parts = json_decode($response['body']);

         //print_r($parts);

-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}

-        else{

+        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;} else{

 

             update_option('gd_ga_access_token', $parts->access_token);

             update_option('gd_ga_refresh_token', $parts->refresh_token);

@@ -2310,17 +2319,16 @@ 
         }

 

 

-    }

-    elseif(!empty($response['response']['code'])) {

+    } elseif(!empty($response['response']['code'])) {

         $parts = json_decode($response['body']);

 

         if(isset($parts->error)){

             echo $parts->error.": ".$parts->error_description;exit;

-        }else{

+        } else{

             echo $error_msg." - #2";exit;

         }

 

-    }else{

+    } else{

 

         echo $error_msg." - #3";exit;

 

Doc Comments +1 added lines, -1 removed lines

@@ -1844,6 +1844,7 @@ 
  * @since 1.0.0

  * @package GeoDirectory

  * @global object $current_user Current user object.

+ * @param string|null $input
  * @return array Returns parsed data as array.

  */

 function geodir_str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\")

@@ -2373,7 +2374,6 @@ 
  *

  * @since 1.6.9

  *

- * @param array $settings Array of GeoDirectory general settings.

  * @return array Array of settings.

  */

 function geodir_uninstall_settings($general_settings) {

Spacing +224 added lines, -224 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');

 

@@ -120,8 +120,8 @@ 
 add_action('admin_panel_init', 'geodir_admin_list_columns', 2);

 

 /* --- insert dummy post action ---*/

-add_action('geodir_insert_dummy_posts', 'geodir_insert_dummy_posts', 1,3);

-add_action('geodir_delete_dummy_posts', 'geodir_delete_dummy_posts', 1,3);

+add_action('geodir_insert_dummy_posts', 'geodir_insert_dummy_posts', 1, 3);

+add_action('geodir_delete_dummy_posts', 'geodir_delete_dummy_posts', 1, 3);

 

 

 /**

@@ -229,9 +229,9 @@ 
 

         // Filter-Payment-Manager

 

-        add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');

+        add_meta_box('geodir_post_images', $post_typename.' '.__('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');

 

-        add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');

+        add_meta_box('geodir_post_info', $post_typename.' '.__('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');

 

         // no need of this box as all fields moved to main information box

         //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );

@@ -240,7 +240,7 @@ 
 

 }

 

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

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

 

 

 

@@ -267,10 +267,10 @@ 
 

             $gd_taxonomy = geodir_get_taxonomies($geodir_post_type);

 

-            if(!empty($gd_taxonomy)) {

+            if (!empty($gd_taxonomy)) {

                 foreach ($gd_taxonomy as $tax) {

 

-                    remove_meta_box($tax . 'div', $geodir_post_type, 'normal');

+                    remove_meta_box($tax.'div', $geodir_post_type, 'normal');

 

                 }

             }

@@ -356,14 +356,14 @@ 
 add_action('geodir_manage_available_fields_predefined', 'geodir_manage_available_fields_predefined');

 add_action('geodir_manage_available_fields_custom', 'geodir_manage_available_fields_custom');

 

-function geodir_manage_available_fields_predefined($sub_tab){

-    if($sub_tab=='custom_fields'){

+function geodir_manage_available_fields_predefined($sub_tab) {

+    if ($sub_tab == 'custom_fields') {

         geodir_custom_available_fields('predefined');

     }

 }

 

-function geodir_manage_available_fields_custom($sub_tab){

-    if($sub_tab=='custom_fields'){

+function geodir_manage_available_fields_custom($sub_tab) {

+    if ($sub_tab == 'custom_fields') {

         geodir_custom_available_fields('custom');

     }

 }

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

@@ -444,7 +444,7 @@ 
 

             $check_html_variable = $wpdb->get_var(

                 $wpdb->prepare(

-                    "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",

+                    "SELECT htmlvar_name FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",

                     array($val['htmlvar_name'], $listing_type, $val['field_type'])

                 )

             );

@@ -452,23 +452,23 @@ 
             $display = $check_html_variable ? ' style="display:none;"' : '';

            ?>

 

-            <li   class="gd-cf-tooltip-wrap" <?php echo $display;?>>

+            <li   class="gd-cf-tooltip-wrap" <?php echo $display; ?>>

                 <?php

-                if(isset($val['description']) && $val['description']){

+                if (isset($val['description']) && $val['description']) {

                     echo '<div class="gdcf-tooltip">'.$val['description'].'</div>';

                 }?>

 

-                <a id="gd-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>" data-field-type-key="<?php echo $val['htmlvar_name'];?>"  data-field-type="<?php echo $val['field_type'];?>"

-                   title="<?php echo $val['site_title'];?>"

-                   class="gd-draggable-form-items  gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);">

+                <a id="gd-<?php echo $val['field_type']; ?>-_-<?php echo $val['htmlvar_name']; ?>" data-field-type-key="<?php echo $val['htmlvar_name']; ?>"  data-field-type="<?php echo $val['field_type']; ?>"

+                   title="<?php echo $val['site_title']; ?>"

+                   class="gd-draggable-form-items  gd-<?php echo $val['field_type']; ?> geodir-sort-<?php echo $val['htmlvar_name']; ?>" href="javascript:void(0);">

                     <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {

                         echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';

-                    }elseif(isset($val['field_icon']) && $val['field_icon'] ){

+                    }elseif (isset($val['field_icon']) && $val['field_icon']) {

                         echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';

-                    }else{

+                    } else {

                         echo '<i class="fa fa-cog" aria-hidden="true"></i>';

                     }?>

-                    <?php echo $val['site_title'];?>

+                    <?php echo $val['site_title']; ?>

                 </a>

             </li>

 

@@ -496,7 +496,7 @@ 
     <?php 

         global $wpdb;

         

-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));

+        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));

 

         if (!empty($fields)) {

             foreach ($fields as $field) {

@@ -521,14 +521,14 @@ 
  * @since 1.6.9

  * @package GeoDirectory

  */

-function geodir_custom_fields_custom($post_type=''){

+function geodir_custom_fields_custom($post_type = '') {

 

     $custom_fields = array();

 

     /**

      * @see `geodir_custom_fields`

      */

-    return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);

+    return apply_filters('geodir_custom_fields_custom', $custom_fields, $post_type);

 }

 

 

@@ -539,7 +539,7 @@ 
  * @since 1.6.6

  * @package GeoDirectory

  */

-function geodir_custom_fields($post_type=''){

+function geodir_custom_fields($post_type = '') {

     

     $custom_fields = array(

         'text' => array(

@@ -674,7 +674,7 @@ 
      * }

      * @param string $post_type The post type requested.

      */

-    return apply_filters('geodir_custom_fields',$custom_fields,$post_type);

+    return apply_filters('geodir_custom_fields', $custom_fields, $post_type);

 }

 

 /**

@@ -685,25 +685,25 @@ 
  * @param string $type The custom field type, predefined, custom or blank for default

  * @package GeoDirectory

  */

-function geodir_custom_available_fields($type='')

+function geodir_custom_available_fields($type = '')

 {

     $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

     ?>

-    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>

+    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>" />

 

         <?php

-        if($type=='predefined'){

+        if ($type == 'predefined') {

             $cfs = geodir_custom_fields_predefined($listing_type);

-        }elseif($type=='custom'){

+        }elseif ($type == 'custom') {

             $cfs = geodir_custom_fields_custom($listing_type);

-        }else{

+        } else {

             $cfs = geodir_custom_fields($listing_type);

             ?>

             <ul class="full gd-cf-tooltip-wrap">

                 <li>

                     <div class="gdcf-tooltip">

-                        <?php _e('This adds a section separator with a title.', 'geodirectory');?>

+                        <?php _e('This adds a section separator with a title.', 'geodirectory'); ?>

                     </div>

                     <a id="gt-fieldset"

                        class="gd-draggable-form-items gt-fieldset"

@@ -714,7 +714,7 @@ 
 

                         <i class="fa fa-long-arrow-left " aria-hidden="true"></i>

                         <i class="fa fa-long-arrow-right " aria-hidden="true"></i>

-                        <?php _e('Fieldset (section separator)', 'geodirectory');?>

+                        <?php _e('Fieldset (section separator)', 'geodirectory'); ?>

                     </a>

                 </li>

             </ul>

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

         }

 

-    if(!empty($cfs)) {

+    if (!empty($cfs)) {

 

-        foreach ( $cfs as $id => $cf ) {

+        foreach ($cfs as $id => $cf) {

             ?>

             <ul>

             <li class="gd-cf-tooltip-wrap">

                 <?php

-                if ( isset( $cf['description'] ) && $cf['description'] ) {

-                    echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>';

+                if (isset($cf['description']) && $cf['description']) {

+                    echo '<div class="gdcf-tooltip">'.$cf['description'].'</div>';

                 } ?>

 

                 <a id="gd-<?php echo $id; ?>"

@@ -740,10 +740,10 @@ 
                    class="gd-draggable-form-items <?php echo $cf['class']; ?>"

                    href="javascript:void(0);">

 

-                    <?php if ( isset( $cf['icon'] ) && strpos( $cf['icon'], 'fa fa-' ) !== false ) {

-                        echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>';

-                    } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {

-                        echo '<b style="background-image: url("' . $cf['icon'] . '")"></b>';

+                    <?php if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {

+                        echo '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';

+                    } elseif (isset($cf['icon']) && $cf['icon']) {

+                        echo '<b style="background-image: url("'.$cf['icon'].'")"></b>';

                     } else {

                         echo '<i class="fa fa-cog" aria-hidden="true"></i>';

                     } ?>

@@ -752,7 +752,7 @@ 
             </li>

             <?php

         }

-    }else{

+    } else {

         _e('There are no custom fields here yet.', 'geodirectory');

     }

         ?>

@@ -780,7 +780,7 @@ 
     <ul class="core">

     <?php 

         global $wpdb;

-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));

+        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));

 

         if (!empty($fields)) {

             foreach ($fields as $field) {

@@ -790,7 +790,7 @@ 
                 $field_type_key = $field->field_type_key;

                 $field_ins_upd = 'display';

 

-                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key);

+                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd, $field_type_key);

             }

         }

         ?></ul>

@@ -868,7 +868,7 @@ 
 

     switch ($sub_tab) {

         case 'custom_fields':

-            $note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can 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 to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type)); ;

             break;

 

         case 'sorting_options':

@@ -922,7 +922,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':

@@ -949,8 +949,8 @@ 
 

     if (!get_option('geodir_remove_unnecessary_fields')) {

 

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))

-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");

+        if ($wpdb->get_var("SHOW COLUMNS FROM ".$plugin_prefix."gd_place_detail WHERE field = 'categories'"))

+            $wpdb->query("ALTER TABLE `".$plugin_prefix."gd_place_detail` DROP `categories`");

 

         update_option('geodir_remove_unnecessary_fields', '1');

 

@@ -978,14 +978,14 @@ 
             case 'diagnosis' :

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

                     $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

-                call_user_func('geodir_diagnose_' . $diagnose_this);

+                call_user_func('geodir_diagnose_'.$diagnose_this);

                 exit();

                 break;

 

             case 'diagnosis-fix' :

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

                     $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

-                call_user_func('geodir_diagnose_' . $diagnose_this);

+                call_user_func('geodir_diagnose_'.$diagnose_this);

                 exit();

                 break;

         }

@@ -1010,50 +1010,50 @@ 
 {

     global $wpdb;

     //$filter_arr['output_str'] .='###'.$table.'###';

-    if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";

+    if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0) {

+        $filter_arr['output_str'] .= "<li>".__('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory')."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

-        $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";

+        $filter_arr['output_str'] .= "<li>".__('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory')."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

-            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count

-            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count

+            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM ".$table."_ms_bak"); // get backup table count

+            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table"); // get new table count

 

             if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2

                 //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;

 

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table

+                $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$table."_ms_bak2"); // rename bak table to new table

 

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";

+                if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".__('-->FIXED: Renamed and backed up the tables', 'geodirectory')."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";

                 }

 

             } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it

 

-                $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table

+                $wpdb->query("RENAME TABLE ".$wpdb->prefix."$table TO ".$table."_ms_bak2"); // rename new table to bak2

+                $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$wpdb->prefix."$table"); // rename bak table to new table

 

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";

+                if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";

                 }

 

             } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors

 

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2

+                $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$table."_ms_bak2"); // rename ms_bak table to ms_bak2

 

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";

+                if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";

                 }

 

             }

@@ -1061,54 +1061,54 @@ 
         }

 

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

             if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it

                 if ($wpdb->query("DROP TABLE IF EXISTS $table")) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table)."</li>";

                 }

 

-            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original

-                if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

+            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table") == 0) {// if main table is empty but original is not, delete main and rename original

+                if ($wpdb->query("DROP TABLE IF EXISTS ".$wpdb->prefix."$table")) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix.$table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix.$table)."</li>";

                 }

-                if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+                if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

                 }

             } else {// else rename the original table to _ms_bak

-                if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

+                if ($wpdb->query("RENAME TABLE $table TO ".$table."_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table."_ms_bak")."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table."_ms_bak")."</li>";

                 }

             }

         }

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

             // if original table exists but new does not, rename

-            if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+            if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

             } else {

-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+                $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

             }

 

         }

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

@@ -1122,11 +1122,11 @@ 
             delete_option('geodir_custom_posts_db_version');

             delete_option('geodir_reviewratings_db_version');

             delete_option('geodiradvancesearch_db_version');

-            $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";

+            $filter_arr['output_str'] .= "<li>".__('-->TRY: Please refresh page to run table install functions', 'geodirectory')."</li>";

         }

 

     } else {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";

+        $filter_arr['output_str'] .= "<li>".sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name)."</li>";

     }

     return $filter_arr;

 }

@@ -1155,23 +1155,23 @@ 
     if (!empty($all_postypes)) {

         foreach ($all_postypes as $key) {

             // update each GD CPT

-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

+            $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail d");

 

             if (!empty($posts)) {

 

                 foreach ($posts as $p) {

                     $p->post_type = $key;

-                    $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));

+                    $raw_tags = wp_get_object_terms($p->post_id, $p->post_type.'_tags', array('fields' => 'names'));

                     if (empty($raw_tags)) {

                         $post_tags = '';

                     } else {

                         $post_tags = implode(",", $raw_tags);

                     }

-                    $tablename = $plugin_prefix . $p->post_type . '_detail';

-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

+                    $tablename = $plugin_prefix.$p->post_type.'_detail';

+                    $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

 

                 }

-                $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

+                $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";

             }

 

         }

@@ -1180,7 +1180,7 @@ 
 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1217,29 +1217,29 @@ 
     if (!empty($all_postypes)) {

         foreach ($all_postypes as $key) {

             // update each GD CTP

-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");

+            $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail d WHERE d.".$key."category='' ");

 

             if (!empty($posts)) {

 

                 foreach ($posts as $p) {

                     $p->post_type = $key;

-                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));

+                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type.'category', array('fields' => 'ids'));

 

                     if (empty($raw_cats)) {

                         $post_categories = get_post_meta($p->post_id, 'post_categories', true);

 

-                        if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {

-                            $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);

-                            foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {

+                        if (!empty($post_categories) && !empty($post_categories[$p->post_type.'category'])) {

+                            $post_categories[$p->post_type.'category'] = str_replace("d:", "", $post_categories[$p->post_type.'category']);

+                            foreach (explode(",", $post_categories[$p->post_type.'category']) as $cat_part) {

                                 if (is_numeric($cat_part)) {

-                                    $raw_cats[] = (int)$cat_part;

+                                    $raw_cats[] = (int) $cat_part;

                                 }

                             }

 

                         }

 

                         if (!empty($raw_cats)) {

-                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');

+                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type.'category');

 

                         }

 

@@ -1249,14 +1249,14 @@ 
                     if (empty($raw_cats)) {

                         $post_cats = '';

                     } else {

-                        $post_cats = ',' . implode(",", $raw_cats) . ',';

+                        $post_cats = ','.implode(",", $raw_cats).',';

                     }

-                    $tablename = $plugin_prefix . $p->post_type . '_detail';

-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));

+                    $tablename = $plugin_prefix.$p->post_type.'_detail';

+                    $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET ".$p->post_type."category=%s WHERE post_id =%d", $post_cats, $p->post_id));

                 }

 

             }

-            $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

+            $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";

 

         }

 

@@ -1264,7 +1264,7 @@ 
 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1317,15 +1317,15 @@ 
     if (!empty($ver_arr)) {

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

             if (delete_option($val)) {

-                $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";

+                $output_str .= "<li>".$key.__(' Version: Deleted', 'geodirectory')."</li>";

             } else {

-                $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";

+                $output_str .= "<li>".$key.__(' Version: Not Found', 'geodirectory')."</li>";

             }

 

         }

 

         if ($output_str) {

-            $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";

+            $output_str .= "<li><strong>".__(' Upgrade/install scripts will run on next page reload.', 'geodirectory')."</strong></li>";

         }

 

     }

@@ -1362,43 +1362,43 @@ 
     $output_str = '';

 

     // check review locations

-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {

-        $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";

+    if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {

+        $output_str .= "<li>".__('Review locations missing or broken', 'geodirectory')."</li>";

         $is_error_during_diagnose = true;

 

         if ($fix) {

             if (geodir_fix_review_location()) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Review locations fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Review locations fix failed', 'geodirectory')."</strong></li>";

             }

         }

 

     } else {

-        $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";

+        $output_str .= "<li>".__('Review locations ok', 'geodirectory')."</li>";

     }

 

     // check review content

-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {

-        $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";

+    if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_content IS NULL")) {

+        $output_str .= "<li>".__('Review content missing or broken', 'geodirectory')."</li>";

         $is_error_during_diagnose = true;

 

         if ($fix) {

             if (geodir_fix_review_content()) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Review content fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Review content fix failed', 'geodirectory')."</strong></li>";

             }

         }

 

     } else {

-        $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";

+        $output_str .= "<li>".__('Review content ok', 'geodirectory')."</li>";

     }

 

 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1462,7 +1462,7 @@ 
 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1496,7 +1496,7 @@ 
     else {

         $page_found = $wpdb->get_var(

             $wpdb->prepare(

-                "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+                "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;",

                 array($slug)

             )

         );

@@ -1542,18 +1542,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_home_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('GD Home page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('GD Home page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: GD Home page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: GD Home page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1567,18 +1567,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_add_listing_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Add Listing page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Add Listing page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Add Listing page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Add Listing page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1593,18 +1593,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_preview_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Listing Preview page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Listing Preview page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Listing Preview page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Listing Preview page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1618,18 +1618,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_success_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Listing Success page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Listing Success page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Listing Success page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Listing Success page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1643,18 +1643,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_info_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Info page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Info page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Info page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Info page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1668,18 +1668,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_login_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Login page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Login page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Login page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Login page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1693,18 +1693,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_location_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Location page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Location page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Location page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Location page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1713,13 +1713,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'];

@@ -1729,7 +1729,7 @@ 
             flush_rewrite_rules();

         }

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1757,10 +1757,10 @@ 
     $fix_button_txt = '';

 

     if ($is_error_during_diagnose) {

-        $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";

+        $output_str .= "<li>".__('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory').' '.geodir_plugin_path().'/db-language.php'."</li>";

 		$info_div_class = "geodir_problem_info";

     } else {

-        $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";

+        $output_str .= "<li>".__('Load custom fields in to file for translation: ok', 'geodirectory')."</li>";

 		$info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

     }

@@ -1802,17 +1802,17 @@ 
     global $wpdb, $wp_query, $plugin_prefix;

 

     if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {

-        $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';

+        $table = $plugin_prefix.$wp_query->query_vars['post_type'].'_detail';

 

-        $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';

+        $join = $clauses['join'].' INNER JOIN '.$table.' AS gd_posts ON (gd_posts.post_id = '.$wpdb->posts.'.ID)';

         $clauses['join'] = $join;

 

-        $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';

+        $fields = $clauses['fields'] != '' ? $clauses['fields'].', ' : '';

         $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';

         $clauses['fields'] = $fields;

 

         $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';

-        $orderby = 'gd_expire ' . $order;

+        $orderby = 'gd_expire '.$order;

         $clauses['orderby'] = $orderby;

     }

     return $clauses;

@@ -1855,7 +1855,7 @@ 
         global $current_user;

         $upload_dir = wp_upload_dir();

 

-        $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';

+        $file = $upload_dir['path'].'/temp_'.$current_user->data->ID.'/geodir_tmp.csv';

         $handle = fopen($file, 'w');

 

         fwrite($handle, $input);

@@ -1900,7 +1900,7 @@ 
     $uploads_dir = $uploads['path'];

     $image_name_arr = explode('/', $filename);

     $filename = end($image_name_arr);

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

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

     $return = array();

     $return['file'] = $uploadedFile;

     $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

@@ -1917,8 +1917,8 @@ 
 

                 if (($handle = fopen($target_path, "r")) !== FALSE) {

                     while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {

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

-                            $file[] = '"' . implode('","', $data) . '"';

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

+                            $file[] = '"'.implode('","', $data).'"';

                         }

                     }

                     fclose($handle);

@@ -2035,10 +2035,10 @@ 
                     $tag_arr = explode(',', $post_tags);

                 }

 

-                $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database

+                $table = $plugin_prefix.$buffer[5].'_detail'; // check table in database

 

                 $error = '';

-                if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {

+                if ($wpdb->get_var("SHOW TABLES LIKE '".$table."'") != $table) {

                     $invalid_post_type++;

                     continue;

                 }

@@ -2064,7 +2064,7 @@ 
                             if ($buffer[$c] != '0' && $buffer[$c] != '') {

                                 $submitdata = date('Y-m-d');

 

-                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));

+                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata."+".addslashes($buffer[$c])." days"));

                             } else {

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

                             }

@@ -2092,7 +2092,7 @@ 
 						

 						// Post status

 						if ($customKeyarray[$c] == 'post_status') {

-                            $post_status = sanitize_key( $buffer[$c] );

+                            $post_status = sanitize_key($buffer[$c]);

                         }

                     }

 

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

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

@@ -2165,7 +2165,7 @@ 
                         $payment_info['package_id'] = $package_info['pid'];

 

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

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

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

                         } else {

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

                         }

@@ -2177,7 +2177,7 @@ 
 

                     $post_type = get_post_type($last_postid);

 

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

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

 

                     geodir_save_post_info($last_postid, $gd_post_info);

 

@@ -2198,7 +2198,7 @@ 
                             $attachment['post_id'] = $last_postid;

                             $attachment['title'] = $img_name_arr[0];

                             $attachment['content'] = '';

-                            $attachment['file'] = $sub_dir . '/' . $image_name;

+                            $attachment['file'] = $sub_dir.'/'.$image_name;

                             $attachment['mime_type'] = $uploaded_file_type;

                             $attachment['menu_order'] = $menu_order;

                             $attachment['is_featured'] = 0;

@@ -2207,15 +2207,15 @@ 
 

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

                                 if ($val != '')

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

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

                             }

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

 

-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

+                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);

 

                             if ($menu_order == 1) {

                                 $post_type = get_post_type($last_postid);

-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));

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

                             }

                             $menu_order++;

                         }

@@ -2256,11 +2256,11 @@ 
 }

 

 // Add the tab in left sidebar menu fro import & export page.

-add_filter( 'geodir_settings_tabs_array', 'geodir_import_export_tab', 94 );

+add_filter('geodir_settings_tabs_array', 'geodir_import_export_tab', 94);

 

 // Handle ajax request for import/export.

-add_action( 'wp_ajax_geodir_import_export', 'geodir_ajax_import_export' );

-add_action( 'wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export' );

+add_action('wp_ajax_geodir_import_export', 'geodir_ajax_import_export');

+add_action('wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export');

 

 

 /**

@@ -2271,40 +2271,40 @@ 
  * @param $post_id int $post_id The post ID of the post being saved.

  * @param $post object $post The post object of the post being saved.

  */

-function geodir_update_location_prefix($post_id,$post){

-    if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){

-        update_option('geodir_location_prefix',$post->post_name);

+function geodir_update_location_prefix($post_id, $post) {

+    if ($post->post_type == 'page' && $post->post_name && $post_id == get_option('geodir_location_page')) {

+        update_option('geodir_location_prefix', $post->post_name);

     }

 

 }

 

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

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

 

-add_action( 'wp_ajax_geodir_ga_callback', 'geodir_ga_callback' );

+add_action('wp_ajax_geodir_ga_callback', 'geodir_ga_callback');

 

-function geodir_ga_callback(){

+function geodir_ga_callback() {

 

-if(isset($_REQUEST['code']) && $_REQUEST['code']) {

+if (isset($_REQUEST['code']) && $_REQUEST['code']) {

     $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";

     $code = "code=".$_REQUEST['code'];

     $grant_type = "&grant_type=authorization_code";

-    $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

+    $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";

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

     $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');

 

-    $auth_url = $oAuthURL . $code . $redirect_uri .  $grant_type . $client_id .$client_secret;

+    $auth_url = $oAuthURL.$code.$redirect_uri.$grant_type.$client_id.$client_secret;

 

     $response = wp_remote_post($auth_url, array('timeout' => 15));

 

     //print_r($response);

 

-    $error_msg =  __('Something went wrong','geodirectory');

-    if(!empty($response['response']['code']) && $response['response']['code']==200){

+    $error_msg = __('Something went wrong', 'geodirectory');

+    if (!empty($response['response']['code']) && $response['response']['code'] == 200) {

 

         $parts = json_decode($response['body']);

         //print_r($parts);

-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}

-        else{

+        if (!isset($parts->access_token)) {echo $error_msg." - #1"; exit; }

+        else {

 

             update_option('gd_ga_access_token', $parts->access_token);

             update_option('gd_ga_refresh_token', $parts->refresh_token);

@@ -2313,25 +2313,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');

@@ -2348,7 +2348,7 @@ 
 function geodir_uninstall_settings($general_settings) {

     $settings   = array();

     $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));

-    $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));

+    $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory'));

     

     $plugins    = get_plugins();

     $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());

@@ -2360,7 +2360,7 @@ 
             if (in_array($plugin_name, $un_plugins)) {

                 $settings[] = array(

                     'type' => 'checkbox',

-                    'id' => 'geodir_un_' . $plugin_name,

+                    'id' => 'geodir_un_'.$plugin_name,

                     'name' => $data['Name'],

                     'desc' => __('Remove all data when deleted?', 'geodirectory'),

                     'std' => '0'

@@ -2394,7 +2394,7 @@ 
  * @since 1.6.9

  */

 function geodir_uninstall_settings_desc() {

-    echo '<p class="gd-un-settings-desc">' . __('Select the plugins that you would like to completely remove all of its data when the plugin is deleted.', 'geodirectory') . '</p>';

+    echo '<p class="gd-un-settings-desc">'.__('Select the plugins that you would like to completely remove all of its data when the plugin is deleted.', 'geodirectory').'</p>';

 }

 add_action('geodir_settings_uninstall_settings_main_start', 'geodir_uninstall_settings_desc');

 

Indentation +1527 added lines, -1527 removed lines

@@ -10,33 +10,33 @@ 
 

 add_action('admin_init', 'geodir_admin_init');

 if (!function_exists('geodir_admin_init')) {

-    /**

-     * Adds GD setting pages in admin.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

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

-     */

-    function geodir_admin_init()

-    {

-

-        if (is_admin()):

-            global $current_tab;

-            geodir_redirect_to_admin_panel_on_installed();

-            $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';

-            if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests

-                geodir_handle_option_form_submit($current_tab); // located in admin function.php

-            /**

-             * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.

-             *

-             * @since 1.0.0

-             */

-            do_action('admin_panel_init');

-            add_action('geodir_admin_option_form', 'geodir_get_admin_option_form', 1);

-

-

-        endif;

-    }

+	/**

+	 * Adds GD setting pages in admin.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

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

+	 */

+	function geodir_admin_init()

+	{

+

+		if (is_admin()):

+			global $current_tab;

+			geodir_redirect_to_admin_panel_on_installed();

+			$current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';

+			if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests

+				geodir_handle_option_form_submit($current_tab); // located in admin function.php

+			/**

+			 * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('admin_panel_init');

+			add_action('geodir_admin_option_form', 'geodir_get_admin_option_form', 1);

+

+

+		endif;

+	}

 }

 

 /**

@@ -47,10 +47,10 @@ 
  */

 function geodir_redirect_to_admin_panel_on_installed()

 {

-    if (get_option('geodir_installation_redirect', false)) {

-        delete_option('geodir_installation_redirect');

-        wp_redirect(admin_url('admin.php?page=geodirectory&installed=yes'));

-    }

+	if (get_option('geodir_installation_redirect', false)) {

+		delete_option('geodir_installation_redirect');

+		wp_redirect(admin_url('admin.php?page=geodirectory&installed=yes'));

+	}

 }

 

 /**

@@ -62,7 +62,7 @@ 
  */

 function geodir_get_admin_option_form($current_tab)

 {

-    geodir_admin_option_form($current_tab);// defined in admin template tags.php

+	geodir_admin_option_form($current_tab);// defined in admin template tags.php

 }

 

 

@@ -85,19 +85,19 @@ 
  */

 function geodir_conditional_admin_script_load()

 {

-    global $pagenow;

+	global $pagenow;

 	

 	// Get the current post type

 	$post_type = geodir_admin_current_post_type();

 	$geodir_post_types = geodir_get_posttypes();

     

 	if ((isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') || (($pagenow == 'post.php' || $pagenow == 'post-new.php' || $pagenow == 'edit.php') && $post_type && in_array($post_type, $geodir_post_types)) || ($pagenow == 'edit-tags.php' || $pagenow == 'term.php' || $pagenow == 'edit-comments.php' || $pagenow == 'comment.php')) {

-        add_action('admin_enqueue_scripts', 'geodir_admin_scripts');

-        add_action('admin_enqueue_scripts', 'geodir_admin_styles');

-        add_action('admin_enqueue_scripts', 'geodir_admin_dequeue_scripts', 100);

-    }

+		add_action('admin_enqueue_scripts', 'geodir_admin_scripts');

+		add_action('admin_enqueue_scripts', 'geodir_admin_styles');

+		add_action('admin_enqueue_scripts', 'geodir_admin_dequeue_scripts', 100);

+	}

 

-    add_action('admin_enqueue_scripts', 'geodir_admin_styles_req');

+	add_action('admin_enqueue_scripts', 'geodir_admin_styles_req');

 

 }

 

@@ -132,12 +132,12 @@ 
  */

 function create_default_admin_main_nav()

 {

-    add_filter('geodir_settings_tabs_array', 'geodir_default_admin_main_tabs', 1);

-    add_filter('geodir_settings_tabs_array', 'places_custom_fields_tab', 2);

-    add_filter('geodir_settings_tabs_array', 'geodir_compatibility_setting_tab', 90);

-    add_filter('geodir_settings_tabs_array', 'geodir_tools_setting_tab', 95);

-    add_filter('geodir_settings_tabs_array', 'geodir_extend_geodirectory_setting_tab', 100);

-    //add_filter('geodir_settings_tabs_array', 'geodir_hide_set_location_default',3);

+	add_filter('geodir_settings_tabs_array', 'geodir_default_admin_main_tabs', 1);

+	add_filter('geodir_settings_tabs_array', 'places_custom_fields_tab', 2);

+	add_filter('geodir_settings_tabs_array', 'geodir_compatibility_setting_tab', 90);

+	add_filter('geodir_settings_tabs_array', 'geodir_tools_setting_tab', 95);

+	add_filter('geodir_settings_tabs_array', 'geodir_extend_geodirectory_setting_tab', 100);

+	//add_filter('geodir_settings_tabs_array', 'geodir_hide_set_location_default',3);

 

 }

 

@@ -150,16 +150,16 @@ 
  */

 function geodir_admin_list_columns()

 {

-    if ($post_types = geodir_get_posttypes()) {

+	if ($post_types = geodir_get_posttypes()) {

 

-        foreach ($post_types as $post_type):

-            add_filter("manage_edit-{$post_type}_columns", 'geodir_edit_post_columns', 100);

-            //Filter-Payment-Manager to show Package

-            add_action("manage_{$post_type}_posts_custom_column", 'geodir_manage_post_columns', 10, 2);

+		foreach ($post_types as $post_type):

+			add_filter("manage_edit-{$post_type}_columns", 'geodir_edit_post_columns', 100);

+			//Filter-Payment-Manager to show Package

+			add_action("manage_{$post_type}_posts_custom_column", 'geodir_manage_post_columns', 10, 2);

 

-            add_filter("manage_edit-{$post_type}_sortable_columns", 'geodir_post_sortable_columns');

-        endforeach;

-    }

+			add_filter("manage_edit-{$post_type}_sortable_columns", 'geodir_post_sortable_columns');

+		endforeach;

+	}

 }

 

 /**

@@ -172,15 +172,15 @@ 
  */

 function geodir_default_admin_main_tabs($tabs)

 {

-    return $tabs = array(

-        'general_settings' => array('label' => __('General', 'geodirectory')),

-        'design_settings' => array('label' => __('Design', 'geodirectory')),

-        'permalink_settings' => array('label' => __('Permalinks', 'geodirectory')),

-        'title_meta_settings' => array('label' => __('Titles & Metas', 'geodirectory')),

-        'notifications_settings' => array('label' => __('Notifications', 'geodirectory')),

-        'default_location_settings' => array('label' => __('Set Default Location', 'geodirectory')),

-

-    );

+	return $tabs = array(

+		'general_settings' => array('label' => __('General', 'geodirectory')),

+		'design_settings' => array('label' => __('Design', 'geodirectory')),

+		'permalink_settings' => array('label' => __('Permalinks', 'geodirectory')),

+		'title_meta_settings' => array('label' => __('Titles & Metas', 'geodirectory')),

+		'notifications_settings' => array('label' => __('Notifications', 'geodirectory')),

+		'default_location_settings' => array('label' => __('Set Default Location', 'geodirectory')),

+

+	);

 }

 

 add_action('do_meta_boxes', 'geodir_remove_image_box');

@@ -193,16 +193,16 @@ 
  */

 function geodir_remove_image_box()

 {

-    global $post;

+	global $post;

 

-    $geodir_posttypes = geodir_get_posttypes();

+	$geodir_posttypes = geodir_get_posttypes();

 

-    if (isset($post) && in_array($post->post_type, $geodir_posttypes)):

+	if (isset($post) && in_array($post->post_type, $geodir_posttypes)):

 

-        remove_meta_box('postimagediv', $post->post_type, 'side');

-        remove_meta_box('revisionsdiv', $post->post_type, 'normal');

+		remove_meta_box('postimagediv', $post->post_type, 'side');

+		remove_meta_box('revisionsdiv', $post->post_type, 'normal');

 

-    endif;

+	endif;

 

 }

 

@@ -217,26 +217,26 @@ 
  */

 function geodir_meta_box_add()

 {

-    global $post;

+	global $post;

 

-    $geodir_post_types = geodir_get_posttypes('array');

-    $geodir_posttypes = array_keys($geodir_post_types);

+	$geodir_post_types = geodir_get_posttypes('array');

+	$geodir_posttypes = array_keys($geodir_post_types);

 

-    if (isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)):

+	if (isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)):

 

-        $geodir_posttype = $post->post_type;

-        $post_typename = geodir_ucwords($geodir_post_types[$geodir_posttype]['labels']['singular_name']);

+		$geodir_posttype = $post->post_type;

+		$post_typename = geodir_ucwords($geodir_post_types[$geodir_posttype]['labels']['singular_name']);

 

-        // Filter-Payment-Manager

+		// Filter-Payment-Manager

 

-        add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');

+		add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');

 

-        add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');

+		add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');

 

-        // no need of this box as all fields moved to main information box

-        //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );

+		// no need of this box as all fields moved to main information box

+		//add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );

 

-    endif;

+	endif;

 

 }

 

@@ -260,23 +260,23 @@ 
 function geodir_hide_post_taxonomy_meta_boxes()

 {

 

-    $geodir_post_types = get_option('geodir_post_types');

+	$geodir_post_types = get_option('geodir_post_types');

 

-    if (!empty($geodir_post_types)) {

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

+	if (!empty($geodir_post_types)) {

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

 

-            $gd_taxonomy = geodir_get_taxonomies($geodir_post_type);

+			$gd_taxonomy = geodir_get_taxonomies($geodir_post_type);

 

-            if(!empty($gd_taxonomy)) {

-                foreach ($gd_taxonomy as $tax) {

+			if(!empty($gd_taxonomy)) {

+				foreach ($gd_taxonomy as $tax) {

 

-                    remove_meta_box($tax . 'div', $geodir_post_type, 'normal');

+					remove_meta_box($tax . 'div', $geodir_post_type, 'normal');

 

-                }

-            }

+				}

+			}

 

-        }

-    }

+		}

+	}

 }

 

 add_filter('geodir_add_listing_map_restrict', 'geodir_add_listing_map_restrict');

@@ -290,12 +290,12 @@ 
  */

 function geodir_add_listing_map_restrict($map_restirct)

 {

-    if (is_admin()) {

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

-            $map_restirct = false;

-        }

-    }

-    return $map_restirct;

+	if (is_admin()) {

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

+			$map_restirct = false;

+		}

+	}

+	return $map_restirct;

 }

 

 

@@ -314,16 +314,16 @@ 
 function geodir_enable_editor_on_notifications($notification)

 {

 

-    if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {

+	if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {

 

-        foreach ($notification as $key => $value) {

-            if ($value['type'] == 'textarea')

-                $notification[$key]['type'] = 'editor';

-        }

+		foreach ($notification as $key => $value) {

+			if ($value['type'] == 'textarea')

+				$notification[$key]['type'] = 'editor';

+		}

 

-    }

+	}

 

-    return $notification;

+	return $notification;

 }

 

 

@@ -340,16 +340,16 @@ 
 function geodir_enable_editor_on_design_settings($design_setting)

 {

 

-    if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {

+	if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {

 

-        foreach ($design_setting as $key => $value) {

-            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')

-                $design_setting[$key]['type'] = 'editor';

-        }

+		foreach ($design_setting as $key => $value) {

+			if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')

+				$design_setting[$key]['type'] = 'editor';

+		}

 

-    }

+	}

 

-    return $design_setting;

+	return $design_setting;

 }

 

 /* ----------- START MANAGE CUSTOM FIELDS ---------------- */

@@ -357,15 +357,15 @@ 
 add_action('geodir_manage_available_fields_custom', 'geodir_manage_available_fields_custom');

 

 function geodir_manage_available_fields_predefined($sub_tab){

-    if($sub_tab=='custom_fields'){

-        geodir_custom_available_fields('predefined');

-    }

+	if($sub_tab=='custom_fields'){

+		geodir_custom_available_fields('predefined');

+	}

 }

 

 function geodir_manage_available_fields_custom($sub_tab){

-    if($sub_tab=='custom_fields'){

-        geodir_custom_available_fields('custom');

-    }

+	if($sub_tab=='custom_fields'){

+		geodir_custom_available_fields('custom');

+	}

 }

 

 

@@ -384,16 +384,16 @@ 
 function geodir_manage_available_fields($sub_tab)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            geodir_custom_available_fields();

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			geodir_custom_available_fields();

+			break;

 

-        case 'sorting_options':

-            geodir_sorting_options_available_fields();

-            break;

+		case 'sorting_options':

+			geodir_sorting_options_available_fields();

+			break;

 

-    }

+	}

 }

 

 

@@ -409,16 +409,16 @@ 
 function geodir_manage_selected_fields($sub_tab)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            geodir_custom_selected_fields();

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			geodir_custom_selected_fields();

+			break;

 

-        case 'sorting_options':

-            geodir_sorting_options_selected_fields();

-            break;

+		case 'sorting_options':

+			geodir_sorting_options_selected_fields();

+			break;

 

-    }

+	}

 }

 

 /**

@@ -430,52 +430,52 @@ 
  */

 function geodir_sorting_options_available_fields()

 {

-    global $wpdb;

-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

-    ?>

+	global $wpdb;

+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

+	?>

     <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul>

     <?php

-        $sort_options = geodir_get_custom_sort_options($listing_type);

+		$sort_options = geodir_get_custom_sort_options($listing_type);

         

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

-            $val = stripslashes_deep($val); // strip slashes

-

-            $check_html_variable = $wpdb->get_var(

-                $wpdb->prepare(

-                    "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",

-                    array($val['htmlvar_name'], $listing_type, $val['field_type'])

-                )

-            );

+		foreach ($sort_options as $key => $val) {

+			$val = stripslashes_deep($val); // strip slashes

+

+			$check_html_variable = $wpdb->get_var(

+				$wpdb->prepare(

+					"SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",

+					array($val['htmlvar_name'], $listing_type, $val['field_type'])

+				)

+			);

             

-            $display = $check_html_variable ? ' style="display:none;"' : '';

-           ?>

+			$display = $check_html_variable ? ' style="display:none;"' : '';

+		   ?>

 

             <li   class="gd-cf-tooltip-wrap" <?php echo $display;?>>

                 <?php

-                if(isset($val['description']) && $val['description']){

-                    echo '<div class="gdcf-tooltip">'.$val['description'].'</div>';

-                }?>

+				if(isset($val['description']) && $val['description']){

+					echo '<div class="gdcf-tooltip">'.$val['description'].'</div>';

+				}?>

 

                 <a id="gd-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>" data-field-type-key="<?php echo $val['htmlvar_name'];?>"  data-field-type="<?php echo $val['field_type'];?>"

                    title="<?php echo $val['site_title'];?>"

                    class="gd-draggable-form-items  gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);">

                     <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {

-                        echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';

-                    }elseif(isset($val['field_icon']) && $val['field_icon'] ){

-                        echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';

-                    }else{

-                        echo '<i class="fa fa-cog" aria-hidden="true"></i>';

-                    }?>

+						echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';

+					}elseif(isset($val['field_icon']) && $val['field_icon'] ){

+						echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';

+					}else{

+						echo '<i class="fa fa-cog" aria-hidden="true"></i>';

+					}?>

                     <?php echo $val['site_title'];?>

                 </a>

             </li>

 

 

             <?php

-        }

-    ?>

+		}

+	?>

     </ul>

     <?php

 }

@@ -489,28 +489,28 @@ 
  */

 function geodir_sorting_options_selected_fields()

 {

-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

-    ?>

+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

+	?>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul class="core">

     <?php 

-        global $wpdb;

+		global $wpdb;

         

-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));

+		$fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));

 

-        if (!empty($fields)) {

-            foreach ($fields as $field) {

-                //$result_str = $field->id;

-                $result_str = $field;

-                $field_type = $field->field_type;

-                $field_ins_upd = 'display';

+		if (!empty($fields)) {

+			foreach ($fields as $field) {

+				//$result_str = $field->id;

+				$result_str = $field;

+				$field_type = $field->field_type;

+				$field_ins_upd = 'display';

 

-                $default = false;

+				$default = false;

 

-                geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd, $default);

-            }

-        }

-    ?>

+				geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd, $default);

+			}

+		}

+	?>

     </ul>

     <?php

 }

@@ -523,12 +523,12 @@ 
  */

 function geodir_custom_fields_custom($post_type=''){

 

-    $custom_fields = array();

+	$custom_fields = array();

 

-    /**

-     * @see `geodir_custom_fields`

-     */

-    return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);

+	/**

+	 * @see `geodir_custom_fields`

+	 */

+	return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);

 }

 

 

@@ -541,140 +541,140 @@ 
  */

 function geodir_custom_fields($post_type=''){

     

-    $custom_fields = array(

-        'text' => array(

-            'field_type'  =>  'text',

-            'class' =>  'gd-text',

-            'icon'  =>  'fa fa-minus',

-            'name'  =>  __('Text', 'geodirectory'),

-            'description' =>  __('Add any sort of text field, text or numbers', 'geodirectory')

-        ),

-        'datepicker' => array(

-            'field_type'  =>  'datepicker',

-            'class' =>  'gd-datepicker',

-            'icon'  =>  'fa fa-calendar',

-            'name'  =>  __('Date', 'geodirectory'),

-            'description' =>  __('Adds a date picker.', 'geodirectory')

-        ),

-        'textarea' => array(

-            'field_type'  =>  'textarea',

-            'class' =>  'gd-textarea',

-            'icon'  =>  'fa fa-bars',

-            'name'  =>  __('Textarea', 'geodirectory'),

-            'description' =>  __('Adds a textarea', 'geodirectory')

-        ),

-        'time' => array(

-            'field_type'  =>  'time',

-            'class' =>  'gd-time',

-            'icon' =>  'fa fa-clock-o',

-            'name'  =>  __('Time', 'geodirectory'),

-            'description' =>  __('Adds a time picker', 'geodirectory')

-        ),

-        'checkbox' => array(

-            'field_type'  =>  'checkbox',

-            'class' =>  'gd-checkbox',

-            'icon' =>  'fa fa-check-square-o',

-            'name'  =>  __('Checkbox', 'geodirectory'),

-            'description' =>  __('Adds a checkbox', 'geodirectory')

-        ),

-        'phone' => array(

-            'field_type'  =>  'phone',

-            'class' =>  'gd-phone',

-            'icon' =>  'fa fa-phone',

-            'name'  =>  __('Phone', 'geodirectory'),

-            'description' =>  __('Adds a phone input', 'geodirectory')

-        ),

-        'radio' => array(

-            'field_type'  =>  'radio',

-            'class' =>  'gd-radio',

-            'icon' =>  'fa fa-dot-circle-o',

-            'name'  =>  __('Radio', 'geodirectory'),

-            'description' =>  __('Adds a radio input', 'geodirectory')

-        ),

-        'email' => array(

-            'field_type'  =>  'email',

-            'class' =>  'gd-email',

-            'icon' =>  'fa fa-envelope-o',

-            'name'  =>  __('Email', 'geodirectory'),

-            'description' =>  __('Adds a email input', 'geodirectory')

-        ),

-        'select' => array(

-            'field_type'  =>  'select',

-            'class' =>  'gd-select',

-            'icon' =>  'fa fa-caret-square-o-down',

-            'name'  =>  __('Select', 'geodirectory'),

-            'description' =>  __('Adds a select input', 'geodirectory')

-        ),

-        'multiselect' => array(

-            'field_type'  =>  'multiselect',

-            'class' =>  'gd-multiselect',

-            'icon' =>  'fa fa-caret-square-o-down',

-            'name'  =>  __('Multi Select', 'geodirectory'),

-            'description' =>  __('Adds a multiselect input', 'geodirectory')

-        ),

-        'url' => array(

-            'field_type'  =>  'url',

-            'class' =>  'gd-url',

-            'icon' =>  'fa fa-link',

-            'name'  =>  __('URL', 'geodirectory'),

-            'description' =>  __('Adds a url input', 'geodirectory')

-        ),

-        'html' => array(

-            'field_type'  =>  'html',

-            'class' =>  'gd-html',

-            'icon' =>  'fa fa-code',

-            'name'  =>  __('HTML', 'geodirectory'),

-            'description' =>  __('Adds a html input textarea', 'geodirectory')

-        ),

-        'file' => array(

-            'field_type'  =>  'file',

-            'class' =>  'gd-file',

-            'icon' =>  'fa fa-file',

-            'name'  =>  __('File Upload', 'geodirectory'),

-            'description' =>  __('Adds a file input', 'geodirectory')

-        )

-    );

-

-    /**

-     * Filter the custom fields array to be able to add or remove items.

-     * 

-     * @since 1.6.6

-     *

-     * @param array $custom_fields {

-     *     The custom fields array to be filtered.

-     *

-     *     @type string $field_type The type of field, eg: text, datepicker, textarea, time, checkbox, phone, radio, email, select, multiselect, url, html, file.

-     *     @type string $class The class for the field in backend.

-     *     @type string $icon Can be font-awesome class name or icon image url.

-     *     @type string $name The name of the field.

-     *     @type string $description A short description about the field.

-     *     @type array $defaults {

-     *                    Optional. Used to set the default value of the field.

-     *

-     *                    @type string data_type The SQL data type for the field. VARCHAR, TEXT, TIME, TINYINT, INT, FLOAT, DATE

-     *                    @type int decimal_point limit if using FLOAT data_type

-     *                    @type string admin_title The admin title for the field.

-     *                    @type string site_title This will be the title for the field on the frontend.

-     *                    @type string admin_desc This will be shown below the field on the add listing form.

-     *                    @type string htmlvar_name This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters.

-     *                    @type bool is_active If false the field will not be displayed anywhere.

-     *                    @type bool for_admin_use If true then only site admin can see and edit this field.

-     *                    @type string default_value The default value for the input on the add listing page.

-     *                    @type string show_in The locations to show in. [detail],[moreinfo],[listing],[owntab],[mapbubble]

-     *                    @type bool is_required If true the field will be required on the add listing page.

-     *                    @type string option_values The option values for select and multiselect only

-     *                    @type string validation_pattern HTML5 validation pattern (text input only by default).

-     *                    @type string validation_msg HTML5 validation message (text input only by default).

-     *                    @type string required_msg Required warning message.

-     *                    @type string field_icon Icon url or font awesome class.

-     *                    @type string css_class Field custom css class for field custom style.

-     *                    @type bool cat_sort If true the field will appear in the category sort options, if false the field will be hidden, leave blank to show option.

-     *                    @type bool cat_sort If true the field will appear in the advanced search sort options, if false the field will be hidden, leave blank to show option. (advanced search addon required)

-     *     }

-     * }

-     * @param string $post_type The post type requested.

-     */

-    return apply_filters('geodir_custom_fields',$custom_fields,$post_type);

+	$custom_fields = array(

+		'text' => array(

+			'field_type'  =>  'text',

+			'class' =>  'gd-text',

+			'icon'  =>  'fa fa-minus',

+			'name'  =>  __('Text', 'geodirectory'),

+			'description' =>  __('Add any sort of text field, text or numbers', 'geodirectory')

+		),

+		'datepicker' => array(

+			'field_type'  =>  'datepicker',

+			'class' =>  'gd-datepicker',

+			'icon'  =>  'fa fa-calendar',

+			'name'  =>  __('Date', 'geodirectory'),

+			'description' =>  __('Adds a date picker.', 'geodirectory')

+		),

+		'textarea' => array(

+			'field_type'  =>  'textarea',

+			'class' =>  'gd-textarea',

+			'icon'  =>  'fa fa-bars',

+			'name'  =>  __('Textarea', 'geodirectory'),

+			'description' =>  __('Adds a textarea', 'geodirectory')

+		),

+		'time' => array(

+			'field_type'  =>  'time',

+			'class' =>  'gd-time',

+			'icon' =>  'fa fa-clock-o',

+			'name'  =>  __('Time', 'geodirectory'),

+			'description' =>  __('Adds a time picker', 'geodirectory')

+		),

+		'checkbox' => array(

+			'field_type'  =>  'checkbox',

+			'class' =>  'gd-checkbox',

+			'icon' =>  'fa fa-check-square-o',

+			'name'  =>  __('Checkbox', 'geodirectory'),

+			'description' =>  __('Adds a checkbox', 'geodirectory')

+		),

+		'phone' => array(

+			'field_type'  =>  'phone',

+			'class' =>  'gd-phone',

+			'icon' =>  'fa fa-phone',

+			'name'  =>  __('Phone', 'geodirectory'),

+			'description' =>  __('Adds a phone input', 'geodirectory')

+		),

+		'radio' => array(

+			'field_type'  =>  'radio',

+			'class' =>  'gd-radio',

+			'icon' =>  'fa fa-dot-circle-o',

+			'name'  =>  __('Radio', 'geodirectory'),

+			'description' =>  __('Adds a radio input', 'geodirectory')

+		),

+		'email' => array(

+			'field_type'  =>  'email',

+			'class' =>  'gd-email',

+			'icon' =>  'fa fa-envelope-o',

+			'name'  =>  __('Email', 'geodirectory'),

+			'description' =>  __('Adds a email input', 'geodirectory')

+		),

+		'select' => array(

+			'field_type'  =>  'select',

+			'class' =>  'gd-select',

+			'icon' =>  'fa fa-caret-square-o-down',

+			'name'  =>  __('Select', 'geodirectory'),

+			'description' =>  __('Adds a select input', 'geodirectory')

+		),

+		'multiselect' => array(

+			'field_type'  =>  'multiselect',

+			'class' =>  'gd-multiselect',

+			'icon' =>  'fa fa-caret-square-o-down',

+			'name'  =>  __('Multi Select', 'geodirectory'),

+			'description' =>  __('Adds a multiselect input', 'geodirectory')

+		),

+		'url' => array(

+			'field_type'  =>  'url',

+			'class' =>  'gd-url',

+			'icon' =>  'fa fa-link',

+			'name'  =>  __('URL', 'geodirectory'),

+			'description' =>  __('Adds a url input', 'geodirectory')

+		),

+		'html' => array(

+			'field_type'  =>  'html',

+			'class' =>  'gd-html',

+			'icon' =>  'fa fa-code',

+			'name'  =>  __('HTML', 'geodirectory'),

+			'description' =>  __('Adds a html input textarea', 'geodirectory')

+		),

+		'file' => array(

+			'field_type'  =>  'file',

+			'class' =>  'gd-file',

+			'icon' =>  'fa fa-file',

+			'name'  =>  __('File Upload', 'geodirectory'),

+			'description' =>  __('Adds a file input', 'geodirectory')

+		)

+	);

+

+	/**

+	 * Filter the custom fields array to be able to add or remove items.

+	 * 

+	 * @since 1.6.6

+	 *

+	 * @param array $custom_fields {

+	 *     The custom fields array to be filtered.

+	 *

+	 *     @type string $field_type The type of field, eg: text, datepicker, textarea, time, checkbox, phone, radio, email, select, multiselect, url, html, file.

+	 *     @type string $class The class for the field in backend.

+	 *     @type string $icon Can be font-awesome class name or icon image url.

+	 *     @type string $name The name of the field.

+	 *     @type string $description A short description about the field.

+	 *     @type array $defaults {

+	 *                    Optional. Used to set the default value of the field.

+	 *

+	 *                    @type string data_type The SQL data type for the field. VARCHAR, TEXT, TIME, TINYINT, INT, FLOAT, DATE

+	 *                    @type int decimal_point limit if using FLOAT data_type

+	 *                    @type string admin_title The admin title for the field.

+	 *                    @type string site_title This will be the title for the field on the frontend.

+	 *                    @type string admin_desc This will be shown below the field on the add listing form.

+	 *                    @type string htmlvar_name This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters.

+	 *                    @type bool is_active If false the field will not be displayed anywhere.

+	 *                    @type bool for_admin_use If true then only site admin can see and edit this field.

+	 *                    @type string default_value The default value for the input on the add listing page.

+	 *                    @type string show_in The locations to show in. [detail],[moreinfo],[listing],[owntab],[mapbubble]

+	 *                    @type bool is_required If true the field will be required on the add listing page.

+	 *                    @type string option_values The option values for select and multiselect only

+	 *                    @type string validation_pattern HTML5 validation pattern (text input only by default).

+	 *                    @type string validation_msg HTML5 validation message (text input only by default).

+	 *                    @type string required_msg Required warning message.

+	 *                    @type string field_icon Icon url or font awesome class.

+	 *                    @type string css_class Field custom css class for field custom style.

+	 *                    @type bool cat_sort If true the field will appear in the category sort options, if false the field will be hidden, leave blank to show option.

+	 *                    @type bool cat_sort If true the field will appear in the advanced search sort options, if false the field will be hidden, leave blank to show option. (advanced search addon required)

+	 *     }

+	 * }

+	 * @param string $post_type The post type requested.

+	 */

+	return apply_filters('geodir_custom_fields',$custom_fields,$post_type);

 }

 

 /**

@@ -687,19 +687,19 @@ 
  */

 function geodir_custom_available_fields($type='')

 {

-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

-    ?>

+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

+	?>

     <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>" />

 

         <?php

-        if($type=='predefined'){

-            $cfs = geodir_custom_fields_predefined($listing_type);

-        }elseif($type=='custom'){

-            $cfs = geodir_custom_fields_custom($listing_type);

-        }else{

-            $cfs = geodir_custom_fields($listing_type);

-            ?>

+		if($type=='predefined'){

+			$cfs = geodir_custom_fields_predefined($listing_type);

+		}elseif($type=='custom'){

+			$cfs = geodir_custom_fields_custom($listing_type);

+		}else{

+			$cfs = geodir_custom_fields($listing_type);

+			?>

             <ul class="full gd-cf-tooltip-wrap">

                 <li>

                     <div class="gdcf-tooltip">

@@ -720,18 +720,18 @@ 
             </ul>

 

             <?php

-        }

+		}

 

-    if(!empty($cfs)) {

-        echo '<ul>';

-        foreach ( $cfs as $id => $cf ) {

-            ?>

+	if(!empty($cfs)) {

+		echo '<ul>';

+		foreach ( $cfs as $id => $cf ) {

+			?>

 

             <li class="gd-cf-tooltip-wrap">

                 <?php

-                if ( isset( $cf['description'] ) && $cf['description'] ) {

-                    echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>';

-                } ?>

+				if ( isset( $cf['description'] ) && $cf['description'] ) {

+					echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>';

+				} ?>

 

                 <a id="gd-<?php echo $id; ?>"

                    data-field-custom-type="<?php echo $type; ?>"

@@ -741,21 +741,21 @@ 
                    href="javascript:void(0);">

 

                     <?php if ( isset( $cf['icon'] ) && strpos( $cf['icon'], 'fa fa-' ) !== false ) {

-                        echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>';

-                    } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {

-                        echo '<b style="background-image: url("' . $cf['icon'] . '")"></b>';

-                    } else {

-                        echo '<i class="fa fa-cog" aria-hidden="true"></i>';

-                    } ?>

+						echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>';

+					} elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {

+						echo '<b style="background-image: url("' . $cf['icon'] . '")"></b>';

+					} else {

+						echo '<i class="fa fa-cog" aria-hidden="true"></i>';

+					} ?>

                     <?php echo $cf['name']; ?>

                 </a>

             </li>

             <?php

-        }

-    }else{

-        _e('There are no custom fields here yet.', 'geodirectory');

-    }

-        ?>

+		}

+	}else{

+		_e('There are no custom fields here yet.', 'geodirectory');

+	}

+		?>

 

 

     </ul>

@@ -774,26 +774,26 @@ 
  */

 function geodir_custom_selected_fields()

 {

-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

-    ?>

+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

+	?>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul class="core">

     <?php 

-        global $wpdb;

-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));

-

-        if (!empty($fields)) {

-            foreach ($fields as $field) {

-                //$result_str = $field->id;

-                $result_str = $field;

-                $field_type = $field->field_type;

-                $field_type_key = $field->field_type_key;

-                $field_ins_upd = 'display';

-

-                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key);

-            }

-        }

-        ?></ul>

+		global $wpdb;

+		$fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));

+

+		if (!empty($fields)) {

+			foreach ($fields as $field) {

+				//$result_str = $field->id;

+				$result_str = $field;

+				$field_type = $field->field_type;

+				$field_type_key = $field->field_type_key;

+				$field_ins_upd = 'display';

+

+				geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key);

+			}

+		}

+		?></ul>

 <?php

 

 }

@@ -812,16 +812,16 @@ 
 function geodir_custom_fields_panel_head($heading, $sub_tab, $listing_type)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            $heading = sprintf(__('Manage %s Custom Fields', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			$heading = sprintf(__('Manage %s Custom Fields', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

 

-        case 'sorting_options':

-            $heading = sprintf(__('Manage %s Listing Sorting Options Fields', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

-    }

-    return $heading;

+		case 'sorting_options':

+			$heading = sprintf(__('Manage %s Listing Sorting Options Fields', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

+	}

+	return $heading;

 }

 

 

@@ -839,16 +839,16 @@ 
 function geodir_cf_panel_available_fields_head($heading, $sub_tab, $listing_type)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            $heading = sprintf(__('Add new %s form field', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			$heading = sprintf(__('Add new %s form field', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

 

-        case 'sorting_options':

-            $heading = sprintf(__('Available sorting options for %s listing and search results', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

-    }

-    return $heading;

+		case 'sorting_options':

+			$heading = sprintf(__('Available sorting options for %s listing and search results', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

+	}

+	return $heading;

 }

 

 

@@ -866,16 +866,16 @@ 
 function geodir_cf_panel_available_fields_note($note, $sub_tab, $listing_type)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            $note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type));;

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			$note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type));;

+			break;

 

-        case 'sorting_options':

-            $note = sprintf(__('Click on any box below to make it appear in the sorting option dropdown on %s listing and search results.<br />To make a field available here, go to custom fields tab and expand any field from selected fields panel and tick the checkbox saying \'Include this field in sort option\'.', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

-    }

-    return $note;

+		case 'sorting_options':

+			$note = sprintf(__('Click on any box below to make it appear in the sorting option dropdown on %s listing and search results.<br />To make a field available here, go to custom fields tab and expand any field from selected fields panel and tick the checkbox saying \'Include this field in sort option\'.', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

+	}

+	return $note;

 }

 

 

@@ -893,16 +893,16 @@ 
 function geodir_cf_panel_selected_fields_head($heading, $sub_tab, $listing_type)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            $heading = sprintf(__('List of fields that will appear on add new %s listing form', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			$heading = sprintf(__('List of fields that will appear on add new %s listing form', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

 

-        case 'sorting_options':

-            $heading = sprintf(__('List of fields that will appear in %s listing and search results sorting option dropdown box.', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

-    }

-    return $heading;

+		case 'sorting_options':

+			$heading = sprintf(__('List of fields that will appear in %s listing and search results sorting option dropdown box.', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

+	}

+	return $heading;

 }

 

 

@@ -920,16 +920,16 @@ 
 function geodir_cf_panel_selected_fields_note($note, $sub_tab, $listing_type)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type));;

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			$note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type));;

+			break;

 

-        case 'sorting_options':

-            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order in sorting option dropdown box on %s listing and search results page.', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

-    }

-    return $note;

+		case 'sorting_options':

+			$note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order in sorting option dropdown box on %s listing and search results page.', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

+	}

+	return $note;

 }

 

 

@@ -945,16 +945,16 @@ 
  */

 function geodir_remove_unnecessary_fields()

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    if (!get_option('geodir_remove_unnecessary_fields')) {

+	if (!get_option('geodir_remove_unnecessary_fields')) {

 

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))

-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");

+		if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))

+			$wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");

 

-        update_option('geodir_remove_unnecessary_fields', '1');

+		update_option('geodir_remove_unnecessary_fields', '1');

 

-    }

+	}

 

 }

 

@@ -972,25 +972,25 @@ 
  */

 function geodir_admin_ajax_handler()

 {

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

-        $geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action'];

-        switch ($geodir_admin_ajax_action) {

-            case 'diagnosis' :

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

-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

-                call_user_func('geodir_diagnose_' . $diagnose_this);

-                exit();

-                break;

-

-            case 'diagnosis-fix' :

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

-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

-                call_user_func('geodir_diagnose_' . $diagnose_this);

-                exit();

-                break;

-        }

-    }

-    exit();

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

+		$geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action'];

+		switch ($geodir_admin_ajax_action) {

+			case 'diagnosis' :

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

+					$diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

+				call_user_func('geodir_diagnose_' . $diagnose_this);

+				exit();

+				break;

+

+			case 'diagnosis-fix' :

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

+					$diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

+				call_user_func('geodir_diagnose_' . $diagnose_this);

+				exit();

+				break;

+		}

+	}

+	exit();

 }

 

 

@@ -1008,127 +1008,127 @@ 
  */

 function geodir_diagnose_multisite_table($filter_arr, $table, $tabel_name, $fix)

 {

-    global $wpdb;

-    //$filter_arr['output_str'] .='###'.$table.'###';

-    if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-    } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-        $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-        if ($fix) {

-            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count

-            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count

-

-            if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2

-                //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;

-

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table

-

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

-                }

-

-            } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it

-

-                $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table

-

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

-                }

-

-            } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors

-

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2

-

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

-                }

-

-            }

-

-        }

-

-

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-        if ($fix) {

-            if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it

-                if ($wpdb->query("DROP TABLE IF EXISTS $table")) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";

-                }

-

-            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original

-                if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

-                }

-                if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

-                }

-            } else {// else rename the original table to _ms_bak

-                if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

-                }

-            }

-        }

-

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-        if ($fix) {

-            // if original table exists but new does not, rename

-            if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

-            } else {

-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

-            }

-

-        }

-

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-        if ($fix) {

-            // if original table does not exist try deleting db_vers of all addons so the initial db_install scripts run;

-            delete_option('geodirlocation_db_version');

-            delete_option('geodirevents_db_version');

-            delete_option('geodir_reviewrating_db_version');

-            delete_option('gdevents_db_version');

-            delete_option('geodirectory_db_version');

-            delete_option('geodirclaim_db_version');

-            delete_option('geodir_custom_posts_db_version');

-            delete_option('geodir_reviewratings_db_version');

-            delete_option('geodiradvancesearch_db_version');

-            $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";

-        }

-

-    } else {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";

-    }

-    return $filter_arr;

+	global $wpdb;

+	//$filter_arr['output_str'] .='###'.$table.'###';

+	if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {

+		$filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+	} elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+		$filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+		if ($fix) {

+			$ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count

+			$new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count

+

+			if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2

+				//$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;

+

+				$wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table

+

+				if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

+					$filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+				}

+

+			} elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it

+

+				$wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2

+				$wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table

+

+				if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+				}

+

+			} elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors

+

+				$wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2

+

+				if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+				}

+

+			}

+

+		}

+

+

+	} elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+		if ($fix) {

+			if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it

+				if ($wpdb->query("DROP TABLE IF EXISTS $table")) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";

+				}

+

+			} elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original

+				if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

+				}

+				if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+				}

+			} else {// else rename the original table to _ms_bak

+				if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

+				}

+			}

+		}

+

+	} elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+		if ($fix) {

+			// if original table exists but new does not, rename

+			if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+				$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+			} else {

+				$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+			}

+

+		}

+

+	} elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+		if ($fix) {

+			// if original table does not exist try deleting db_vers of all addons so the initial db_install scripts run;

+			delete_option('geodirlocation_db_version');

+			delete_option('geodirevents_db_version');

+			delete_option('geodir_reviewrating_db_version');

+			delete_option('gdevents_db_version');

+			delete_option('geodirectory_db_version');

+			delete_option('geodirclaim_db_version');

+			delete_option('geodir_custom_posts_db_version');

+			delete_option('geodir_reviewratings_db_version');

+			delete_option('geodiradvancesearch_db_version');

+			$filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";

+		}

+

+	} else {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";

+	}

+	return $filter_arr;

 }

 

 

@@ -1142,53 +1142,53 @@ 
  */

 function geodir_diagnose_tags_sync()

 {

-    global $wpdb, $plugin_prefix;

-    $fix = isset($_POST['fix']) ? true : false;

-

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

-

-

-    $all_postypes = geodir_get_posttypes();

-

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CPT

-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

-

-            if (!empty($posts)) {

-

-                foreach ($posts as $p) {

-                    $p->post_type = $key;

-                    $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));

-                    if (empty($raw_tags)) {

-                        $post_tags = '';

-                    } else {

-                        $post_tags = implode(",", $raw_tags);

-                    }

-                    $tablename = $plugin_prefix . $p->post_type . '_detail';

-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

-

-                }

-                $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

-            }

-

-        }

-

-    }

-

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb, $plugin_prefix;

+	$fix = isset($_POST['fix']) ? true : false;

+

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

+

+

+	$all_postypes = geodir_get_posttypes();

+

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CPT

+			$posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

+

+			if (!empty($posts)) {

+

+				foreach ($posts as $p) {

+					$p->post_type = $key;

+					$raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));

+					if (empty($raw_tags)) {

+						$post_tags = '';

+					} else {

+						$post_tags = implode(",", $raw_tags);

+					}

+					$tablename = $plugin_prefix . $p->post_type . '_detail';

+					$wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

+

+				}

+				$output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

+			}

+

+		}

+

+	}

+

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1204,75 +1204,75 @@ 
  */

 function geodir_diagnose_cats_sync()

 {

-    global $wpdb, $plugin_prefix;

-    $fix = isset($_POST['fix']) ? true : false;

+	global $wpdb, $plugin_prefix;

+	$fix = isset($_POST['fix']) ? true : false;

 

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

 

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CTP

-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CTP

+			$posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");

 

-            if (!empty($posts)) {

+			if (!empty($posts)) {

 

-                foreach ($posts as $p) {

-                    $p->post_type = $key;

-                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));

+				foreach ($posts as $p) {

+					$p->post_type = $key;

+					$raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));

 

-                    if (empty($raw_cats)) {

-                        $post_categories = get_post_meta($p->post_id, 'post_categories', true);

+					if (empty($raw_cats)) {

+						$post_categories = get_post_meta($p->post_id, 'post_categories', true);

 

-                        if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {

-                            $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);

-                            foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {

-                                if (is_numeric($cat_part)) {

-                                    $raw_cats[] = (int)$cat_part;

-                                }

-                            }

+						if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {

+							$post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);

+							foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {

+								if (is_numeric($cat_part)) {

+									$raw_cats[] = (int)$cat_part;

+								}

+							}

 

-                        }

+						}

 

-                        if (!empty($raw_cats)) {

-                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');

+						if (!empty($raw_cats)) {

+							$term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');

 

-                        }

+						}

 

-                    }

+					}

 

 

-                    if (empty($raw_cats)) {

-                        $post_cats = '';

-                    } else {

-                        $post_cats = ',' . implode(",", $raw_cats) . ',';

-                    }

-                    $tablename = $plugin_prefix . $p->post_type . '_detail';

-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));

-                }

+					if (empty($raw_cats)) {

+						$post_cats = '';

+					} else {

+						$post_cats = ',' . implode(",", $raw_cats) . ',';

+					}

+					$tablename = $plugin_prefix . $p->post_type . '_detail';

+					$wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));

+				}

 

-            }

-            $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

+			}

+			$output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

 

-        }

+		}

 

-    }

+	}

 

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1286,61 +1286,61 @@ 
  */

 function geodir_diagnose_version_clear()

 {

-    global $wpdb, $plugin_prefix;

-    $fix = isset($_POST['fix']) ? true : false;

-

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

-

-

-    $gd_arr = array('GeoDirectory' => 'geodirectory_db_version',

-        'Payment Manager' => 'geodir_payments_db_version',

-        'GeoDirectory Framework' => 'gdf_db_version',

-        'Advanced Search' => 'geodiradvancesearch_db_version',

-        'Review Rating Manager' => 'geodir_reviewratings_db_version',

-        'Claim Manager' => 'geodirclaim_db_version',

-        'CPT Manager' => 'geodir_custom_posts_db_version',

-        'Location Manager' => 'geodirlocation_db_version',

-        'Payment Manager' => 'geodir_payments_db_version',

-        'Events Manager' => 'geodirevents_db_version',

-    );

-

-    /**

-     * Filter the array of plugins to clear the version numbers for in the GD >Tools : clear all version numbers.

-     *

-     * @since 1.0.0

-     * @param array $gd_arr The array or addons to clear, array('GeoDirectory' => 'geodirectory_db_version',...

-     */

-    $ver_arr = apply_filters('geodir_db_version_name', $gd_arr);

-

-    if (!empty($ver_arr)) {

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

-            if (delete_option($val)) {

-                $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";

-            } else {

-                $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";

-            }

-

-        }

-

-        if ($output_str) {

-            $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";

-        }

-

-    }

-

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb, $plugin_prefix;

+	$fix = isset($_POST['fix']) ? true : false;

+

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

+

+

+	$gd_arr = array('GeoDirectory' => 'geodirectory_db_version',

+		'Payment Manager' => 'geodir_payments_db_version',

+		'GeoDirectory Framework' => 'gdf_db_version',

+		'Advanced Search' => 'geodiradvancesearch_db_version',

+		'Review Rating Manager' => 'geodir_reviewratings_db_version',

+		'Claim Manager' => 'geodirclaim_db_version',

+		'CPT Manager' => 'geodir_custom_posts_db_version',

+		'Location Manager' => 'geodirlocation_db_version',

+		'Payment Manager' => 'geodir_payments_db_version',

+		'Events Manager' => 'geodirevents_db_version',

+	);

+

+	/**

+	 * Filter the array of plugins to clear the version numbers for in the GD >Tools : clear all version numbers.

+	 *

+	 * @since 1.0.0

+	 * @param array $gd_arr The array or addons to clear, array('GeoDirectory' => 'geodirectory_db_version',...

+	 */

+	$ver_arr = apply_filters('geodir_db_version_name', $gd_arr);

+

+	if (!empty($ver_arr)) {

+		foreach ($ver_arr as $key => $val) {

+			if (delete_option($val)) {

+				$output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";

+			} else {

+				$output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";

+			}

+

+		}

+

+		if ($output_str) {

+			$output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";

+		}

+

+	}

+

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1354,59 +1354,59 @@ 
  */

 function geodir_diagnose_ratings()

 {

-    global $wpdb;

-    $fix = isset($_POST['fix']) ? true : false;

-

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

-

-    // check review locations

-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {

-        $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";

-        $is_error_during_diagnose = true;

-

-        if ($fix) {

-            if (geodir_fix_review_location()) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-

-    } else {

-        $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";

-    }

-

-    // check review content

-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {

-        $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";

-        $is_error_during_diagnose = true;

-

-        if ($fix) {

-            if (geodir_fix_review_content()) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-

-    } else {

-        $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";

-    }

-

-

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb;

+	$fix = isset($_POST['fix']) ? true : false;

+

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

+

+	// check review locations

+	if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {

+		$output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";

+		$is_error_during_diagnose = true;

+

+		if ($fix) {

+			if (geodir_fix_review_location()) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+

+	} else {

+		$output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";

+	}

+

+	// check review content

+	if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {

+		$output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";

+		$is_error_during_diagnose = true;

+

+		if ($fix) {

+			if (geodir_fix_review_content()) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+

+	} else {

+		$output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";

+	}

+

+

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1420,57 +1420,57 @@ 
  */

 function geodir_diagnose_multisite_conversion()

 {

-    global $wpdb;

-    $fix = isset($_POST['fix']) ? true : false;

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

-

-    $filter_arr = array();

-    $filter_arr['output_str'] = $output_str;

-    $filter_arr['is_error_during_diagnose'] = $is_error_during_diagnose;

-    $table_arr = array('geodir_countries' => __('Countries', 'geodirectory'),

-        'geodir_custom_fields' => __('Custom fields', 'geodirectory'),

-        'geodir_post_icon' => __('Post icon', 'geodirectory'),

-        'geodir_attachments' => __('Attachments', 'geodirectory'),

-        'geodir_post_review' => __('Reviews', 'geodirectory'),

-        'geodir_custom_sort_fields' => __('Custom sort fields', 'geodirectory'),

-        'geodir_gd_place_detail' => __('Place detail', 'geodirectory')

-    );

-

-    // allow other addons to hook in and add their checks

-

-    /**

-     * Filter the array of tables.

-     *

-     * Filter the array of tables to check during the GD>Tools multisite DB conversion tool check, this allows addons to add their DB tables to the checks.

-     *

-     * @since 1.0.0

-     * @param array $table_arr The array of tables to check, array('geodir_countries' => __('Countries', 'geodirectory'),...

-     */

-    $table_arr = apply_filters('geodir_diagnose_multisite_conversion', $table_arr);

-

-    foreach ($table_arr as $table => $table_name) {

-        // Diagnose table

-        $filter_arr = geodir_diagnose_multisite_table($filter_arr, $table, $table_name, $fix);

-    }

-

-

-    $output_str = $filter_arr['output_str'];

-    $is_error_during_diagnose = $filter_arr['is_error_during_diagnose'];

-

-

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb;

+	$fix = isset($_POST['fix']) ? true : false;

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

+

+	$filter_arr = array();

+	$filter_arr['output_str'] = $output_str;

+	$filter_arr['is_error_during_diagnose'] = $is_error_during_diagnose;

+	$table_arr = array('geodir_countries' => __('Countries', 'geodirectory'),

+		'geodir_custom_fields' => __('Custom fields', 'geodirectory'),

+		'geodir_post_icon' => __('Post icon', 'geodirectory'),

+		'geodir_attachments' => __('Attachments', 'geodirectory'),

+		'geodir_post_review' => __('Reviews', 'geodirectory'),

+		'geodir_custom_sort_fields' => __('Custom sort fields', 'geodirectory'),

+		'geodir_gd_place_detail' => __('Place detail', 'geodirectory')

+	);

+

+	// allow other addons to hook in and add their checks

+

+	/**

+	 * Filter the array of tables.

+	 *

+	 * Filter the array of tables to check during the GD>Tools multisite DB conversion tool check, this allows addons to add their DB tables to the checks.

+	 *

+	 * @since 1.0.0

+	 * @param array $table_arr The array of tables to check, array('geodir_countries' => __('Countries', 'geodirectory'),...

+	 */

+	$table_arr = apply_filters('geodir_diagnose_multisite_conversion', $table_arr);

+

+	foreach ($table_arr as $table => $table_name) {

+		// Diagnose table

+		$filter_arr = geodir_diagnose_multisite_table($filter_arr, $table, $table_name, $fix);

+	}

+

+

+	$output_str = $filter_arr['output_str'];

+	$is_error_during_diagnose = $filter_arr['is_error_during_diagnose'];

+

+

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 }

 

 /**

@@ -1488,39 +1488,39 @@ 
  */

 function geodir_fix_virtual_page($slug, $page_title, $old_id, $option)

 {

-    global $wpdb, $current_user;

-

-    if (!empty($old_id)) {

-        wp_delete_post($old_id, true);

-    }//delete post if already there

-    else {

-        $page_found = $wpdb->get_var(

-            $wpdb->prepare(

-                "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

-                array($slug)

-            )

-        );

-        wp_delete_post($page_found, true);

-

-    }

-

-    $page_data = array(

-        'post_status' => 'publish',

-        'post_type' => 'page',

-        'post_author' => $current_user->ID,

-        'post_name' => $slug,

-        'post_title' => $page_title,

-        'post_content' => '',

-        'post_parent' => 0,

-        'comment_status' => 'closed'

-    );

-    $page_id = wp_insert_post($page_data);

-    update_option($option, $page_id);

-    if ($page_id) {

-        return true;

-    } else {

-        return false;

-    }

+	global $wpdb, $current_user;

+

+	if (!empty($old_id)) {

+		wp_delete_post($old_id, true);

+	}//delete post if already there

+	else {

+		$page_found = $wpdb->get_var(

+			$wpdb->prepare(

+				"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+				array($slug)

+			)

+		);

+		wp_delete_post($page_found, true);

+

+	}

+

+	$page_data = array(

+		'post_status' => 'publish',

+		'post_type' => 'page',

+		'post_author' => $current_user->ID,

+		'post_name' => $slug,

+		'post_title' => $page_title,

+		'post_content' => '',

+		'post_parent' => 0,

+		'comment_status' => 'closed'

+	);

+	$page_id = wp_insert_post($page_data);

+	update_option($option, $page_id);

+	if ($page_id) {

+		return true;

+	} else {

+		return false;

+	}

 }

 

 /**

@@ -1532,212 +1532,212 @@ 
  */

 function geodir_diagnose_default_pages()

 {

-    global $wpdb;

-    $is_error_during_diagnose = false;

-    $output_str = '';

-    $fix = isset($_POST['fix']) ? true : false;

-

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

-    /* Diagnose GD Home Page Starts */

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

-    $option_value = get_option('geodir_home_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

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

-    /* Diagnose GD Home Page Ends */

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

-

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

-    /* Diagnose Add Listing Page Starts */

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

-    $option_value = get_option('geodir_add_listing_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

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

-    /* Diagnose Add Listing Page Ends */

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

-

-

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

-    /* Diagnose Listing Preview Page Starts */

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

-    $option_value = get_option('geodir_preview_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

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

-    /* Diagnose Listing Preview Page Ends */

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

-

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

-    /* Diagnose Listing Success Page Starts */

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

-    $option_value = get_option('geodir_success_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

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

-    /* Diagnose Listing Sucess Page Ends */

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

-

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

-    /* Diagnose Info Page Starts */

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

-    $option_value = get_option('geodir_info_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

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

-    /* Diagnose Info Page Ends */

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

-

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

-    /* Diagnose Login Page Starts */

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

-    $option_value = get_option('geodir_login_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

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

-    /* Diagnose Info Page Ends */

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

-

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

-    /* Diagnose Location Page Starts */

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

-    $option_value = get_option('geodir_location_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

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

-    /* Diagnose Location Page Ends */

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

-

-    $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );

-    /**

-     * This action is called at the end of the GD Tools page check function.

-     *

-     * @since 1.5.2

-     */

-    $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);

-

-    $output_str = $page_chk_arr['output_str'];

-    $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];

-

-    if ($is_error_during_diagnose) {

-        if ($fix) {

-            flush_rewrite_rules();

-        }

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb;

+	$is_error_during_diagnose = false;

+	$output_str = '';

+	$fix = isset($_POST['fix']) ? true : false;

+

+	//////////////////////////////////

+	/* Diagnose GD Home Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_home_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose GD Home Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Add Listing Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_add_listing_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Add Listing Page Ends */

+	////////////////////////////////

+

+

+	//////////////////////////////////

+	/* Diagnose Listing Preview Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_preview_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Listing Preview Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Listing Success Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_success_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Listing Sucess Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Info Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_info_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Info Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Login Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_login_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Info Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Location Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_location_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Location Page Ends */

+	////////////////////////////////

+

+	$page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );

+	/**

+	 * This action is called at the end of the GD Tools page check function.

+	 *

+	 * @since 1.5.2

+	 */

+	$page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);

+

+	$output_str = $page_chk_arr['output_str'];

+	$is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];

+

+	if ($is_error_during_diagnose) {

+		if ($fix) {

+			flush_rewrite_rules();

+		}

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1749,26 +1749,26 @@ 
  * @global object $wpdb WordPress Database object.

  */

 function geodir_diagnose_load_db_language() {

-    global $wpdb;

+	global $wpdb;

 	

 	$is_error_during_diagnose = geodirectory_load_db_language();

 

-    $output_str = '';

-    $fix_button_txt = '';

+	$output_str = '';

+	$fix_button_txt = '';

 

-    if ($is_error_during_diagnose) {

-        $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";

+	if ($is_error_during_diagnose) {

+		$output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";

 		$info_div_class = "geodir_problem_info";

-    } else {

-        $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";

+	} else {

+		$output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";

 		$info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

+		$fix_button_txt = '';

+	}

     

 	echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1799,23 +1799,23 @@ 
  */

 function geodir_posts_clauses_request($clauses)

 {

-    global $wpdb, $wp_query, $plugin_prefix;

+	global $wpdb, $wp_query, $plugin_prefix;

 

-    if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {

-        $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';

+	if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {

+		$table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';

 

-        $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';

-        $clauses['join'] = $join;

+		$join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';

+		$clauses['join'] = $join;

 

-        $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';

-        $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';

-        $clauses['fields'] = $fields;

+		$fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';

+		$fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';

+		$clauses['fields'] = $fields;

 

-        $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';

-        $orderby = 'gd_expire ' . $order;

-        $clauses['orderby'] = $orderby;

-    }

-    return $clauses;

+		$order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';

+		$orderby = 'gd_expire ' . $order;

+		$clauses['orderby'] = $orderby;

+	}

+	return $clauses;

 }

 

 

@@ -1836,7 +1836,7 @@ 
  */

 function gd_theme_switch_compat_check()

 {

-    gd_set_theme_compat();

+	gd_set_theme_compat();

 }

 

 /**

@@ -1849,27 +1849,27 @@ 
  */

 function geodir_str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\")

 {

-    if (function_exists('str_getcsv')) {

-        $fgetcsv = str_getcsv($input, $delimiter, $enclosure, $escape);

-    } else {

-        global $current_user;

-        $upload_dir = wp_upload_dir();

-

-        $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';

-        $handle = fopen($file, 'w');

-

-        fwrite($handle, $input);

-        fclose($handle);

-

-        $handle = fopen($file, 'rt');

-        if (PHP_VERSION >= '5.3.0') {

-            $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure, $escape);

-        } else {

-            $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure);

-        }

-        fclose($handle);

-    }

-    return $fgetcsv;

+	if (function_exists('str_getcsv')) {

+		$fgetcsv = str_getcsv($input, $delimiter, $enclosure, $escape);

+	} else {

+		global $current_user;

+		$upload_dir = wp_upload_dir();

+

+		$file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';

+		$handle = fopen($file, 'w');

+

+		fwrite($handle, $input);

+		fclose($handle);

+

+		$handle = fopen($file, 'rt');

+		if (PHP_VERSION >= '5.3.0') {

+			$fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure, $escape);

+		} else {

+			$fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure);

+		}

+		fclose($handle);

+	}

+	return $fgetcsv;

 }

 

 add_action('wp_ajax_gdImportCsv', 'geodir_ajax_import_csv');

@@ -1884,375 +1884,375 @@ 
  */

 function geodir_ajax_import_csv()

 {

-    error_reporting(0); // hide error to get clean json response

+	error_reporting(0); // hide error to get clean json response

 

-    global $wpdb, $plugin_prefix, $current_user;

-    $uploads = wp_upload_dir();

-    ini_set('auto_detect_line_endings', true);

+	global $wpdb, $plugin_prefix, $current_user;

+	$uploads = wp_upload_dir();

+	ini_set('auto_detect_line_endings', true);

 	

 	$wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

 

-    $task = isset($_POST['task']) ? $_POST['task'] : '';

-    $uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL;

-    $filename = $uploadedFile;

-

-    $uploads = wp_upload_dir();

-    $uploads_dir = $uploads['path'];

-    $image_name_arr = explode('/', $filename);

-    $filename = end($image_name_arr);

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

-    $return = array();

-    $return['file'] = $uploadedFile;

-    $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

-

-    if (is_file($target_path) && file_exists($target_path) && $uploadedFile) {

-        $wp_filetype = wp_check_filetype_and_ext($target_path, $filename);

-

-        if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

-            $return['error'] = NULL;

-

-            $return['rows'] = 0;

-

-

-

-                if (($handle = fopen($target_path, "r")) !== FALSE) {

-                    while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {

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

-                            $file[] = '"' . implode('","', $data) . '"';

-                        }

-                    }

-                    fclose($handle);

-                    $file = $file;

-                }

-

-

-

-                $return['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

-

-

-            if (!$return['rows'] > 0) {

-                $return['error'] = __('No data found in csv file.', 'geodirectory');

-            }

-        }

-    }

-    if ($task == 'prepare' || !empty($return['error'])) {

-        echo json_encode($return);

-        exit;

-    }

-

-    $totRecords = isset($_POST['gddata']['totRecords']) ? $_POST['gddata']['totRecords'] : NULL;

-    $importlimit = isset($_POST['gddata']['importlimit']) ? $_POST['gddata']['importlimit'] : 1;

-    $count = $importlimit;

-    $requested_limit = $importlimit;

-    $tmpCnt = isset($_POST['gddata']['tmpcount']) ? $_POST['gddata']['tmpcount'] : 0;

-

-    if ($count < $totRecords) {

-        $count = $tmpCnt + $count;

-        if ($count > $totRecords) {

-            $count = $totRecords;

-        }

-    } else {

-        $count = $totRecords;

-    }

-

-    $total_records = 0;

-    $rowcount = 0;

-    $address_invalid = 0;

-    $blank_address = 0;

-    $upload_files = 0;

-    $invalid_post_type = 0;

-    $invalid_title = 0;

-    $customKeyarray = array();

-    $gd_post_info = array();

-    $post_location = array();

-    $countpost = 0;

-

-    if (!empty($file)) {

-        $columns = isset($file[0]) ? geodir_str_getcsv($file[0]) : NULL;

-        $customKeyarray = $columns;

-

-        if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-            $return['error'] = CSV_INVAILD_FILE;

-            echo json_encode($return);

-            exit;

-        }

-

-        for ($i = 1; $i <= $importlimit; $i++) {

-            $current_index = $tmpCnt + $i;

-            if (isset($file[$current_index])) {

-                $total_records++;

-

-                $buffer = geodir_str_getcsv($file[$current_index]);

-                $post_title = addslashes($buffer[0]);

-                $current_post_author = $buffer[1];

-                $post_desc = addslashes($buffer[2]);

-                $post_cat = array();

-                $catids_arr = array();

-                $post_cat = trim($buffer[3]); // comma seperated category name

-

-                if ($post_cat) {

-                    $post_cat_arr = explode(',', $post_cat);

-

-                    for ($c = 0; $c < count($post_cat_arr); $c++) {

-                        $catid = wp_kses_normalize_entities(trim($post_cat_arr[$c]));

-

-                        if (!empty($buffer[5])) {

-                            if (in_array($buffer[5], geodir_get_posttypes())) {

-

-                                $p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5]));

-

-                                if (get_term_by('name', $catid, $p_taxonomy[0])) {

-                                    $cat = get_term_by('name', $catid, $p_taxonomy[0]);

-                                    $catids_arr[] = $cat->slug;

-                                } else if (get_term_by('slug', $catid, $p_taxonomy[0])) {

-                                    $cat = get_term_by('slug', $catid, $p_taxonomy[0]);

-                                    $catids_arr[] = $cat->slug;

-                                } else {

-                                    $ret = wp_insert_term($catid, $p_taxonomy[0]);

-                                    if ($ret && !is_wp_error($ret)) {

-                                        if (get_term_by('name', $catid, $p_taxonomy[0])) {

-                                            $cat = get_term_by('name', $catid, $p_taxonomy[0]);

-                                            $catids_arr[] = $cat->slug;

-                                        } elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {

-                                            $cat = get_term_by('slug', $catid, $p_taxonomy[0]);

-                                            $catids_arr[] = $cat->slug;

-                                        }

-                                    }

-                                }

-                            }

-                        }

-                    }

-                }

-

-                if (!$catids_arr) {

-                    $catids_arr[] = 1;

-                }

-

-                $post_tags = trim($buffer[4]); // comma seperated tags

-

-                $tag_arr = '';

-                if ($post_tags) {

-                    $tag_arr = explode(',', $post_tags);

-                }

-

-                $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database

-

-                $error = '';

-                if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {

-                    $invalid_post_type++;

-                    continue;

-                }

-

-                if ($post_title != '') {

-                    $menu_order = 0;

-                    $image_folder_name = 'uplaod/';

-

-                    $image_names = array();

-

-                    for ($c = 5; $c < count($customKeyarray); $c++) {

-                        $gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]);

-

-                        if ($customKeyarray[$c] == 'IMAGE') {

-                            $buffer[$c] = trim($buffer[$c]);

-

-                            if (!empty($buffer[$c])) {

-                                $image_names[] = $buffer[$c];

-                            }

-                        }

-

-                        if ($customKeyarray[$c] == 'alive_days') {

-                            if ($buffer[$c] != '0' && $buffer[$c] != '') {

-                                $submitdata = date('Y-m-d');

-

-                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));

-                            } else {

-                                $gd_post_info['expire_date'] = 'Never';

-                            }

-                        }

-

-                        if ($customKeyarray[$c] == 'post_city') {

-                            $post_city = addslashes($buffer[$c]);

-                        }

-

-                        if ($customKeyarray[$c] == 'post_region') {

-                            $post_region = addslashes($buffer[$c]);

-                        }

-

-                        if ($customKeyarray[$c] == 'post_country') {

-                            $post_country = addslashes($buffer[$c]);

-                        }

-

-                        if ($customKeyarray[$c] == 'post_latitude') {

-                            $post_latitude = addslashes($buffer[$c]);

-                        }

-

-                        if ($customKeyarray[$c] == 'post_longitude') {

-                            $post_longitude = addslashes($buffer[$c]);

-                        }

+	$task = isset($_POST['task']) ? $_POST['task'] : '';

+	$uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL;

+	$filename = $uploadedFile;

+

+	$uploads = wp_upload_dir();

+	$uploads_dir = $uploads['path'];

+	$image_name_arr = explode('/', $filename);

+	$filename = end($image_name_arr);

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

+	$return = array();

+	$return['file'] = $uploadedFile;

+	$return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

+

+	if (is_file($target_path) && file_exists($target_path) && $uploadedFile) {

+		$wp_filetype = wp_check_filetype_and_ext($target_path, $filename);

+

+		if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

+			$return['error'] = NULL;

+

+			$return['rows'] = 0;

+

+

+

+				if (($handle = fopen($target_path, "r")) !== FALSE) {

+					while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {

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

+							$file[] = '"' . implode('","', $data) . '"';

+						}

+					}

+					fclose($handle);

+					$file = $file;

+				}

+

+

+

+				$return['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

+

+

+			if (!$return['rows'] > 0) {

+				$return['error'] = __('No data found in csv file.', 'geodirectory');

+			}

+		}

+	}

+	if ($task == 'prepare' || !empty($return['error'])) {

+		echo json_encode($return);

+		exit;

+	}

+

+	$totRecords = isset($_POST['gddata']['totRecords']) ? $_POST['gddata']['totRecords'] : NULL;

+	$importlimit = isset($_POST['gddata']['importlimit']) ? $_POST['gddata']['importlimit'] : 1;

+	$count = $importlimit;

+	$requested_limit = $importlimit;

+	$tmpCnt = isset($_POST['gddata']['tmpcount']) ? $_POST['gddata']['tmpcount'] : 0;

+

+	if ($count < $totRecords) {

+		$count = $tmpCnt + $count;

+		if ($count > $totRecords) {

+			$count = $totRecords;

+		}

+	} else {

+		$count = $totRecords;

+	}

+

+	$total_records = 0;

+	$rowcount = 0;

+	$address_invalid = 0;

+	$blank_address = 0;

+	$upload_files = 0;

+	$invalid_post_type = 0;

+	$invalid_title = 0;

+	$customKeyarray = array();

+	$gd_post_info = array();

+	$post_location = array();

+	$countpost = 0;

+

+	if (!empty($file)) {

+		$columns = isset($file[0]) ? geodir_str_getcsv($file[0]) : NULL;

+		$customKeyarray = $columns;

+

+		if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+			$return['error'] = CSV_INVAILD_FILE;

+			echo json_encode($return);

+			exit;

+		}

+

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

+			$current_index = $tmpCnt + $i;

+			if (isset($file[$current_index])) {

+				$total_records++;

+

+				$buffer = geodir_str_getcsv($file[$current_index]);

+				$post_title = addslashes($buffer[0]);

+				$current_post_author = $buffer[1];

+				$post_desc = addslashes($buffer[2]);

+				$post_cat = array();

+				$catids_arr = array();

+				$post_cat = trim($buffer[3]); // comma seperated category name

+

+				if ($post_cat) {

+					$post_cat_arr = explode(',', $post_cat);

+

+					for ($c = 0; $c < count($post_cat_arr); $c++) {

+						$catid = wp_kses_normalize_entities(trim($post_cat_arr[$c]));

+

+						if (!empty($buffer[5])) {

+							if (in_array($buffer[5], geodir_get_posttypes())) {

+

+								$p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5]));

+

+								if (get_term_by('name', $catid, $p_taxonomy[0])) {

+									$cat = get_term_by('name', $catid, $p_taxonomy[0]);

+									$catids_arr[] = $cat->slug;

+								} else if (get_term_by('slug', $catid, $p_taxonomy[0])) {

+									$cat = get_term_by('slug', $catid, $p_taxonomy[0]);

+									$catids_arr[] = $cat->slug;

+								} else {

+									$ret = wp_insert_term($catid, $p_taxonomy[0]);

+									if ($ret && !is_wp_error($ret)) {

+										if (get_term_by('name', $catid, $p_taxonomy[0])) {

+											$cat = get_term_by('name', $catid, $p_taxonomy[0]);

+											$catids_arr[] = $cat->slug;

+										} elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {

+											$cat = get_term_by('slug', $catid, $p_taxonomy[0]);

+											$catids_arr[] = $cat->slug;

+										}

+									}

+								}

+							}

+						}

+					}

+				}

+

+				if (!$catids_arr) {

+					$catids_arr[] = 1;

+				}

+

+				$post_tags = trim($buffer[4]); // comma seperated tags

+

+				$tag_arr = '';

+				if ($post_tags) {

+					$tag_arr = explode(',', $post_tags);

+				}

+

+				$table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database

+

+				$error = '';

+				if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {

+					$invalid_post_type++;

+					continue;

+				}

+

+				if ($post_title != '') {

+					$menu_order = 0;

+					$image_folder_name = 'uplaod/';

+

+					$image_names = array();

+

+					for ($c = 5; $c < count($customKeyarray); $c++) {

+						$gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]);

+

+						if ($customKeyarray[$c] == 'IMAGE') {

+							$buffer[$c] = trim($buffer[$c]);

+

+							if (!empty($buffer[$c])) {

+								$image_names[] = $buffer[$c];

+							}

+						}

+

+						if ($customKeyarray[$c] == 'alive_days') {

+							if ($buffer[$c] != '0' && $buffer[$c] != '') {

+								$submitdata = date('Y-m-d');

+

+								$gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));

+							} else {

+								$gd_post_info['expire_date'] = 'Never';

+							}

+						}

+

+						if ($customKeyarray[$c] == 'post_city') {

+							$post_city = addslashes($buffer[$c]);

+						}

+

+						if ($customKeyarray[$c] == 'post_region') {

+							$post_region = addslashes($buffer[$c]);

+						}

+

+						if ($customKeyarray[$c] == 'post_country') {

+							$post_country = addslashes($buffer[$c]);

+						}

+

+						if ($customKeyarray[$c] == 'post_latitude') {

+							$post_latitude = addslashes($buffer[$c]);

+						}

+

+						if ($customKeyarray[$c] == 'post_longitude') {

+							$post_longitude = addslashes($buffer[$c]);

+						}

 						

 						// Post status

 						if ($customKeyarray[$c] == 'post_status') {

-                            $post_status = sanitize_key( $buffer[$c] );

-                        }

-                    }

-

-                    /* ================ before array create ============== */

-                    $location_result = geodir_get_default_location();

-                    if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {

-                        $blank_address++;

-                        continue;

-                    } else if ($location_result->location_id == 0) {

-                        if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) || (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) || (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))) {

-                            $address_invalid++;

-                            continue;

-                        }

-                    }

+							$post_status = sanitize_key( $buffer[$c] );

+						}

+					}

+

+					/* ================ before array create ============== */

+					$location_result = geodir_get_default_location();

+					if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {

+						$blank_address++;

+						continue;

+					} else if ($location_result->location_id == 0) {

+						if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) || (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) || (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))) {

+							$address_invalid++;

+							continue;

+						}

+					}

 					

 					// Default post status

 					$default_status = 'publish';

 					$post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

 					$post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

 

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

-                    $my_post['post_content'] = $post_desc;

-                    $my_post['post_type'] = addslashes($buffer[5]);

-                    $my_post['post_author'] = $current_post_author;

-                    $my_post['post_status'] = $post_status;

-                    $my_post['post_category'] = $catids_arr;

-                    $my_post['post_tags'] = $tag_arr;

-

-                    $gd_post_info['post_tags'] = $tag_arr;

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

-                    $gd_post_info['post_status'] = $post_status;

-                    $gd_post_info['submit_time'] = time();

-                    $gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR'];

-

-                    $last_postid = wp_insert_post($my_post);

-                    $countpost++;

-

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

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

-                        if (isset($post_city) && isset($post_region)) {

-                            $request_info['post_location'] = array(

-                                'city' => $post_city,

-                                'region' => $post_region,

-                                'country' => $post_country,

-                                'geo_lat' => $post_latitude,

-                                'geo_lng' => $post_longitude

-                            );

-

-                            $post_location_info = $request_info['post_location'];

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

-                                $post_location_id = $location_id;

-                        } else {

-                            $post_location_id = 0;

-                        }

-                    } else {

-                        $post_location_id = 0;

-                    }

-

-                    /* ------- get default package info ----- */

-                    $payment_info = array();

-                    $package_info = array();

-

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

-                    $package_id = '';

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

-                        $package_id = $gd_post_info['package_id'];

-                    }

-

-                    if (!empty($package_info)) {

-                        $payment_info['package_id'] = $package_info['pid'];

-

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

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

-                        } else {

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

-                        }

-

-                        $gd_post_info = array_merge($gd_post_info, $payment_info);

-                    }

-

-                    $gd_post_info['post_location_id'] = $post_location_id;

-

-                    $post_type = get_post_type($last_postid);

-

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

-

-                    geodir_save_post_info($last_postid, $gd_post_info);

-

-                    if (!empty($image_names)) {

-                        $upload_files++;

-                        $menu_order = 1;

-

-                        foreach ($image_names as $image_name) {

-                            $img_name_arr = explode('.', $image_name);

-

-                            $uploads = wp_upload_dir();

-                            $sub_dir = $uploads['subdir'];

-

-                            $arr_file_type = wp_check_filetype($image_name);

-                            $uploaded_file_type = $arr_file_type['type'];

-

-                            $attachment = array();

-                            $attachment['post_id'] = $last_postid;

-                            $attachment['title'] = $img_name_arr[0];

-                            $attachment['content'] = '';

-                            $attachment['file'] = $sub_dir . '/' . $image_name;

-                            $attachment['mime_type'] = $uploaded_file_type;

-                            $attachment['menu_order'] = $menu_order;

-                            $attachment['is_featured'] = 0;

-

-                            $attachment_set = '';

-

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

-                                if ($val != '')

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

-                            }

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

-

-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

-

-                            if ($menu_order == 1) {

-                                $post_type = get_post_type($last_postid);

-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));

-                            }

-                            $menu_order++;

-                        }

-                    }

-

-                    $gd_post_info['package_id'] = $package_id;

-

-                    /** This action is documented in geodirectory-functions/post-functions.php */

-                    do_action('geodir_after_save_listing', $last_postid, $gd_post_info);

-

-                    if (!empty($buffer[5])) {

-                        if (in_array($buffer[5], geodir_get_posttypes())) {

-                            $taxonomies = geodir_get_posttype_info(addslashes($buffer[5]));

-                            wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]);

-                            wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]);

-

-                            $post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : '';

-                            $post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : '';

-                            geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str);

-                        }

-                    }

-                } else {

-                    $invalid_title++;

-                }

-            }

-        }

-    }

-    $return['rowcount'] = $countpost;

-    $return['invalidcount'] = $address_invalid;

-    $return['blank_address'] = $blank_address;

-    $return['upload_files'] = $upload_files;

-    $return['invalid_post_type'] = $invalid_post_type;

-    $return['invalid_title'] = $invalid_title;

-    $return['total_records'] = $total_records;

-

-    echo json_encode($return);

-    exit;

+					$my_post['post_title'] = $post_title;

+					$my_post['post_content'] = $post_desc;

+					$my_post['post_type'] = addslashes($buffer[5]);

+					$my_post['post_author'] = $current_post_author;

+					$my_post['post_status'] = $post_status;

+					$my_post['post_category'] = $catids_arr;

+					$my_post['post_tags'] = $tag_arr;

+

+					$gd_post_info['post_tags'] = $tag_arr;

+					$gd_post_info['post_title'] = $post_title;

+					$gd_post_info['post_status'] = $post_status;

+					$gd_post_info['submit_time'] = time();

+					$gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR'];

+

+					$last_postid = wp_insert_post($my_post);

+					$countpost++;

+

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

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

+						if (isset($post_city) && isset($post_region)) {

+							$request_info['post_location'] = array(

+								'city' => $post_city,

+								'region' => $post_region,

+								'country' => $post_country,

+								'geo_lat' => $post_latitude,

+								'geo_lng' => $post_longitude

+							);

+

+							$post_location_info = $request_info['post_location'];

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

+								$post_location_id = $location_id;

+						} else {

+							$post_location_id = 0;

+						}

+					} else {

+						$post_location_id = 0;

+					}

+

+					/* ------- get default package info ----- */

+					$payment_info = array();

+					$package_info = array();

+

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

+					$package_id = '';

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

+						$package_id = $gd_post_info['package_id'];

+					}

+

+					if (!empty($package_info)) {

+						$payment_info['package_id'] = $package_info['pid'];

+

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

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

+						} else {

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

+						}

+

+						$gd_post_info = array_merge($gd_post_info, $payment_info);

+					}

+

+					$gd_post_info['post_location_id'] = $post_location_id;

+

+					$post_type = get_post_type($last_postid);

+

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

+

+					geodir_save_post_info($last_postid, $gd_post_info);

+

+					if (!empty($image_names)) {

+						$upload_files++;

+						$menu_order = 1;

+

+						foreach ($image_names as $image_name) {

+							$img_name_arr = explode('.', $image_name);

+

+							$uploads = wp_upload_dir();

+							$sub_dir = $uploads['subdir'];

+

+							$arr_file_type = wp_check_filetype($image_name);

+							$uploaded_file_type = $arr_file_type['type'];

+

+							$attachment = array();

+							$attachment['post_id'] = $last_postid;

+							$attachment['title'] = $img_name_arr[0];

+							$attachment['content'] = '';

+							$attachment['file'] = $sub_dir . '/' . $image_name;

+							$attachment['mime_type'] = $uploaded_file_type;

+							$attachment['menu_order'] = $menu_order;

+							$attachment['is_featured'] = 0;

+

+							$attachment_set = '';

+

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

+								if ($val != '')

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

+							}

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

+

+							$wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

+

+							if ($menu_order == 1) {

+								$post_type = get_post_type($last_postid);

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

+							}

+							$menu_order++;

+						}

+					}

+

+					$gd_post_info['package_id'] = $package_id;

+

+					/** This action is documented in geodirectory-functions/post-functions.php */

+					do_action('geodir_after_save_listing', $last_postid, $gd_post_info);

+

+					if (!empty($buffer[5])) {

+						if (in_array($buffer[5], geodir_get_posttypes())) {

+							$taxonomies = geodir_get_posttype_info(addslashes($buffer[5]));

+							wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]);

+							wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]);

+

+							$post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : '';

+							$post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : '';

+							geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str);

+						}

+					}

+				} else {

+					$invalid_title++;

+				}

+			}

+		}

+	}

+	$return['rowcount'] = $countpost;

+	$return['invalidcount'] = $address_invalid;

+	$return['blank_address'] = $blank_address;

+	$return['upload_files'] = $upload_files;

+	$return['invalid_post_type'] = $invalid_post_type;

+	$return['invalid_title'] = $invalid_title;

+	$return['total_records'] = $total_records;

+

+	echo json_encode($return);

+	exit;

 }

 

 // Add the tab in left sidebar menu fro import & export page.

@@ -2272,9 +2272,9 @@ 
  * @param $post object $post The post object of the post being saved.

  */

 function geodir_update_location_prefix($post_id,$post){

-    if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){

-        update_option('geodir_location_prefix',$post->post_name);

-    }

+	if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){

+		update_option('geodir_location_prefix',$post->post_name);

+	}

 

 }

 

@@ -2285,50 +2285,50 @@ 
 function geodir_ga_callback(){

 

 if(isset($_REQUEST['code']) && $_REQUEST['code']) {

-    $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";

-    $code = "code=".$_REQUEST['code'];

-    $grant_type = "&grant_type=authorization_code";

-    $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

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

-    $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');

+	$oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";

+	$code = "code=".$_REQUEST['code'];

+	$grant_type = "&grant_type=authorization_code";

+	$redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

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

+	$client_secret = "&client_secret=".get_option('geodir_ga_client_secret');

 

-    $auth_url = $oAuthURL . $code . $redirect_uri .  $grant_type . $client_id .$client_secret;

+	$auth_url = $oAuthURL . $code . $redirect_uri .  $grant_type . $client_id .$client_secret;

 

-    $response = wp_remote_post($auth_url, array('timeout' => 15));

+	$response = wp_remote_post($auth_url, array('timeout' => 15));

 

-    //print_r($response);

+	//print_r($response);

 

-    $error_msg =  __('Something went wrong','geodirectory');

-    if(!empty($response['response']['code']) && $response['response']['code']==200){

+	$error_msg =  __('Something went wrong','geodirectory');

+	if(!empty($response['response']['code']) && $response['response']['code']==200){

 

-        $parts = json_decode($response['body']);

-        //print_r($parts);

-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}

-        else{

+		$parts = json_decode($response['body']);

+		//print_r($parts);

+		if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}

+		else{

 

-            update_option('gd_ga_access_token', $parts->access_token);

-            update_option('gd_ga_refresh_token', $parts->refresh_token);

-            ?><script>window.close();</script><?php

-        }

+			update_option('gd_ga_access_token', $parts->access_token);

+			update_option('gd_ga_refresh_token', $parts->refresh_token);

+			?><script>window.close();</script><?php

+		}

 

 

-    }

-    elseif(!empty($response['response']['code'])) {

-        $parts = json_decode($response['body']);

+	}

+	elseif(!empty($response['response']['code'])) {

+		$parts = json_decode($response['body']);

 

-        if(isset($parts->error)){

-            echo $parts->error.": ".$parts->error_description;exit;

-        }else{

-            echo $error_msg." - #2";exit;

-        }

+		if(isset($parts->error)){

+			echo $parts->error.": ".$parts->error_description;exit;

+		}else{

+			echo $error_msg." - #2";exit;

+		}

 

-    }else{

+	}else{

 

-        echo $error_msg." - #3";exit;

+		echo $error_msg." - #3";exit;

 

-    }

+	}

 }

-    exit;

+	exit;

 }

 

 add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 );

@@ -2346,45 +2346,45 @@ 
  * @return array Array of settings.

  */

 function geodir_uninstall_settings($general_settings) {

-    $settings   = array();

-    $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));

-    $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));

+	$settings   = array();

+	$settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));

+	$settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));

     

-    $plugins    = get_plugins();

-    $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());

+	$plugins    = get_plugins();

+	$un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());

     

-    if (!empty($plugins) && !empty($un_plugins)) {

-        foreach ($plugins as $plugin => $data) {

-            $plugin_name = plugin_basename(dirname($plugin));

+	if (!empty($plugins) && !empty($un_plugins)) {

+		foreach ($plugins as $plugin => $data) {

+			$plugin_name = plugin_basename(dirname($plugin));

             

-            if (in_array($plugin_name, $un_plugins)) {

-                $settings[] = array(

-                    'type' => 'checkbox',

-                    'id' => 'geodir_un_' . $plugin_name,

-                    'name' => $data['Name'],

-                    'desc' => __('Remove all data when deleted?', 'geodirectory'),

-                    'std' => '0'

-                );

-            }

-        }

-    }

+			if (in_array($plugin_name, $un_plugins)) {

+				$settings[] = array(

+					'type' => 'checkbox',

+					'id' => 'geodir_un_' . $plugin_name,

+					'name' => $data['Name'],

+					'desc' => __('Remove all data when deleted?', 'geodirectory'),

+					'std' => '0'

+				);

+			}

+		}

+	}

         

-    $settings[] = array('type' => 'sectionend', 'id' => 'uninstall_settings_main');

+	$settings[] = array('type' => 'sectionend', 'id' => 'uninstall_settings_main');

     

-    /**

-     * Filter the uninstall settings array.

-     *

-     * @since 1.6.9

-     *

-     * @param array $settings The settings array.

-     */

-    $settings = apply_filters('geodir_uninstall_settings', $settings);

+	/**

+	 * Filter the uninstall settings array.

+	 *

+	 * @since 1.6.9

+	 *

+	 * @param array $settings The settings array.

+	 */

+	$settings = apply_filters('geodir_uninstall_settings', $settings);

     

-    if (!empty($settings) && count($settings) > 3) {

-        return array_merge($general_settings, $settings);

-    }

+	if (!empty($settings) && count($settings) > 3) {

+		return array_merge($general_settings, $settings);

+	}

     

-    return $general_settings;

+	return $general_settings;

 }

 add_filter('geodir_general_settings', 'geodir_uninstall_settings', 100, 1);

 

@@ -2394,7 +2394,7 @@ 
  * @since 1.6.9

  */

 function geodir_uninstall_settings_desc() {

-    echo '<p class="gd-un-settings-desc">' . __('Select the plugins that you would like to completely remove all of its data when the plugin is deleted.', 'geodirectory') . '</p>';

+	echo '<p class="gd-un-settings-desc">' . __('Select the plugins that you would like to completely remove all of its data when the plugin is deleted.', 'geodirectory') . '</p>';

 }

 add_action('geodir_settings_uninstall_settings_main_start', 'geodir_uninstall_settings_desc');

 

@@ -2410,18 +2410,18 @@ 
  * @return array The settings array.

  */

 function geodir_resave_settings($settings = array()) {

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

-        $c = 0;

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

+		$c = 0;

         

-        foreach ($settings as $setting) {

-            if (!empty($setting['id']) && false !== ($value = get_option($setting['id']))) {

-                $settings[$c]['std'] = $value;

-            }

-            $c++;

-        }

-    }

-

-    return $settings;

+		foreach ($settings as $setting) {

+			if (!empty($setting['id']) && false !== ($value = get_option($setting['id']))) {

+				$settings[$c]['std'] = $value;

+			}

+			$c++;

+		}

+	}

+

+	return $settings;

 }

 

 /**

@@ -2433,8 +2433,8 @@ 
  * @return array The modified settings.

  */

 function geodir_core_uninstall_settings($settings) {

-    $settings[] = plugin_basename(dirname(dirname(__FILE__)));

+	$settings[] = plugin_basename(dirname(dirname(__FILE__)));

     

-    return $settings;

+	return $settings;

 }

 add_filter('geodir_plugins_uninstall_settings', 'geodir_core_uninstall_settings', 10, 1);
\ No newline at end of file

geodirectory-templates/listing-filter-form.php

Indentation +34 added lines, -34 removed lines

@@ -14,18 +14,18 @@ 
 

 

 if (function_exists('geodir_location_geo_home_link')) {

-    remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

+	remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

 }

 $search_url = trailingslashit(get_home_url());

 if (function_exists('geodir_location_geo_home_link')) {

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

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

 }

 

 

 $new_style = get_option('geodir_show_search_old_search_from') ? false : true;

 $form_class = 'geodir-listing-search';

 if($new_style){

-    $form_class .= ' gd-search-bar-style';

+	$form_class .= ' gd-search-bar-style';

 }

 ?>

 

@@ -44,56 +44,56 @@ 
     <div class="geodir-loc-bar">

 

         <?php

-        /**

-         * Called inside the search form but before any of the fields.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_before_search_form') ?>

+		/**

+		 * Called inside the search form but before any of the fields.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_before_search_form') ?>

 

         <div class="clearfix geodir-loc-bar-in">

             <div class="geodir-search">

 

                 <?php

 

-                /**

-                 * Adds the input fields to the search form.

-                 *

-                 * @since 1.6.9

-                 */

-                do_action('geodir_search_form_inputs');

+				/**

+				 * Adds the input fields to the search form.

+				 *

+				 * @since 1.6.9

+				 */

+				do_action('geodir_search_form_inputs');

 

 

 

-                /**

-                 * Called on the GD search form just before the search button.

-                 *

-                 * @since 1.0.0

-                 */

-                do_action('geodir_before_search_button');

+				/**

+				 * Called on the GD search form just before the search button.

+				 *

+				 * @since 1.0.0

+				 */

+				do_action('geodir_before_search_button');

 

                 

-                /**

-                 * Called on the GD search form just after the search button.

-                 *

-                 * @since 1.0.0

-                 */

-                do_action('geodir_after_search_button');

+				/**

+				 * Called on the GD search form just after the search button.

+				 *

+				 * @since 1.0.0

+				 */

+				do_action('geodir_after_search_button');

 

                 

-                ?>

+				?>

             </div>

 

 

         </div>

 

         <?php

-        /**

-         * Called inside the search form but after all the input fields.

-         *

-         * @since 1.0.0

-         */

-        do_action('geodir_after_search_form') ?>

+		/**

+		 * Called inside the search form but after all the input fields.

+		 *

+		 * @since 1.0.0

+		 */

+		do_action('geodir_after_search_form') ?>

 

 

     </div>

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 

 $new_style = get_option('geodir_show_search_old_search_from') ? false : true;

 $form_class = 'geodir-listing-search';

-if($new_style){

+if ($new_style) {

     $form_class .= ' gd-search-bar-style';

 }

 ?>

geodirectory-functions/custom_field_html.php

Indentation +328 added lines, -328 removed lines

@@ -18,9 +18,9 @@ 
 global $post_type;

 

 if (!isset($field_info->post_type)) {

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

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

 } else

-    $post_type = $field_info->post_type;

+	$post_type = $field_info->post_type;

 

 //if(isset($_REQUEST['custom_type']) && $_REQUEST['custom_type']=='predefined'){

 //    $cf_arr = geodir_custom_fields_predefined($post_type);

@@ -44,7 +44,7 @@ 
 

 $field_admin_title = '';

 if (isset($field_info->admin_title))

-    $field_admin_title = $field_info->admin_title;

+	$field_admin_title = $field_info->admin_title;

 

 $default = isset($field_info->is_admin) ? $field_info->is_admin : '';

 

@@ -64,17 +64,17 @@ 
 //print_r($field_info);

 

 if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {

-    $field_icon = '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';

+	$field_icon = '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';

 }elseif(isset($cf['icon']) && $cf['icon']){

-    $field_icon = '<b style="background-image: url("'.$cf['icon'].'")"></b>';

+	$field_icon = '<b style="background-image: url("'.$cf['icon'].'")"></b>';

 }else{

-    $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';

+	$field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';

 }

 

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

-    $field_type_name = $cf['name'];

+	$field_type_name = $cf['name'];

 }else{

-    $field_type_name = $field_type;

+	$field_type_name = $field_type;

 }

 

 ?>

@@ -84,8 +84,8 @@ 
          ondblclick="show_hide('field_frm<?php echo $result_str; ?>')">

         <?php

 

-        $nonce = wp_create_nonce('custom_fields_' . $result_str);

-        ?>

+		$nonce = wp_create_nonce('custom_fields_' . $result_str);

+		?>

 

         <?php if ($default): ?>

             <div title="<?php _e('Default field, should not be removed.', 'geodirectory'); ?>" class="handlediv move gd-default-remove"><i class="fa fa-times" aria-hidden="true"></i></div>

@@ -94,37 +94,37 @@ 
                  onclick="delete_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>')"

                  class="handlediv close"><i class="fa fa-times" aria-hidden="true"></i></div>

         <?php endif;

-        if ($field_type == 'fieldset') {

-            ?>

+		if ($field_type == 'fieldset') {

+			?>

             <i class="fa fa-long-arrow-left " aria-hidden="true"></i>

             <i class="fa fa-long-arrow-right " aria-hidden="true"></i>

             <b style="cursor:pointer;"

                onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory') . ' ' . $field_admin_title);?></b>

         <?php

-        } else {echo $field_icon;

-            ?>

+		} else {echo $field_icon;

+			?>

             <b style="cursor:pointer;"

                onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(' ' . $field_admin_title . ' (' . $field_type_name . ')');?></b>

         <?php

-        }

-        ?>

+		}

+		?>

     </div>

 

     <form><!-- we need to wrap in a fom so we can use radio buttons with same name -->

     <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 esc_attr($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_type_key" id="field_type_key" value="<?php echo $field_type_key; ?>"/>

         <input type="hidden" name="field_id" id="field_id" value="<?php echo esc_attr($result_str); ?>"/>

         <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {

-            echo $field_info->data_type;

-        } ?>"/>

+			echo $field_info->data_type;

+		} ?>"/>

         <input type="hidden" name="is_active" id="is_active" value="1"/>

 

         <input type="hidden" name="is_default" value="<?php echo isset($field_info->is_default) ? $field_info->is_default : '';?>" /><?php // show in sidebar value?>

@@ -136,37 +136,37 @@ 
 

             <?php

 

-            // data_type

-            if(has_filter("geodir_cfa_data_type_{$field_type}")){

+			// data_type

+			if(has_filter("geodir_cfa_data_type_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->data_type)) {

-                    $value = esc_attr($field_info->data_type);

-                }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

-                    $value = $cf['defaults']['data_type'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->data_type)) {

+					$value = esc_attr($field_info->data_type);

+				}elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

+					$value = $cf['defaults']['data_type'];

+				}

+				?>

                 <input type="hidden" name="data_type" id="data_type" value="<?php echo $value;?>"/>

             <?php

-            }

+			}

 

 

-            // admin_title

-            if(has_filter("geodir_cfa_admin_title_{$field_type}")){

+			// admin_title

+			if(has_filter("geodir_cfa_admin_title_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->admin_title)) {

-                    $value = esc_attr($field_info->admin_title);

-                }elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){

-                    $value = $cf['defaults']['admin_title'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->admin_title)) {

+					$value = esc_attr($field_info->admin_title);

+				}elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){

+					$value = $cf['defaults']['admin_title'];

+				}

+				?>

                 <li>

                     <label for="admin_title" class="gd-cf-tooltip-wrap">

                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Admin title :', 'geodirectory'); ?>

@@ -180,22 +180,22 @@ 
                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // site_title

-            if(has_filter("geodir_cfa_site_title_{$field_type}")){

+			// site_title

+			if(has_filter("geodir_cfa_site_title_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->site_title)) {

-                    $value = esc_attr($field_info->site_title);

-                }elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){

-                    $value = $cf['defaults']['site_title'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->site_title)) {

+					$value = esc_attr($field_info->site_title);

+				}elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){

+					$value = $cf['defaults']['site_title'];

+				}

+				?>

                 <li>

                     <label for="site_title" class="gd-cf-tooltip-wrap"> <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Frontend title :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -208,22 +208,22 @@ 
                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // admin_desc

-            if(has_filter("geodir_cfa_admin_desc_{$field_type}")){

+			// admin_desc

+			if(has_filter("geodir_cfa_admin_desc_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->admin_desc)) {

-                    $value = esc_attr($field_info->admin_desc);

-                }elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){

-                    $value = $cf['defaults']['admin_desc'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->admin_desc)) {

+					$value = esc_attr($field_info->admin_desc);

+				}elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){

+					$value = $cf['defaults']['admin_desc'];

+				}

+				?>

                 <li>

                     <label for="admin_desc" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Frontend description :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -235,23 +235,23 @@ 
                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

 

-            // htmlvar_name

-            if(has_filter("geodir_cfa_htmlvar_name_{$field_type}")){

+			// htmlvar_name

+			if(has_filter("geodir_cfa_htmlvar_name_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->htmlvar_name)) {

-                    $value = esc_attr($field_info->htmlvar_name);

-                }elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){

-                    $value = $cf['defaults']['htmlvar_name'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->htmlvar_name)) {

+					$value = esc_attr($field_info->htmlvar_name);

+				}elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){

+					$value = $cf['defaults']['htmlvar_name'];

+				}

+				?>

                 <li>

                     <label for="htmlvar_name" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory');?>

                         <div class="gdcf-tooltip">

@@ -261,29 +261,29 @@ 
                     <div class="gd-cf-input-wrap">

                         <input type="text" name="htmlvar_name" id="htmlvar_name" pattern="[a-zA-Z0-9]+" title="<?php _e('Must not contain spaces or special characters', 'geodirectory');?>"

                                value="<?php if ($value) {

-                                   echo preg_replace('/geodir_/', '', $value, 1);

-                               }?>" <?php if ($default) {

-                            echo 'readonly="readonly"';

-                        }?> />

+								   echo preg_replace('/geodir_/', '', $value, 1);

+							   }?>" <?php if ($default) {

+							echo 'readonly="readonly"';

+						}?> />

                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // is_active

-            if(has_filter("geodir_cfa_is_active_{$field_type}")){

+			// is_active

+			if(has_filter("geodir_cfa_is_active_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->is_active)) {

-                    $value = esc_attr($field_info->is_active);

-                }elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){

-                    $value = $cf['defaults']['is_active'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->is_active)) {

+					$value = esc_attr($field_info->is_active);

+				}elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){

+					$value = $cf['defaults']['is_active'];

+				}

+				?>

                 <li <?php echo $field_display; ?>>

                     <label for="is_active" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Is active :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -294,35 +294,35 @@ 
 

                         <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled"  value="1"

                             <?php if ($value == '1') {

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

                         <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

                         <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0"

                             <?php if ($value == '0' || !$value) {

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

                         <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // for_admin_use

-            if(has_filter("geodir_cfa_for_admin_use_{$field_type}")){

+			// for_admin_use

+			if(has_filter("geodir_cfa_for_admin_use_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->for_admin_use)) {

-                    $value = esc_attr($field_info->for_admin_use);

-                }elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){

-                    $value = $cf['defaults']['for_admin_use'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->for_admin_use)) {

+					$value = esc_attr($field_info->for_admin_use);

+				}elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){

+					$value = $cf['defaults']['for_admin_use'];

+				}

+				?>

                 <li>

                     <label for="for_admin_use" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('For admin use only? :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -333,47 +333,47 @@ 
 

                         <input type="radio" id="for_admin_use_yes<?php echo $radio_id;?>" name="for_admin_use" class="gdri-enabled"  value="1"

                             <?php if ($value == '1') {

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

                         <label for="for_admin_use_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

                         <input type="radio" id="for_admin_use_no<?php echo $radio_id;?>" name="for_admin_use" class="gdri-disabled" value="0"

                             <?php if ($value == '0' || !$value) {

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

                         <label for="for_admin_use_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // default_value

-            if(has_filter("geodir_cfa_default_value_{$field_type}")){

+			// default_value

+			if(has_filter("geodir_cfa_default_value_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->default_value)) {

-                    $value = esc_attr($field_info->default_value);

-                }elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){

-                    $value = $cf['defaults']['default_value'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->default_value)) {

+					$value = esc_attr($field_info->default_value);

+				}elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){

+					$value = $cf['defaults']['default_value'];

+				}

+				?>

                 <li>

                     <label for="default_value" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default value :', 'geodirectory');?>

                         <div class="gdcf-tooltip">

                             <?php

-                            if ($field_type == 'checkbox') {

-                                _e('Should the checkbox be checked by default?', 'geodirectory');

-                            } else if ($field_type == 'email') {

-                                _e('A default value for the field, usually blank. Ex: info@mysite.com', 'geodirectory');

-                            } else {

-                                _e('A default value for the field, usually blank. (for "link" this will be used as the link text)', 'geodirectory');

-                            }

-                            ?>

+							if ($field_type == 'checkbox') {

+								_e('Should the checkbox be checked by default?', 'geodirectory');

+							} else if ($field_type == 'email') {

+								_e('A default value for the field, usually blank. Ex: info@mysite.com', 'geodirectory');

+							} else {

+								_e('A default value for the field, usually blank. (for "link" this will be used as the link text)', 'geodirectory');

+							}

+							?>

                         </div>

                     </label>

                     <div class="gd-cf-input-wrap">

@@ -390,22 +390,22 @@ 
                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // show_in

-            if(has_filter("geodir_cfa_show_in_{$field_type}")){

+			// show_in

+			if(has_filter("geodir_cfa_show_in_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->show_in)) {

-                    $value = esc_attr($field_info->show_in);

-                }elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){

-                    $value = esc_attr($cf['defaults']['show_in']);

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->show_in)) {

+					$value = esc_attr($field_info->show_in);

+				}elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){

+					$value = esc_attr($cf['defaults']['show_in']);

+				}

+				?>

                 <li>

                     <label for="show_in" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show in what locations?:', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -416,42 +416,42 @@ 
 

                         <?php

 

-                        /*

+						/*

 						 * We wrap the key values in [] so we can search the DB easier with a LIKE query.

 						 */

-                        $show_in_locations = array(

-                            "[detail]" => __("Details page sidebar", 'geodirectory'),

-                            "[moreinfo]" => __("More info tab", 'geodirectory'),

-                            "[listing]" => __("Listings page", 'geodirectory'),

-                            "[owntab]" => __("Details page own tab", 'geodirectory'),

-                            "[mapbubble]" => __("Map bubble", 'geodirectory'),

-                        );

-

-                        /**

-                         * Filter the locations array for where to display custom fields.

-                         *

-                         * @since 1.6.6

-                         * @param array $show_in_locations The array of locations and descriptions.

-                         * @param object $field_info The field being displayed info.

-                         * @param string $field_info The type of field.

-                         */

-                        $show_in_locations = apply_filters('geodir_show_in_locations',$show_in_locations,$field_info,$field_type);

+						$show_in_locations = array(

+							"[detail]" => __("Details page sidebar", 'geodirectory'),

+							"[moreinfo]" => __("More info tab", 'geodirectory'),

+							"[listing]" => __("Listings page", 'geodirectory'),

+							"[owntab]" => __("Details page own tab", 'geodirectory'),

+							"[mapbubble]" => __("Map bubble", 'geodirectory'),

+						);

+

+						/**

+						 * Filter the locations array for where to display custom fields.

+						 *

+						 * @since 1.6.6

+						 * @param array $show_in_locations The array of locations and descriptions.

+						 * @param object $field_info The field being displayed info.

+						 * @param string $field_info The type of field.

+						 */

+						$show_in_locations = apply_filters('geodir_show_in_locations',$show_in_locations,$field_info,$field_type);

 

 

-                        // remove some locations for some field types

+						// remove some locations for some field types

 

-                        // don't show new tab option for some types

+						// don't show new tab option for some types

 

-                        if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

-                        }else{

-                            unset($show_in_locations['[owntab]']);

-                        }

+						if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

+						}else{

+							unset($show_in_locations['[owntab]']);

+						}

 

-                        if(!$display_on_listing){

-                            unset($show_in_locations['[listings]']);

-                        }

+						if(!$display_on_listing){

+							unset($show_in_locations['[listings]']);

+						}

 

-                        ?>

+						?>

 

                         <select multiple="multiple" name="show_in[]"

                                 id="show_in"

@@ -461,38 +461,38 @@ 
                                 option-ajaxchosen="false">

                             <?php

 

-                            $show_in_values = explode(',',$value);

+							$show_in_values = explode(',',$value);

 

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

-                                $selected = '';

+							foreach( $show_in_locations as $key => $val){

+								$selected = '';

 

-                                if(is_array($show_in_values) && in_array($key,$show_in_values ) ){

-                                    $selected = 'selected';

-                                }

+								if(is_array($show_in_values) && in_array($key,$show_in_values ) ){

+									$selected = 'selected';

+								}

 

-                                ?>

+								?>

                                 <option  value="<?php echo $key;?>" <?php echo $selected;?>><?php echo $val;?></option>

                                 <?php

-                            }

-                            ?>

+							}

+							?>

                         </select>

                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // advanced_editor

-            if(has_filter("geodir_cfa_advanced_editor_{$field_type}")){

+			// advanced_editor

+			if(has_filter("geodir_cfa_advanced_editor_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_advanced_editor_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_advanced_editor_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }

+			}

 

 

 

 

-            ?>

+			?>

 

 

             <?php // @todo this does not seem to be used for anything, it can be removed or replaced ?>

@@ -505,38 +505,38 @@ 
 

             <?php

 

-            $pricearr = array();

-            if (isset($field_info->packages) && $field_info->packages != '') {

-                $pricearr = explode(',', trim($field_info->packages, ','));

-            } else {

-                $package_info = array();

+			$pricearr = array();

+			if (isset($field_info->packages) && $field_info->packages != '') {

+				$pricearr = explode(',', trim($field_info->packages, ','));

+			} else {

+				$package_info = array();

 

-                $package_info = geodir_post_package_info($package_info, '', $post_type);

-                $pricearr[] = $package_info->pid;

-            }

+				$package_info = geodir_post_package_info($package_info, '', $post_type);

+				$pricearr[] = $package_info->pid;

+			}

 

-            ob_start()

-            ?>

+			ob_start()

+			?>

 

             <select style="display:none" name="show_on_pkg[]" id="show_on_pkg" multiple="multiple">

                 <?php

-                if (!empty($pricearr)) {

-                    foreach ($pricearr as $val) {

-                        ?>

+				if (!empty($pricearr)) {

+					foreach ($pricearr as $val) {

+						?>

                         <option selected="selected" value="<?php echo esc_attr($val); ?>" ><?php echo $val; ?></option><?php

-                    }

-                }

-                ?>

+					}

+				}

+				?>

             </select>

 

             <?php

-            $html = ob_get_clean();

+			$html = ob_get_clean();

 

 			/**

 			 * Filter the price packages list.

 			 *

 			 * Filter the price packages list in custom field form in admin

-             * custom fields settings.

+			 * custom fields settings.

 			 *

 			 * @since 1.0.0

 			 *

@@ -545,25 +545,25 @@ 
 			 */

 			echo $html = apply_filters('geodir_packages_list_on_custom_fields', $html, $field_info);

 

-            ?>

+			?>

 

 

 

             <?php

 

-            // is_required

-            if(has_filter("geodir_cfa_is_required_{$field_type}")){

+			// is_required

+			if(has_filter("geodir_cfa_is_required_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->is_required)) {

-                    $value = esc_attr($field_info->is_required);

-                }elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){

-                    $value = $cf['defaults']['is_required'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->is_required)) {

+					$value = esc_attr($field_info->is_required);

+				}elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){

+					$value = $cf['defaults']['is_required'];

+				}

+				?>

                 <li>

                     <label for="is_required" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Is required :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -575,14 +575,14 @@ 
 

                         <input type="radio" id="is_required_yes<?php echo $radio_id;?>" name="is_required" class="gdri-enabled"  value="1"

                             <?php if ($value == '1') {

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

                         <label onclick="show_hide_radio(this,'show','cf-is-required-msg');" for="is_required_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

                         <input type="radio" id="is_required_no<?php echo $radio_id;?>" name="is_required" class="gdri-disabled" value="0"

                             <?php if ($value == '0' || !$value) {

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

                         <label onclick="show_hide_radio(this,'hide','cf-is-required-msg');" for="is_required_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                     </div>

@@ -590,21 +590,21 @@ 
                 </li>

 

                 <?php

-            }

+			}

 

-            // required_msg

-            if(has_filter("geodir_cfa_required_msg_{$field_type}")){

+			// required_msg

+			if(has_filter("geodir_cfa_required_msg_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->required_msg)) {

-                    $value = esc_attr($field_info->required_msg);

-                }elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){

-                    $value = $cf['defaults']['required_msg'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->required_msg)) {

+					$value = esc_attr($field_info->required_msg);

+				}elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){

+					$value = $cf['defaults']['required_msg'];

+				}

+				?>

                 <li class="cf-is-required-msg" <?php if ((isset($field_info->is_required) && $field_info->is_required == '0') || !isset($field_info->is_required)) {echo "style='display:none;'";}?>>

                     <label for="required_msg" class="gd-cf-tooltip-wrap">

                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Required message:', 'geodirectory'); ?>

@@ -618,38 +618,38 @@ 
                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // required_msg

-            if(has_filter("geodir_cfa_validation_pattern_{$field_type}")){

+			// required_msg

+			if(has_filter("geodir_cfa_validation_pattern_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_validation_pattern_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_validation_pattern_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }

+			}

 

 

-            // extra_fields

-            if(has_filter("geodir_cfa_extra_fields_{$field_type}")){

+			// extra_fields

+			if(has_filter("geodir_cfa_extra_fields_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_extra_fields_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_extra_fields_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }

+			}

 

 

-            // field_icon

-            if(has_filter("geodir_cfa_field_icon_{$field_type}")){

+			// field_icon

+			if(has_filter("geodir_cfa_field_icon_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->field_icon)) {

-                    $value = esc_attr($field_info->field_icon);

-                }elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){

-                    $value = $cf['defaults']['field_icon'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->field_icon)) {

+					$value = esc_attr($field_info->field_icon);

+				}elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){

+					$value = $cf['defaults']['field_icon'];

+				}

+				?>

                 <li>

                     <h3><?php echo __('Custom css', 'geodirectory'); ?></h3>

 

@@ -667,22 +667,22 @@ 
 

                 </li>

                 <?php

-            }

+			}

 

 

-            // css_class

-            if(has_filter("geodir_cfa_css_class_{$field_type}")){

+			// css_class

+			if(has_filter("geodir_cfa_css_class_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                if (isset($field_info->css_class)) {

-                    $value = esc_attr($field_info->css_class);

-                }elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){

-                    $value = $cf['defaults']['css_class'];

-                }

-                ?>

+			}else{

+				$value = '';

+				if (isset($field_info->css_class)) {

+					$value = esc_attr($field_info->css_class);

+				}elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){

+					$value = $cf['defaults']['css_class'];

+				}

+				?>

                 <li>

 

                     <label for="css_class" class="gd-cf-tooltip-wrap">

@@ -695,47 +695,47 @@ 
                     <div class="gd-cf-input-wrap">

                         <input type="text" name="css_class" id="css_class"

                                value="<?php if (isset($field_info->css_class)) {

-                                   echo esc_attr($field_info->css_class);

-                               }?>"/>

+								   echo esc_attr($field_info->css_class);

+							   }?>"/>

                     </div>

                 </li>

                 <?php

-            }

+			}

 

 

-            // cat_sort

-            if(has_filter("geodir_cfa_cat_sort_{$field_type}")){

+			// cat_sort

+			if(has_filter("geodir_cfa_cat_sort_{$field_type}")){

 

-                echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);

+				echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

-                $value = '';

-                $hide_cat_sort  ='';

-                if (isset($field_info->cat_sort)) {

-                    $value = esc_attr($field_info->cat_sort);

-                }elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){

-                    $value = $cf['defaults']['cat_sort'];

-                    $hide_cat_sort = ($value===false) ? "style='display:none;'" : '';

-                }

+			}else{

+				$value = '';

+				$hide_cat_sort  ='';

+				if (isset($field_info->cat_sort)) {

+					$value = esc_attr($field_info->cat_sort);

+				}elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){

+					$value = $cf['defaults']['cat_sort'];

+					$hide_cat_sort = ($value===false) ? "style='display:none;'" : '';

+				}

 

-                $hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']===false) ? "style='display:none;'" : '';

-                ?>

+				$hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']===false) ? "style='display:none;'" : '';

+				?>

                 <li <?php echo $hide_cat_sort ;?>>

                     <h3><?php

-                        /**

-                         * Filter the section title.

-                         *

-                         * Filter the section title in custom field form in admin

-                         * custom fields settings.

-                         *

-                         * @since 1.0.0

-                         *

-                         * @param string $title Title of the section.

-                         * @param string $field_type Current field type.

-                         */

-                        echo apply_filters('geodir_advance_custom_fields_heading', __('Posts sort options', 'geodirectory'), $field_type);

-

-                        ?></h3>

+						/**

+						 * Filter the section title.

+						 *

+						 * Filter the section title in custom field form in admin

+						 * custom fields settings.

+						 *

+						 * @since 1.0.0

+						 *

+						 * @param string $title Title of the section.

+						 * @param string $field_type Current field type.

+						 */

+						echo apply_filters('geodir_advance_custom_fields_heading', __('Posts sort options', 'geodirectory'), $field_type);

+

+						?></h3>

                     <label for="cat_sort" class="gd-cf-tooltip-wrap">

                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Include this field in sorting options :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -747,42 +747,42 @@ 
 

                         <input type="radio" id="cat_sort_yes<?php echo $radio_id;?>" name="cat_sort" class="gdri-enabled"  value="1"

                             <?php if ($value == '1') {

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

                         <label for="cat_sort_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

                         <input type="radio" id="cat_sort_no<?php echo $radio_id;?>" name="cat_sort" class="gdri-disabled" value="0"

                             <?php if (!$value) {

-                                echo 'checked';

-                            } ?>/>

+								echo 'checked';

+							} ?>/>

                         <label for="cat_sort_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                     </div>

                 </li>

                 <?php

-            }

-

-

-

-            switch ($field_type):

-                case 'html':

-                case 'file':

-                case 'url':

-                case 'fieldset':

-                    break;

-                default:

-

-                    /**

-                     * Called at the end of the advanced custom fields settings page loop.

-                     *

-                     * Can be used to add or deal with different settings types.

-                     *

-                     * @since 1.0.0

-                     * @since 1.6.6 $cf param added.

-                     * @param object $field_info The current fields info.

-                     * @param array $cf The custom field settings

-                     */

-                    do_action('geodir_advance_custom_fields', $field_info,$cf);?>

+			}

+

+

+

+			switch ($field_type):

+				case 'html':

+				case 'file':

+				case 'url':

+				case 'fieldset':

+					break;

+				default:

+

+					/**

+					 * Called at the end of the advanced custom fields settings page loop.

+					 *

+					 * Can be used to add or deal with different settings types.

+					 *

+					 * @since 1.0.0

+					 * @since 1.6.6 $cf param added.

+					 * @param object $field_info The current fields info.

+					 * @param array $cf The custom field settings

+					 */

+					do_action('geodir_advance_custom_fields', $field_info,$cf);?>

 

 

                 <?php endswitch; ?>

Braces +43 added lines, -38 removed lines

@@ -19,8 +19,9 @@ 
 

 if (!isset($field_info->post_type)) {

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

-} else

-    $post_type = $field_info->post_type;

+} else {
+    $post_type = $field_info->post_type;
+}
 

 //if(isset($_REQUEST['custom_type']) && $_REQUEST['custom_type']=='predefined'){

 //    $cf_arr = geodir_custom_fields_predefined($post_type);

@@ -43,8 +44,9 @@ 
 $nonce = wp_create_nonce('custom_fields_' . $result_str);

 

 $field_admin_title = '';

-if (isset($field_info->admin_title))

-    $field_admin_title = $field_info->admin_title;

+if (isset($field_info->admin_title)) {
+    $field_admin_title = $field_info->admin_title;
+}
 

 $default = isset($field_info->is_admin) ? $field_info->is_admin : '';

 

@@ -65,15 +67,15 @@ 
 

 if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {

     $field_icon = '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';

-}elseif(isset($cf['icon']) && $cf['icon']){

+} elseif(isset($cf['icon']) && $cf['icon']){

     $field_icon = '<b style="background-image: url("'.$cf['icon'].'")"></b>';

-}else{

+} else{

     $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';

 }

 

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

     $field_type_name = $cf['name'];

-}else{

+} else{

     $field_type_name = $field_type;

 }

 

@@ -89,8 +91,11 @@ 
 

         <?php if ($default): ?>

             <div title="<?php _e('Default field, should not be removed.', 'geodirectory'); ?>" class="handlediv move gd-default-remove"><i class="fa fa-times" aria-hidden="true"></i></div>

-        <?php else: ?>

-            <div title="<?php _e('Click to remove field', 'geodirectory'); ?>"

+        <?php else {
+	: ?>

+            <div title="<?php _e('Click to remove field', 'geodirectory');
+}
+?>"

                  onclick="delete_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>')"

                  class="handlediv close"><i class="fa fa-times" aria-hidden="true"></i></div>

         <?php endif;

@@ -141,11 +146,11 @@ 
 

                 echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->data_type)) {

                     $value = esc_attr($field_info->data_type);

-                }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

+                } elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

                     $value = $cf['defaults']['data_type'];

                 }

                 ?>

@@ -159,11 +164,11 @@ 
 

                 echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->admin_title)) {

                     $value = esc_attr($field_info->admin_title);

-                }elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){

+                } elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){

                     $value = $cf['defaults']['admin_title'];

                 }

                 ?>

@@ -188,11 +193,11 @@ 
 

                 echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->site_title)) {

                     $value = esc_attr($field_info->site_title);

-                }elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){

+                } elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){

                     $value = $cf['defaults']['site_title'];

                 }

                 ?>

@@ -216,11 +221,11 @@ 
 

                 echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->admin_desc)) {

                     $value = esc_attr($field_info->admin_desc);

-                }elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){

+                } elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){

                     $value = $cf['defaults']['admin_desc'];

                 }

                 ?>

@@ -244,11 +249,11 @@ 
 

                 echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->htmlvar_name)) {

                     $value = esc_attr($field_info->htmlvar_name);

-                }elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){

+                } elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){

                     $value = $cf['defaults']['htmlvar_name'];

                 }

                 ?>

@@ -276,11 +281,11 @@ 
 

                 echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->is_active)) {

                     $value = esc_attr($field_info->is_active);

-                }elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){

+                } elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){

                     $value = $cf['defaults']['is_active'];

                 }

                 ?>

@@ -315,11 +320,11 @@ 
 

                 echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->for_admin_use)) {

                     $value = esc_attr($field_info->for_admin_use);

-                }elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){

+                } elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){

                     $value = $cf['defaults']['for_admin_use'];

                 }

                 ?>

@@ -354,11 +359,11 @@ 
 

                 echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->default_value)) {

                     $value = esc_attr($field_info->default_value);

-                }elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){

+                } elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){

                     $value = $cf['defaults']['default_value'];

                 }

                 ?>

@@ -398,11 +403,11 @@ 
 

                 echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->show_in)) {

                     $value = esc_attr($field_info->show_in);

-                }elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){

+                } elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){

                     $value = esc_attr($cf['defaults']['show_in']);

                 }

                 ?>

@@ -443,7 +448,7 @@ 
                         // don't show new tab option for some types

 

                         if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

-                        }else{

+                        } else{

                             unset($show_in_locations['[owntab]']);

                         }

 

@@ -556,11 +561,11 @@ 
 

                 echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->is_required)) {

                     $value = esc_attr($field_info->is_required);

-                }elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){

+                } elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){

                     $value = $cf['defaults']['is_required'];

                 }

                 ?>

@@ -597,11 +602,11 @@ 
 

                 echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->required_msg)) {

                     $value = esc_attr($field_info->required_msg);

-                }elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){

+                } elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){

                     $value = $cf['defaults']['required_msg'];

                 }

                 ?>

@@ -642,11 +647,11 @@ 
 

                 echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->field_icon)) {

                     $value = esc_attr($field_info->field_icon);

-                }elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){

+                } elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){

                     $value = $cf['defaults']['field_icon'];

                 }

                 ?>

@@ -675,11 +680,11 @@ 
 

                 echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 if (isset($field_info->css_class)) {

                     $value = esc_attr($field_info->css_class);

-                }elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){

+                } elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){

                     $value = $cf['defaults']['css_class'];

                 }

                 ?>

@@ -708,12 +713,12 @@ 
 

                 echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);

 

-            }else{

+            } else{

                 $value = '';

                 $hide_cat_sort  ='';

                 if (isset($field_info->cat_sort)) {

                     $value = esc_attr($field_info->cat_sort);

-                }elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){

+                } elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){

                     $value = $cf['defaults']['cat_sort'];

                     $hide_cat_sort = ($value===false) ? "style='display:none;'" : '';

                 }

Spacing +123 added lines, -123 removed lines

@@ -39,12 +39,12 @@ 
 $cf = (isset($cf_arr[$field_type_key])) ? $cf_arr[$field_type_key] : '';

 

 

-if(isset($field_info->extra_fields)){$extra_fields = $field_info->extra_fields;}

+if (isset($field_info->extra_fields)) {$extra_fields = $field_info->extra_fields; }

 $field_info = stripslashes_deep($field_info); // strip slashes from labels

-if(isset($field_info->extra_fields)){$field_info->extra_fields = $extra_fields;}

+if (isset($field_info->extra_fields)) {$field_info->extra_fields = $extra_fields; }

 

 

-$nonce = wp_create_nonce('custom_fields_' . $result_str);

+$nonce = wp_create_nonce('custom_fields_'.$result_str);

 

 $field_admin_title = '';

 if (isset($field_info->admin_title))

@@ -69,15 +69,15 @@ 
 

 if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {

     $field_icon = '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';

-}elseif(isset($cf['icon']) && $cf['icon']){

+}elseif (isset($cf['icon']) && $cf['icon']) {

     $field_icon = '<b style="background-image: url("'.$cf['icon'].'")"></b>';

-}else{

+} else {

     $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';

 }

 

-if(isset($cf['name']) && $cf['name']){

+if (isset($cf['name']) && $cf['name']) {

     $field_type_name = $cf['name'];

-}else{

+} else {

     $field_type_name = $field_type;

 }

 

@@ -88,7 +88,7 @@ 
          ondblclick="show_hide('field_frm<?php echo $result_str; ?>')">

         <?php

 

-        $nonce = wp_create_nonce('custom_fields_' . $result_str);

+        $nonce = wp_create_nonce('custom_fields_'.$result_str);

         ?>

 

         <?php if ($default): ?>

@@ -103,12 +103,12 @@ 
             <i class="fa fa-long-arrow-left " aria-hidden="true"></i>

             <i class="fa fa-long-arrow-right " aria-hidden="true"></i>

             <b style="cursor:pointer;"

-               onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory') . ' ' . $field_admin_title);?></b>

+               onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory').' '.$field_admin_title); ?></b>

         <?php

         } else {echo $field_icon;

             ?>

             <b style="cursor:pointer;"

-               onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(' ' . $field_admin_title . ' (' . $field_type_name . ')');?></b>

+               onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(' '.$field_admin_title.' ('.$field_type_name.')'); ?></b>

         <?php

         }

         ?>

@@ -131,43 +131,43 @@ 
         } ?>"/>

         <input type="hidden" name="is_active" id="is_active" value="1"/>

 

-        <input type="hidden" name="is_default" value="<?php echo isset($field_info->is_default) ? $field_info->is_default : '';?>" /><?php // show in sidebar value?>

-        <input type="hidden" name="show_on_listing" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : '';?>" />

-        <input type="hidden" name="show_on_detail" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : '';?>" />

-        <input type="hidden" name="show_as_tab" value="<?php echo isset($field_info->show_as_tab) ? $field_info->show_as_tab : '';?>" />

+        <input type="hidden" name="is_default" value="<?php echo isset($field_info->is_default) ? $field_info->is_default : ''; ?>" /><?php // show in sidebar value?>

+        <input type="hidden" name="show_on_listing" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : ''; ?>" />

+        <input type="hidden" name="show_on_detail" value="<?php echo isset($field_info->show_on_listing) ? $field_info->show_on_listing : ''; ?>" />

+        <input type="hidden" name="show_as_tab" value="<?php echo isset($field_info->show_as_tab) ? $field_info->show_as_tab : ''; ?>" />

 

         <ul class="widefat post fixed" border="0" style="width:100%;">

 

             <?php

 

             // data_type

-            if(has_filter("geodir_cfa_data_type_{$field_type}")){

+            if (has_filter("geodir_cfa_data_type_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_data_type_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_data_type_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->data_type)) {

                     $value = esc_attr($field_info->data_type);

-                }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

+                }elseif (isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']) {

                     $value = $cf['defaults']['data_type'];

                 }

                 ?>

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

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

             <?php

             }

 

 

             // admin_title

-            if(has_filter("geodir_cfa_admin_title_{$field_type}")){

+            if (has_filter("geodir_cfa_admin_title_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_admin_title_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_admin_title_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->admin_title)) {

                     $value = esc_attr($field_info->admin_title);

-                }elseif(isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']){

+                }elseif (isset($cf['defaults']['admin_title']) && $cf['defaults']['admin_title']) {

                     $value = $cf['defaults']['admin_title'];

                 }

                 ?>

@@ -180,7 +180,7 @@ 
                     </label>

                     <div class="gd-cf-input-wrap">

                         <input type="text" name="admin_title" id="admin_title"

-                               value="<?php echo $value;?>"/>

+                               value="<?php echo $value; ?>"/>

                     </div>

                 </li>

                 <?php

@@ -188,15 +188,15 @@ 
 

 

             // site_title

-            if(has_filter("geodir_cfa_site_title_{$field_type}")){

+            if (has_filter("geodir_cfa_site_title_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_site_title_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_site_title_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->site_title)) {

                     $value = esc_attr($field_info->site_title);

-                }elseif(isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']){

+                }elseif (isset($cf['defaults']['site_title']) && $cf['defaults']['site_title']) {

                     $value = $cf['defaults']['site_title'];

                 }

                 ?>

@@ -216,15 +216,15 @@ 
 

 

             // admin_desc

-            if(has_filter("geodir_cfa_admin_desc_{$field_type}")){

+            if (has_filter("geodir_cfa_admin_desc_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_admin_desc_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_admin_desc_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->admin_desc)) {

                     $value = esc_attr($field_info->admin_desc);

-                }elseif(isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']){

+                }elseif (isset($cf['defaults']['admin_desc']) && $cf['defaults']['admin_desc']) {

                     $value = $cf['defaults']['admin_desc'];

                 }

                 ?>

@@ -235,7 +235,7 @@ 
                         </div>

                     </label>

                     <div class="gd-cf-input-wrap">

-                        <input type="text" name="admin_desc" id="admin_desc" value="<?php echo $value;?>"/>

+                        <input type="text" name="admin_desc" id="admin_desc" value="<?php echo $value; ?>"/>

                     </div>

                 </li>

                 <?php

@@ -244,26 +244,26 @@ 
 

 

             // htmlvar_name

-            if(has_filter("geodir_cfa_htmlvar_name_{$field_type}")){

+            if (has_filter("geodir_cfa_htmlvar_name_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_htmlvar_name_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->htmlvar_name)) {

                     $value = esc_attr($field_info->htmlvar_name);

-                }elseif(isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']){

+                }elseif (isset($cf['defaults']['htmlvar_name']) && $cf['defaults']['htmlvar_name']) {

                     $value = $cf['defaults']['htmlvar_name'];

                 }

                 ?>

                 <li>

-                    <label for="htmlvar_name" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory');?>

+                    <label for="htmlvar_name" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

                             <?php _e('This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters.', 'geodirectory'); ?>

                         </div>

                     </label>

                     <div class="gd-cf-input-wrap">

-                        <input type="text" name="htmlvar_name" id="htmlvar_name" pattern="[a-zA-Z0-9]+" title="<?php _e('Must not contain spaces or special characters', 'geodirectory');?>"

+                        <input type="text" name="htmlvar_name" id="htmlvar_name" pattern="[a-zA-Z0-9]+" title="<?php _e('Must not contain spaces or special characters', 'geodirectory'); ?>"

                                value="<?php if ($value) {

                                    echo preg_replace('/geodir_/', '', $value, 1);

                                }?>" <?php if ($default) {

@@ -276,15 +276,15 @@ 
 

 

             // is_active

-            if(has_filter("geodir_cfa_is_active_{$field_type}")){

+            if (has_filter("geodir_cfa_is_active_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_is_active_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_is_active_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->is_active)) {

                     $value = esc_attr($field_info->is_active);

-                }elseif(isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']){

+                }elseif (isset($cf['defaults']['is_active']) && $cf['defaults']['is_active']) {

                     $value = $cf['defaults']['is_active'];

                 }

                 ?>

@@ -296,17 +296,17 @@ 
                     </label>

                     <div class="gd-cf-input-wrap gd-switch">

 

-                        <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled"  value="1"

+                        <input type="radio" id="is_active_yes<?php echo $radio_id; ?>" name="is_active" class="gdri-enabled"  value="1"

                             <?php if ($value == '1') {

                                 echo 'checked';

                             } ?>/>

-                        <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                        <label for="is_active_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                        <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0"

+                        <input type="radio" id="is_active_no<?php echo $radio_id; ?>" name="is_active" class="gdri-disabled" value="0"

                             <?php if ($value == '0' || !$value) {

                                 echo 'checked';

                             } ?>/>

-                        <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                        <label for="is_active_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                     </div>

                 </li>

@@ -315,15 +315,15 @@ 
 

 

             // for_admin_use

-            if(has_filter("geodir_cfa_for_admin_use_{$field_type}")){

+            if (has_filter("geodir_cfa_for_admin_use_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_for_admin_use_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_for_admin_use_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->for_admin_use)) {

                     $value = esc_attr($field_info->for_admin_use);

-                }elseif(isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']){

+                }elseif (isset($cf['defaults']['for_admin_use']) && $cf['defaults']['for_admin_use']) {

                     $value = $cf['defaults']['for_admin_use'];

                 }

                 ?>

@@ -335,17 +335,17 @@ 
                     </label>

                     <div class="gd-cf-input-wrap gd-switch">

 

-                        <input type="radio" id="for_admin_use_yes<?php echo $radio_id;?>" name="for_admin_use" class="gdri-enabled"  value="1"

+                        <input type="radio" id="for_admin_use_yes<?php echo $radio_id; ?>" name="for_admin_use" class="gdri-enabled"  value="1"

                             <?php if ($value == '1') {

                                 echo 'checked';

                             } ?>/>

-                        <label for="for_admin_use_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                        <label for="for_admin_use_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                        <input type="radio" id="for_admin_use_no<?php echo $radio_id;?>" name="for_admin_use" class="gdri-disabled" value="0"

+                        <input type="radio" id="for_admin_use_no<?php echo $radio_id; ?>" name="for_admin_use" class="gdri-disabled" value="0"

                             <?php if ($value == '0' || !$value) {

                                 echo 'checked';

                             } ?>/>

-                        <label for="for_admin_use_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                        <label for="for_admin_use_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                     </div>

                 </li>

@@ -354,20 +354,20 @@ 
 

 

             // default_value

-            if(has_filter("geodir_cfa_default_value_{$field_type}")){

+            if (has_filter("geodir_cfa_default_value_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_default_value_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_default_value_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->default_value)) {

                     $value = esc_attr($field_info->default_value);

-                }elseif(isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']){

+                }elseif (isset($cf['defaults']['default_value']) && $cf['defaults']['default_value']) {

                     $value = $cf['defaults']['default_value'];

                 }

                 ?>

                 <li>

-                    <label for="default_value" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default value :', 'geodirectory');?>

+                    <label for="default_value" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default value :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

                             <?php

                             if ($field_type == 'checkbox') {

@@ -384,12 +384,12 @@ 
                         <?php if ($field_type == 'checkbox') { ?>

                             <select name="default_value" id="default_value">

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

-                                <option value="1" <?php selected(true, (int)$value === 1);?>><?php _e('Checked', 'geodirectory'); ?></option>

+                                <option value="1" <?php selected(true, (int) $value === 1); ?>><?php _e('Checked', 'geodirectory'); ?></option>

                             </select>

                         <?php } else if ($field_type == 'email') { ?>

-                            <input type="email" name="default_value" placeholder="<?php _e('info@mysite.com', 'geodirectory') ;?>" id="default_value" value="<?php echo esc_attr($value);?>" /><br/>

+                            <input type="email" name="default_value" placeholder="<?php _e('info@mysite.com', 'geodirectory'); ?>" id="default_value" value="<?php echo esc_attr($value); ?>" /><br/>

                         <?php } else { ?>

-                            <input type="text" name="default_value" id="default_value" value="<?php echo esc_attr($value);?>" /><br/>

+                            <input type="text" name="default_value" id="default_value" value="<?php echo esc_attr($value); ?>" /><br/>

                         <?php } ?>

                     </div>

                 </li>

@@ -398,15 +398,15 @@ 
 

 

             // show_in

-            if(has_filter("geodir_cfa_show_in_{$field_type}")){

+            if (has_filter("geodir_cfa_show_in_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_show_in_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_show_in_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->show_in)) {

                     $value = esc_attr($field_info->show_in);

-                }elseif(isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']){

+                }elseif (isset($cf['defaults']['show_in']) && $cf['defaults']['show_in']) {

                     $value = esc_attr($cf['defaults']['show_in']);

                 }

                 ?>

@@ -439,7 +439,7 @@ 
                          * @param object $field_info The field being displayed info.

                          * @param string $field_info The type of field.

                          */

-                        $show_in_locations = apply_filters('geodir_show_in_locations',$show_in_locations,$field_info,$field_type);

+                        $show_in_locations = apply_filters('geodir_show_in_locations', $show_in_locations, $field_info, $field_type);

 

 

                         // remove some locations for some field types

@@ -447,11 +447,11 @@ 
                         // don't show new tab option for some types

 

                         if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

-                        }else{

+                        } else {

                             unset($show_in_locations['[owntab]']);

                         }

 

-                        if(!$display_on_listing){

+                        if (!$display_on_listing) {

                             unset($show_in_locations['[listings]']);

                         }

 

@@ -465,17 +465,17 @@ 
                                 option-ajaxchosen="false">

                             <?php

 

-                            $show_in_values = explode(',',$value);

+                            $show_in_values = explode(',', $value);

 

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

+                            foreach ($show_in_locations as $key => $val) {

                                 $selected = '';

 

-                                if(is_array($show_in_values) && in_array($key,$show_in_values ) ){

+                                if (is_array($show_in_values) && in_array($key, $show_in_values)) {

                                     $selected = 'selected';

                                 }

 

                                 ?>

-                                <option  value="<?php echo $key;?>" <?php echo $selected;?>><?php echo $val;?></option>

+                                <option  value="<?php echo $key; ?>" <?php echo $selected; ?>><?php echo $val; ?></option>

                                 <?php

                             }

                             ?>

@@ -487,9 +487,9 @@ 
 

 

             // advanced_editor

-            if(has_filter("geodir_cfa_advanced_editor_{$field_type}")){

+            if (has_filter("geodir_cfa_advanced_editor_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_advanced_editor_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_advanced_editor_{$field_type}", '', $result_str, $cf, $field_info);

 

             }

 

@@ -500,10 +500,10 @@ 
 

 

             <?php // @todo this does not seem to be used for anything, it can be removed or replaced ?>

-            <input type="hidden" name="clabels" id="clabels" value="<?php if (isset($field_info->clabels)) { echo esc_attr($field_info->clabels);} ?>"/>

+            <input type="hidden" name="clabels" id="clabels" value="<?php if (isset($field_info->clabels)) { echo esc_attr($field_info->clabels); } ?>"/>

 

             <?php // we dont need to show the sort order ?>

-            <input type="hidden" readonly="readonly" name="sort_order" id="sort_order" value="<?php if (isset($field_info->sort_order)) { echo esc_attr($field_info->sort_order);} ?>"/>

+            <input type="hidden" readonly="readonly" name="sort_order" id="sort_order" value="<?php if (isset($field_info->sort_order)) { echo esc_attr($field_info->sort_order); } ?>"/>

 

 

 

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

 

             // is_required

-            if(has_filter("geodir_cfa_is_required_{$field_type}")){

+            if (has_filter("geodir_cfa_is_required_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_is_required_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_is_required_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->is_required)) {

                     $value = esc_attr($field_info->is_required);

-                }elseif(isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']){

+                }elseif (isset($cf['defaults']['is_required']) && $cf['defaults']['is_required']) {

                     $value = $cf['defaults']['is_required'];

                 }

                 ?>

@@ -577,17 +577,17 @@ 
 

                     <div class="gd-cf-input-wrap gd-switch">

 

-                        <input type="radio" id="is_required_yes<?php echo $radio_id;?>" name="is_required" class="gdri-enabled"  value="1"

+                        <input type="radio" id="is_required_yes<?php echo $radio_id; ?>" name="is_required" class="gdri-enabled"  value="1"

                             <?php if ($value == '1') {

                                 echo 'checked';

                             } ?>/>

-                        <label onclick="show_hide_radio(this,'show','cf-is-required-msg');" for="is_required_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                        <label onclick="show_hide_radio(this,'show','cf-is-required-msg');" for="is_required_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                        <input type="radio" id="is_required_no<?php echo $radio_id;?>" name="is_required" class="gdri-disabled" value="0"

+                        <input type="radio" id="is_required_no<?php echo $radio_id; ?>" name="is_required" class="gdri-disabled" value="0"

                             <?php if ($value == '0' || !$value) {

                                 echo 'checked';

                             } ?>/>

-                        <label onclick="show_hide_radio(this,'hide','cf-is-required-msg');" for="is_required_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                        <label onclick="show_hide_radio(this,'hide','cf-is-required-msg');" for="is_required_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                     </div>

 

@@ -597,19 +597,19 @@ 
             }

 

             // required_msg

-            if(has_filter("geodir_cfa_required_msg_{$field_type}")){

+            if (has_filter("geodir_cfa_required_msg_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_required_msg_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_required_msg_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->required_msg)) {

                     $value = esc_attr($field_info->required_msg);

-                }elseif(isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']){

+                }elseif (isset($cf['defaults']['required_msg']) && $cf['defaults']['required_msg']) {

                     $value = $cf['defaults']['required_msg'];

                 }

                 ?>

-                <li class="cf-is-required-msg" <?php if ((isset($field_info->is_required) && $field_info->is_required == '0') || !isset($field_info->is_required)) {echo "style='display:none;'";}?>>

+                <li class="cf-is-required-msg" <?php if ((isset($field_info->is_required) && $field_info->is_required == '0') || !isset($field_info->is_required)) {echo "style='display:none;'"; }?>>

                     <label for="required_msg" class="gd-cf-tooltip-wrap">

                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Required message:', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

@@ -626,31 +626,31 @@ 
 

 

             // required_msg

-            if(has_filter("geodir_cfa_validation_pattern_{$field_type}")){

+            if (has_filter("geodir_cfa_validation_pattern_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_validation_pattern_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_validation_pattern_{$field_type}", '', $result_str, $cf, $field_info);

 

             }

 

 

             // extra_fields

-            if(has_filter("geodir_cfa_extra_fields_{$field_type}")){

+            if (has_filter("geodir_cfa_extra_fields_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_extra_fields_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_extra_fields_{$field_type}", '', $result_str, $cf, $field_info);

 

             }

 

 

             // field_icon

-            if(has_filter("geodir_cfa_field_icon_{$field_type}")){

+            if (has_filter("geodir_cfa_field_icon_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_field_icon_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_field_icon_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->field_icon)) {

                     $value = esc_attr($field_info->field_icon);

-                }elseif(isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']){

+                }elseif (isset($cf['defaults']['field_icon']) && $cf['defaults']['field_icon']) {

                     $value = $cf['defaults']['field_icon'];

                 }

                 ?>

@@ -661,12 +661,12 @@ 
                     <label for="field_icon" class="gd-cf-tooltip-wrap">

                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Upload icon :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

-                            <?php _e('Upload icon using media and enter its url path, or enter <a href="http://fortawesome.github.io/Font-Awesome/icons/" target="_blank" >font awesome </a>class eg:"fa fa-home"', 'geodirectory');?>

+                            <?php _e('Upload icon using media and enter its url path, or enter <a href="http://fortawesome.github.io/Font-Awesome/icons/" target="_blank" >font awesome </a>class eg:"fa fa-home"', 'geodirectory'); ?>

                         </div>

                     </label>

                     <div class="gd-cf-input-wrap">

                         <input type="text" name="field_icon" id="field_icon"

-                               value="<?php echo $value;?>"/>

+                               value="<?php echo $value; ?>"/>

                     </div>

 

                 </li>

@@ -675,15 +675,15 @@ 
 

 

             // css_class

-            if(has_filter("geodir_cfa_css_class_{$field_type}")){

+            if (has_filter("geodir_cfa_css_class_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_css_class_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_css_class_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

                 if (isset($field_info->css_class)) {

                     $value = esc_attr($field_info->css_class);

-                }elseif(isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']){

+                }elseif (isset($cf['defaults']['css_class']) && $cf['defaults']['css_class']) {

                     $value = $cf['defaults']['css_class'];

                 }

                 ?>

@@ -692,8 +692,8 @@ 
                     <label for="css_class" class="gd-cf-tooltip-wrap">

                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Css class :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

-                            <?php _e('Enter custom css class for field custom style.', 'geodirectory');?>

-                            <?php if($field_type=='multiselect'){_e('(Enter class `gd-comma-list` to show list as comma separated)', 'geodirectory');}?>

+                            <?php _e('Enter custom css class for field custom style.', 'geodirectory'); ?>

+                            <?php if ($field_type == 'multiselect') {_e('(Enter class `gd-comma-list` to show list as comma separated)', 'geodirectory'); }?>

                         </div>

                     </label>

                     <div class="gd-cf-input-wrap">

@@ -708,23 +708,23 @@ 
 

 

             // cat_sort

-            if(has_filter("geodir_cfa_cat_sort_{$field_type}")){

+            if (has_filter("geodir_cfa_cat_sort_{$field_type}")) {

 

-                echo apply_filters("geodir_cfa_cat_sort_{$field_type}",'',$result_str,$cf,$field_info);

+                echo apply_filters("geodir_cfa_cat_sort_{$field_type}", '', $result_str, $cf, $field_info);

 

-            }else{

+            } else {

                 $value = '';

-                $hide_cat_sort  ='';

+                $hide_cat_sort = '';

                 if (isset($field_info->cat_sort)) {

                     $value = esc_attr($field_info->cat_sort);

-                }elseif(isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']){

+                }elseif (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']) {

                     $value = $cf['defaults']['cat_sort'];

-                    $hide_cat_sort = ($value===false) ? "style='display:none;'" : '';

+                    $hide_cat_sort = ($value === false) ? "style='display:none;'" : '';

                 }

 

-                $hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort']===false) ? "style='display:none;'" : '';

+                $hide_cat_sort = (isset($cf['defaults']['cat_sort']) && $cf['defaults']['cat_sort'] === false) ? "style='display:none;'" : '';

                 ?>

-                <li <?php echo $hide_cat_sort ;?>>

+                <li <?php echo $hide_cat_sort; ?>>

                     <h3><?php

                         /**

                          * Filter the section title.

@@ -743,23 +743,23 @@ 
                     <label for="cat_sort" class="gd-cf-tooltip-wrap">

                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Include this field in sorting options :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

-                            <?php _e('Lets you use this filed as a sorting option, set from sorting options above.', 'geodirectory');?>

+                            <?php _e('Lets you use this filed as a sorting option, set from sorting options above.', 'geodirectory'); ?>

                         </div>

                     </label>

 

                     <div class="gd-cf-input-wrap gd-switch">

 

-                        <input type="radio" id="cat_sort_yes<?php echo $radio_id;?>" name="cat_sort" class="gdri-enabled"  value="1"

+                        <input type="radio" id="cat_sort_yes<?php echo $radio_id; ?>" name="cat_sort" class="gdri-enabled"  value="1"

                             <?php if ($value == '1') {

                                 echo 'checked';

                             } ?>/>

-                        <label for="cat_sort_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                        <label for="cat_sort_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                        <input type="radio" id="cat_sort_no<?php echo $radio_id;?>" name="cat_sort" class="gdri-disabled" value="0"

+                        <input type="radio" id="cat_sort_no<?php echo $radio_id; ?>" name="cat_sort" class="gdri-disabled" value="0"

                             <?php if (!$value) {

                                 echo 'checked';

                             } ?>/>

-                        <label for="cat_sort_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                        <label for="cat_sort_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                     </div>

                 </li>

@@ -786,7 +786,7 @@ 
                      * @param object $field_info The current fields info.

                      * @param array $cf The custom field settings

                      */

-                    do_action('geodir_advance_custom_fields', $field_info,$cf);?>

+                    do_action('geodir_advance_custom_fields', $field_info, $cf); ?>

 

 

                 <?php endswitch; ?>

@@ -798,10 +798,10 @@ 
                     <h3></h3>

                 </label>

                 <div class="gd-cf-input-wrap">

-                    <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save','geodirectory'));?>"

+                    <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save', 'geodirectory')); ?>"

                            onclick="save_field('<?php echo esc_attr($result_str); ?>')"/>

                     <?php if (!$default): ?>

-                        <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete','geodirectory'));?>"

+                        <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete', 'geodirectory')); ?>"

                                                             onclick="delete_field('<?php echo esc_attr($result_str); ?>', '<?php echo $nonce; ?>')"

                                                             class="button"/></a>

                     <?php endif; ?>

geodirectory-functions/custom_fields_predefined.php

Braces +1 added lines, -1 removed lines

@@ -353,7 +353,7 @@
 
     if(!$cpt_left){
         $cpt_left = "gd-cpt-flat";
-    }else{
+    } else{
         $cpt_left = '';
     }
 

Indentation +403 added lines, -403 removed lines

@@ -17,370 +17,370 @@ 
  */
 function geodir_custom_fields_predefined($post_type=''){
 
-    $custom_fields = array();
-
-
-    // price
-    $custom_fields['price'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'text',
-        'class'       =>  'gd-price',
-        'icon'        =>  'fa fa-usd',
-        'name'        =>  __('Price', 'geodirectory'),
-        'description' =>  __('Adds a input for a price field. This will let you filter and sort by price.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'FLOAT',
-            'decimal_point'       =>  '2',
-            'admin_title'         =>  'Price',
-            'site_title'          =>  'Price',
-            'admin_desc'          =>  'Enter the price in $ (no currency symbol)',
-            'htmlvar_name'        =>  'price',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	      =>  '[detail],[listing]',
-            'is_required'         =>  false,
-            'validation_pattern'  =>  '\d+(\.\d{2})?',
-            'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-usd',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true,
-            'extra_fields'        =>  array(
-                'is_price'                  =>  1,
-                'thousand_separator'        =>  'comma',
-                'decimal_separator'         =>  'period',
-                'decimal_display'           =>  'if',
-                'currency_symbol'           =>  '$',
-                'currency_symbol_placement' =>  'left'
-            )
-        )
-    );
-
-    // property status
-    $custom_fields['property_status'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-status',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Status', 'geodirectory'),
-        'description' =>  __('Adds a select input to be able to set the status of a property ie: For Sale, For Rent', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Status',
-            'site_title'          =>  'Property Status',
-            'admin_desc'          =>  'Enter the status of the property.',
-            'htmlvar_name'        =>  'property_status',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-home',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property furnishing
-    $custom_fields['property_furnishing'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-furnishing',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Furnishing', 'geodirectory'),
-        'description' =>  __('Adds a select input to be able to set the furnishing status of a property ie: Unfurnished, Furnished', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Furnishing',
-            'site_title'          =>  'Furnishing',
-            'admin_desc'          =>  'Enter the furnishing status of the property.',
-            'htmlvar_name'        =>  'property_furnishing',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-th-large',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property type
-    $custom_fields['property_type'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-type',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Type', 'geodirectory'),
-        'description' =>  __('Adds a select input for the property type ie: Detached house, Apartment', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Type',
-            'site_title'          =>  'Property Type',
-            'admin_desc'          =>  'Select the property type.',
-            'htmlvar_name'        =>  'property_type',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-home',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property bedrooms
-    $custom_fields['property_bedrooms'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-bedrooms',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Bedrooms', 'geodirectory'),
-        'description' =>  __('Adds a select input for the number of bedrooms.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Bedrooms',
-            'site_title'          =>  'Bedrooms',
-            'admin_desc'          =>  'Select the number of bedrooms',
-            'htmlvar_name'        =>  'property_bedrooms',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-bed',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property bathrooms
-    $custom_fields['property_bathrooms'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-property-bathrooms',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Bathrooms', 'geodirectory'),
-        'description' =>  __('Adds a select input for the number of bathrooms.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Bathrooms',
-            'site_title'          =>  'Bathrooms',
-            'admin_desc'          =>  'Select the number of bathrooms',
-            'htmlvar_name'        =>  'property_bathrooms',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-bold',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property area
-    $custom_fields['property_area'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'text',
-        'class'       =>  'gd-area',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Area', 'geodirectory'),
-        'description' =>  __('Adds a input for the property area.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'FLOAT',
-            'admin_title'         =>  'Property Area',
-            'site_title'          =>  'Area (Sq Ft)',
-            'admin_desc'          =>  'Enter the Sq Ft value for the property',
-            'htmlvar_name'        =>  'property_area',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	      =>  '[detail],[listing]',
-            'is_required'         =>  false,
-            'validation_pattern'  =>  '\d+(\.\d{2})?',
-            'validation_msg'      =>  'Please enter the property area in numbers only: 1500',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-area-chart',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // property features
-    $custom_fields['property_features'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'multiselect',
-        'class'       =>  'gd-property-features',
-        'icon'        =>  'fa fa-home',
-        'name'        =>  __('Property Features', 'geodirectory'),
-        'description' =>  __('Adds a select input for the property features.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Property Features',
-            'site_title'          =>  'Features',
-            'admin_desc'          =>  'Select the property features.',
-            'htmlvar_name'        =>  'property_features',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-plus-square',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // Twitter feed
-    $custom_fields['twitter_feed'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'text',
-        'class'       =>  'gd-twitter',
-        'icon'        =>  'fa fa-twitter',
-        'name'        =>  __('Twitter feed', 'geodirectory'),
-        'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Twitter',
-            'site_title'          =>  'Twitter',
-            'admin_desc'          =>  'Enter your Twitter username',
-            'htmlvar_name'        =>  'twitterusername',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	      =>  '[detail],[owntab]',
-            'is_required'         =>  false,
-            'validation_pattern'  =>  '^[A-Za-z0-9_]{1,32}$',
-            'validation_msg'      =>  'Please enter a valid twitter username.',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-twitter',
-            'css_class'           =>  '',
-            'cat_sort'            =>  false,
-            'cat_filter'	      =>  false
-        )
-    );
-
-    // Get directions link
-    $custom_fields['get_directions'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'text',
-        'class'       =>  'gd-get-directions',
-        'icon'        =>  'fa fa-location-arrow',
-        'name'        =>  __('Get Directions Link', 'geodirectory'),
-        'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  'Get Directions',
-            'site_title'          =>  'Get Directions',
-            'admin_desc'          =>  '',
-            'htmlvar_name'        =>  'get_directions',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  true,
-            'default_value'       =>  'Get Directions',
-            'show_in' 	      =>  '[detail],[listing]',
-            'is_required'         =>  false,
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-location-arrow',
-            'css_class'           =>  '',
-            'cat_sort'            =>  false,
-            'cat_filter'	      =>  false
-        )
-    );
-
-
-    // JOB TYPE CF
-
-    // job type
-    $custom_fields['job_type'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-job-type',
-        'icon'        =>  'fa fa-briefcase',
-        'name'        =>  __('Job Type', 'geodirectory'),
-        'description' =>  __('Adds a select input to be able to set the type of a job ie: Full Time, Part Time', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  __('Job Type', 'geodirectory'),
-            'site_title'          =>  __('Job Type','geodirectory'),
-            'admin_desc'          =>  __('Select the type of job.','geodirectory'),
-            'htmlvar_name'        =>  'job_type',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail],[listing]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-briefcase',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-    // job sector
-    $custom_fields['job_sector'] = array( // The key value should be unique and not contain any spaces.
-        'field_type'  =>  'select',
-        'class'       =>  'gd-job-type',
-        'icon'        =>  'fa fa-briefcase',
-        'name'        =>  __('Job Sector', 'geodirectory'),
-        'description' =>  __('Adds a select input to be able to set the type of a job Sector ie: Private Sector,Public Sector', 'geodirectory'),
-        'defaults'    => array(
-            'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  __('Job Sector','geodirectory'),
-            'site_title'          =>  __('Job Sector','geodirectory'),
-            'admin_desc'          =>  __('Select the job sector.','geodirectory'),
-            'htmlvar_name'        =>  'job_sector',
-            'is_active'           =>  true,
-            'for_admin_use'       =>  false,
-            'default_value'       =>  '',
-            'show_in' 	          =>  '[detail]',
-            'is_required'         =>  true,
-            'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
-            'validation_pattern'  =>  '',
-            'validation_msg'      =>  '',
-            'required_msg'        =>  '',
-            'field_icon'          =>  'fa fa-briefcase',
-            'css_class'           =>  '',
-            'cat_sort'            =>  true,
-            'cat_filter'	      =>  true
-        )
-    );
-
-
-    /**
-     * @see `geodir_custom_fields`
-     */
-    return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
+	$custom_fields = array();
+
+
+	// price
+	$custom_fields['price'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'text',
+		'class'       =>  'gd-price',
+		'icon'        =>  'fa fa-usd',
+		'name'        =>  __('Price', 'geodirectory'),
+		'description' =>  __('Adds a input for a price field. This will let you filter and sort by price.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'FLOAT',
+			'decimal_point'       =>  '2',
+			'admin_title'         =>  'Price',
+			'site_title'          =>  'Price',
+			'admin_desc'          =>  'Enter the price in $ (no currency symbol)',
+			'htmlvar_name'        =>  'price',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	      =>  '[detail],[listing]',
+			'is_required'         =>  false,
+			'validation_pattern'  =>  '\d+(\.\d{2})?',
+			'validation_msg'      =>  'Please enter number and decimal only ie: 100.50',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-usd',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true,
+			'extra_fields'        =>  array(
+				'is_price'                  =>  1,
+				'thousand_separator'        =>  'comma',
+				'decimal_separator'         =>  'period',
+				'decimal_display'           =>  'if',
+				'currency_symbol'           =>  '$',
+				'currency_symbol_placement' =>  'left'
+			)
+		)
+	);
+
+	// property status
+	$custom_fields['property_status'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-status',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Status', 'geodirectory'),
+		'description' =>  __('Adds a select input to be able to set the status of a property ie: For Sale, For Rent', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Status',
+			'site_title'          =>  'Property Status',
+			'admin_desc'          =>  'Enter the status of the property.',
+			'htmlvar_name'        =>  'property_status',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-home',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property furnishing
+	$custom_fields['property_furnishing'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-furnishing',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Furnishing', 'geodirectory'),
+		'description' =>  __('Adds a select input to be able to set the furnishing status of a property ie: Unfurnished, Furnished', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Furnishing',
+			'site_title'          =>  'Furnishing',
+			'admin_desc'          =>  'Enter the furnishing status of the property.',
+			'htmlvar_name'        =>  'property_furnishing',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-th-large',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property type
+	$custom_fields['property_type'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-type',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Type', 'geodirectory'),
+		'description' =>  __('Adds a select input for the property type ie: Detached house, Apartment', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Type',
+			'site_title'          =>  'Property Type',
+			'admin_desc'          =>  'Select the property type.',
+			'htmlvar_name'        =>  'property_type',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-home',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property bedrooms
+	$custom_fields['property_bedrooms'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-bedrooms',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Bedrooms', 'geodirectory'),
+		'description' =>  __('Adds a select input for the number of bedrooms.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Bedrooms',
+			'site_title'          =>  'Bedrooms',
+			'admin_desc'          =>  'Select the number of bedrooms',
+			'htmlvar_name'        =>  'property_bedrooms',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-bed',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property bathrooms
+	$custom_fields['property_bathrooms'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-property-bathrooms',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Bathrooms', 'geodirectory'),
+		'description' =>  __('Adds a select input for the number of bathrooms.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Bathrooms',
+			'site_title'          =>  'Bathrooms',
+			'admin_desc'          =>  'Select the number of bathrooms',
+			'htmlvar_name'        =>  'property_bathrooms',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-bold',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property area
+	$custom_fields['property_area'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'text',
+		'class'       =>  'gd-area',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Area', 'geodirectory'),
+		'description' =>  __('Adds a input for the property area.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'FLOAT',
+			'admin_title'         =>  'Property Area',
+			'site_title'          =>  'Area (Sq Ft)',
+			'admin_desc'          =>  'Enter the Sq Ft value for the property',
+			'htmlvar_name'        =>  'property_area',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	      =>  '[detail],[listing]',
+			'is_required'         =>  false,
+			'validation_pattern'  =>  '\d+(\.\d{2})?',
+			'validation_msg'      =>  'Please enter the property area in numbers only: 1500',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-area-chart',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// property features
+	$custom_fields['property_features'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'multiselect',
+		'class'       =>  'gd-property-features',
+		'icon'        =>  'fa fa-home',
+		'name'        =>  __('Property Features', 'geodirectory'),
+		'description' =>  __('Adds a select input for the property features.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Property Features',
+			'site_title'          =>  'Features',
+			'admin_desc'          =>  'Select the property features.',
+			'htmlvar_name'        =>  'property_features',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-plus-square',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// Twitter feed
+	$custom_fields['twitter_feed'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'text',
+		'class'       =>  'gd-twitter',
+		'icon'        =>  'fa fa-twitter',
+		'name'        =>  __('Twitter feed', 'geodirectory'),
+		'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Twitter',
+			'site_title'          =>  'Twitter',
+			'admin_desc'          =>  'Enter your Twitter username',
+			'htmlvar_name'        =>  'twitterusername',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	      =>  '[detail],[owntab]',
+			'is_required'         =>  false,
+			'validation_pattern'  =>  '^[A-Za-z0-9_]{1,32}$',
+			'validation_msg'      =>  'Please enter a valid twitter username.',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-twitter',
+			'css_class'           =>  '',
+			'cat_sort'            =>  false,
+			'cat_filter'	      =>  false
+		)
+	);
+
+	// Get directions link
+	$custom_fields['get_directions'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'text',
+		'class'       =>  'gd-get-directions',
+		'icon'        =>  'fa fa-location-arrow',
+		'name'        =>  __('Get Directions Link', 'geodirectory'),
+		'description' =>  __('Adds a input for twitter username and outputs feed.', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  'Get Directions',
+			'site_title'          =>  'Get Directions',
+			'admin_desc'          =>  '',
+			'htmlvar_name'        =>  'get_directions',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  true,
+			'default_value'       =>  'Get Directions',
+			'show_in' 	      =>  '[detail],[listing]',
+			'is_required'         =>  false,
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-location-arrow',
+			'css_class'           =>  '',
+			'cat_sort'            =>  false,
+			'cat_filter'	      =>  false
+		)
+	);
+
+
+	// JOB TYPE CF
+
+	// job type
+	$custom_fields['job_type'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-job-type',
+		'icon'        =>  'fa fa-briefcase',
+		'name'        =>  __('Job Type', 'geodirectory'),
+		'description' =>  __('Adds a select input to be able to set the type of a job ie: Full Time, Part Time', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  __('Job Type', 'geodirectory'),
+			'site_title'          =>  __('Job Type','geodirectory'),
+			'admin_desc'          =>  __('Select the type of job.','geodirectory'),
+			'htmlvar_name'        =>  'job_type',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail],[listing]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-briefcase',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+	// job sector
+	$custom_fields['job_sector'] = array( // The key value should be unique and not contain any spaces.
+		'field_type'  =>  'select',
+		'class'       =>  'gd-job-type',
+		'icon'        =>  'fa fa-briefcase',
+		'name'        =>  __('Job Sector', 'geodirectory'),
+		'description' =>  __('Adds a select input to be able to set the type of a job Sector ie: Private Sector,Public Sector', 'geodirectory'),
+		'defaults'    => array(
+			'data_type'           =>  'VARCHAR',
+			'admin_title'         =>  __('Job Sector','geodirectory'),
+			'site_title'          =>  __('Job Sector','geodirectory'),
+			'admin_desc'          =>  __('Select the job sector.','geodirectory'),
+			'htmlvar_name'        =>  'job_sector',
+			'is_active'           =>  true,
+			'for_admin_use'       =>  false,
+			'default_value'       =>  '',
+			'show_in' 	          =>  '[detail]',
+			'is_required'         =>  true,
+			'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
+			'validation_pattern'  =>  '',
+			'validation_msg'      =>  '',
+			'required_msg'        =>  '',
+			'field_icon'          =>  'fa fa-briefcase',
+			'css_class'           =>  '',
+			'cat_sort'            =>  true,
+			'cat_filter'	      =>  true
+		)
+	);
+
+
+	/**
+	 * @see `geodir_custom_fields`
+	 */
+	return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
 }
 
 
@@ -395,32 +395,32 @@ 
  * @return string The html to output.
  */
 function geodir_predefined_custom_field_output_twitter_feed($html,$location,$cf){
-    global $post;
+	global $post;
 
 
-    if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
+	if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
 
-        $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
+		$class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
 
-        $field_icon = geodir_field_icon_proccess($cf);
-        if (strpos($field_icon, 'http') !== false) {
-            $field_icon_af = '';
-        } elseif ($field_icon == '') {
-            $field_icon_af = ($cf['htmlvar_name'] == 'geodir_timing') ? '<i class="fa fa-clock-o"></i>' : "";
-        } else {
-            $field_icon_af = $field_icon;
-            $field_icon = '';
-        }
+		$field_icon = geodir_field_icon_proccess($cf);
+		if (strpos($field_icon, 'http') !== false) {
+			$field_icon_af = '';
+		} elseif ($field_icon == '') {
+			$field_icon_af = ($cf['htmlvar_name'] == 'geodir_timing') ? '<i class="fa fa-clock-o"></i>' : "";
+		} else {
+			$field_icon_af = $field_icon;
+			$field_icon = '';
+		}
 
 
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
+		$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
 
-        $html .= '<a class="twitter-timeline" data-height="600" data-dnt="true" href="https://twitter.com/'.$post->{$cf['htmlvar_name']}.'">Tweets by '.$post->{$cf['htmlvar_name']}.'</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>';
-        $html .= '</div>';
+		$html .= '<a class="twitter-timeline" data-height="600" data-dnt="true" href="https://twitter.com/'.$post->{$cf['htmlvar_name']}.'">Tweets by '.$post->{$cf['htmlvar_name']}.'</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>';
+		$html .= '</div>';
 
-    endif;
+	endif;
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_output_text_key_twitter_feed','geodir_predefined_custom_field_output_twitter_feed',10,3);
 
@@ -435,36 +435,36 @@ 
  * @return string The html to output.
  */
 function geodir_predefined_custom_field_output_get_directions($html,$location,$cf) {
-    global $post;
+	global $post;
 
 
-    if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
+	if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
 
-        $field_icon = geodir_field_icon_proccess( $cf );
-        if ( strpos( $field_icon, 'http' ) !== false ) {
-            $field_icon_af = '';
-        } elseif ( $field_icon == '' ) {
-            $field_icon_af = '<i class="fa fa-location-arrow"></i>';
-        } else {
-            $field_icon_af = $field_icon;
-            $field_icon    = '';
-        }
+		$field_icon = geodir_field_icon_proccess( $cf );
+		if ( strpos( $field_icon, 'http' ) !== false ) {
+			$field_icon_af = '';
+		} elseif ( $field_icon == '' ) {
+			$field_icon_af = '<i class="fa fa-location-arrow"></i>';
+		} else {
+			$field_icon_af = $field_icon;
+			$field_icon    = '';
+		}
 
-        $link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
+		$link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
 
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
+		$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
 
-        if(isset( $cf['field_icon'] ) && $cf['field_icon']){
-            $html .= $field_icon_af;
-        }
+		if(isset( $cf['field_icon'] ) && $cf['field_icon']){
+			$html .= $field_icon_af;
+		}
 
-        $html .= '<a href="https://www.google.com/maps/dir//\'' . $post->post_latitude . ',' . $post->post_longitude . '\'/" target="_blank" >' . $link_text . '</a>';
-        $html .= '</div>';
+		$html .= '<a href="https://www.google.com/maps/dir//\'' . $post->post_latitude . ',' . $post->post_longitude . '\'/" target="_blank" >' . $link_text . '</a>';
+		$html .= '</div>';
 
-    }else{
-        $html ='';
-    }
+	}else{
+		$html ='';
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_output_text_key_get_directions','geodir_predefined_custom_field_output_get_directions',10,3);

Spacing +31 added lines, -31 removed lines

@@ -15,7 +15,7 @@ 
  * @package GeoDirectory
  * @see `geodir_custom_field_save` for array details.
  */
-function geodir_custom_fields_predefined($post_type=''){
+function geodir_custom_fields_predefined($post_type = '') {
 
     $custom_fields = array();
 
@@ -75,7 +75,7 @@ 
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let','geodirectory'),
+            'option_values'       =>  __('Select Status/,For Sale,For Rent,Sold,Let', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -104,7 +104,7 @@ 
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional','geodirectory'),
+            'option_values'       =>  __('Select Status/,Unfurnished,Furnished,Partially furnished,Optional', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -133,7 +133,7 @@ 
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage','geodirectory'),
+            'option_values'       =>  __('Select Type/,Detached house,Semi-detached house,Apartment,Bungalow,Semi-detached bungalow,Chalet,Town House,End-terrace house,Terrace house,Cottage', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -162,7 +162,7 @@ 
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+            'option_values'       =>  __('Select Bedrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -191,7 +191,7 @@ 
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10','geodirectory'),
+            'option_values'       =>  __('Select Bathrooms/,1,2,3,4,5,6,7,8,9,10', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -248,7 +248,7 @@ 
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace','geodirectory'),
+            'option_values'       =>  __('Select Features/,Gas Central Heating,Oil Central Heating,Double Glazing,Triple Glazing,Front Garden,Garage,Private driveway,Off Road Parking,Fireplace', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -328,15 +328,15 @@ 
         'defaults'    => array(
             'data_type'           =>  'VARCHAR',
             'admin_title'         =>  __('Job Type', 'geodirectory'),
-            'site_title'          =>  __('Job Type','geodirectory'),
-            'admin_desc'          =>  __('Select the type of job.','geodirectory'),
+            'site_title'          =>  __('Job Type', 'geodirectory'),
+            'admin_desc'          =>  __('Select the type of job.', 'geodirectory'),
             'htmlvar_name'        =>  'job_type',
             'is_active'           =>  true,
             'for_admin_use'       =>  false,
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail],[listing]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other','geodirectory'),
+            'option_values'       =>  __('Select Type/,Freelance,Full Time,Internship,Part Time,Temporary,Other', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -356,16 +356,16 @@ 
         'description' =>  __('Adds a select input to be able to set the type of a job Sector ie: Private Sector,Public Sector', 'geodirectory'),
         'defaults'    => array(
             'data_type'           =>  'VARCHAR',
-            'admin_title'         =>  __('Job Sector','geodirectory'),
-            'site_title'          =>  __('Job Sector','geodirectory'),
-            'admin_desc'          =>  __('Select the job sector.','geodirectory'),
+            'admin_title'         =>  __('Job Sector', 'geodirectory'),
+            'site_title'          =>  __('Job Sector', 'geodirectory'),
+            'admin_desc'          =>  __('Select the job sector.', 'geodirectory'),
             'htmlvar_name'        =>  'job_sector',
             'is_active'           =>  true,
             'for_admin_use'       =>  false,
             'default_value'       =>  '',
             'show_in' 	          =>  '[detail]',
             'is_required'         =>  true,
-            'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies','geodirectory'),
+            'option_values'       =>  __('Select Sector/,Private Sector,Public Sector,Agencies', 'geodirectory'),
             'validation_pattern'  =>  '',
             'validation_msg'      =>  '',
             'required_msg'        =>  '',
@@ -380,7 +380,7 @@ 
     /**
      * @see `geodir_custom_fields`
      */
-    return apply_filters('geodir_custom_fields_predefined',$custom_fields,$post_type);
+    return apply_filters('geodir_custom_fields_predefined', $custom_fields, $post_type);
 }
 
 
@@ -394,11 +394,11 @@ 
  * @since 1.6.9
  * @return string The html to output.
  */
-function geodir_predefined_custom_field_output_twitter_feed($html,$location,$cf){
+function geodir_predefined_custom_field_output_twitter_feed($html, $location, $cf) {
     global $post;
 
 
-    if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
+    if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
 
         $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
 
@@ -413,7 +413,7 @@ 
         }
 
 
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
+        $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;">';
 
         $html .= '<a class="twitter-timeline" data-height="600" data-dnt="true" href="https://twitter.com/'.$post->{$cf['htmlvar_name']}.'">Tweets by '.$post->{$cf['htmlvar_name']}.'</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>';
         $html .= '</div>';
@@ -422,7 +422,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_text_key_twitter_feed','geodir_predefined_custom_field_output_twitter_feed',10,3);
+add_filter('geodir_custom_field_output_text_key_twitter_feed', 'geodir_predefined_custom_field_output_twitter_feed', 10, 3);
 
 /**
  * Filter the get_directions custom field output to show a link.
@@ -434,37 +434,37 @@ 
  * @since 1.6.9
  * @return string The html to output.
  */
-function geodir_predefined_custom_field_output_get_directions($html,$location,$cf) {
+function geodir_predefined_custom_field_output_get_directions($html, $location, $cf) {
     global $post;
 
 
-    if ( isset( $post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset( $post->post_latitude ) && $post->post_latitude ){
+    if (isset($post->{$cf['htmlvar_name']} ) && $post->{$cf['htmlvar_name']} != '' && isset($post->post_latitude) && $post->post_latitude) {
 
-        $field_icon = geodir_field_icon_proccess( $cf );
-        if ( strpos( $field_icon, 'http' ) !== false ) {
+        $field_icon = geodir_field_icon_proccess($cf);
+        if (strpos($field_icon, 'http') !== false) {
             $field_icon_af = '';
-        } elseif ( $field_icon == '' ) {
+        } elseif ($field_icon == '') {
             $field_icon_af = '<i class="fa fa-location-arrow"></i>';
         } else {
             $field_icon_af = $field_icon;
             $field_icon    = '';
         }
 
-        $link_text = isset( $post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __( 'Get Directions', 'geodirectory' );
+        $link_text = isset($post->{$cf['default_value']} ) ? $post->{$cf['default_value']} : __('Get Directions', 'geodirectory');
 
-        $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;">';
+        $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;">';
 
-        if(isset( $cf['field_icon'] ) && $cf['field_icon']){
+        if (isset($cf['field_icon']) && $cf['field_icon']) {
             $html .= $field_icon_af;
         }
 
-        $html .= '<a href="https://www.google.com/maps/dir//\'' . $post->post_latitude . ',' . $post->post_longitude . '\'/" target="_blank" >' . $link_text . '</a>';
+        $html .= '<a href="https://www.google.com/maps/dir//\''.$post->post_latitude.','.$post->post_longitude.'\'/" target="_blank" >'.$link_text.'</a>';
         $html .= '</div>';
 
-    }else{
-        $html ='';
+    } else {
+        $html = '';
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_text_key_get_directions','geodir_predefined_custom_field_output_get_directions',10,3);
+add_filter('geodir_custom_field_output_text_key_get_directions', 'geodir_predefined_custom_field_output_get_directions', 10, 3);

uninstall.php

Indentation +5 added lines, -5 removed lines

@@ -10,21 +10,21 @@
 
 // Exit if accessed directly.
 if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
-    exit;
+	exit;
 }
 
 global $wpdb;
 
 if (get_option('geodir_un_geodirectory')) {
-    $wpdb->hide_errors();
+	$wpdb->hide_errors();
     
-    /*
+	/*
     if (!defined('GEODIRECTORY_VERSION')) {
         // Load plugin file.
         include_once('geodirectory.php');
     }
     */
 
-    // Delete default data.
-    delete_option('geodir_default_data_installed');
+	// Delete default data.
+	delete_option('geodir_default_data_installed');
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if (!defined('WP_UNINSTALL_PLUGIN')) {
     exit;
 }
 

geodirectory_widgets.php

Indentation +898 added lines, -898 removed lines

@@ -15,296 +15,296 @@ 
  */

 function geodir_register_sidebar()

 {

-    global $geodir_sidebars;

-

-    if (function_exists('register_sidebar')) {

-        /*===========================*/

-        /* Home page sidebars start*/

-        /*===========================*/

-

-        /**

-         * Filter the `$before_widget` widget opening HTML tag.

-         *

-         * @since 1.0.0

-         * @param string $var The HTML string to filter. Default = '<section id="%1$s" class="widget geodir-widget %2$s">'.

-         * @see 'geodir_after_widget'

-         */

-        $before_widget = apply_filters('geodir_before_widget', '<section id="%1$s" class="widget geodir-widget %2$s">');

-        /**

-         * Filter the `$after_widget` widget closing HTML tag.

-         *

-         * @since 1.0.0

-         * @param string $var The HTML string to filter. Default = '</section>'.

-         * @see 'geodir_before_widget'

-         */

-        $after_widget = apply_filters('geodir_after_widget', '</section>');

-        /**

-         * Filter the `$before_title` widget title opening HTML tag.

-         *

-         * @since 1.0.0

-         * @param string $var The HTML string to filter. Default = '<h3 class="widget-title">'.

-         * @see 'geodir_after_title'

-         */

-        $before_title = apply_filters('geodir_before_title', '<h3 class="widget-title">');

-        /**

-         * Filter the `$after_title` widget title closing HTML tag.

-         *

-         * @since 1.0.0

-         * @param string $var The HTML string to filter. Default = '</h3>'.

-         * @see 'geodir_before_title'

-         */

-        $after_title = apply_filters('geodir_after_title', '</h3>');

-

-        if (get_option('geodir_show_home_top_section')) {

-            register_sidebars(1, array('id' => 'geodir_home_top', 'name' => __('GD Home Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

-

-            $geodir_sidebars[] = 'geodir_home_top';

-        }

-

-        if (get_option('geodir_show_home_contant_section')) {

-            register_sidebars(1, array('id' => 'geodir_home_content', 'name' => __('GD Home Content Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+	global $geodir_sidebars;

 

-            $geodir_sidebars[] = 'geodir_home_content';

-        }

+	if (function_exists('register_sidebar')) {

+		/*===========================*/

+		/* Home page sidebars start*/

+		/*===========================*/

 

-        if (get_option('geodir_show_home_right_section')) {

-            register_sidebars(1, array('id' => 'geodir_home_right', 'name' => __('GD Home Right Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		/**

+		 * Filter the `$before_widget` widget opening HTML tag.

+		 *

+		 * @since 1.0.0

+		 * @param string $var The HTML string to filter. Default = '<section id="%1$s" class="widget geodir-widget %2$s">'.

+		 * @see 'geodir_after_widget'

+		 */

+		$before_widget = apply_filters('geodir_before_widget', '<section id="%1$s" class="widget geodir-widget %2$s">');

+		/**

+		 * Filter the `$after_widget` widget closing HTML tag.

+		 *

+		 * @since 1.0.0

+		 * @param string $var The HTML string to filter. Default = '</section>'.

+		 * @see 'geodir_before_widget'

+		 */

+		$after_widget = apply_filters('geodir_after_widget', '</section>');

+		/**

+		 * Filter the `$before_title` widget title opening HTML tag.

+		 *

+		 * @since 1.0.0

+		 * @param string $var The HTML string to filter. Default = '<h3 class="widget-title">'.

+		 * @see 'geodir_after_title'

+		 */

+		$before_title = apply_filters('geodir_before_title', '<h3 class="widget-title">');

+		/**

+		 * Filter the `$after_title` widget title closing HTML tag.

+		 *

+		 * @since 1.0.0

+		 * @param string $var The HTML string to filter. Default = '</h3>'.

+		 * @see 'geodir_before_title'

+		 */

+		$after_title = apply_filters('geodir_after_title', '</h3>');

+

+		if (get_option('geodir_show_home_top_section')) {

+			register_sidebars(1, array('id' => 'geodir_home_top', 'name' => __('GD Home Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_home_right';

-        }

+			$geodir_sidebars[] = 'geodir_home_top';

+		}

 

-        if (get_option('geodir_show_home_left_section')) {

-            register_sidebars(1, array('id' => 'geodir_home_left', 'name' => __('GD Home Left Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_home_contant_section')) {

+			register_sidebars(1, array('id' => 'geodir_home_content', 'name' => __('GD Home Content Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_home_left';

-        }

+			$geodir_sidebars[] = 'geodir_home_content';

+		}

 

-        if (get_option('geodir_show_home_bottom_section')) {

-            register_sidebars(1, array('id' => 'geodir_home_bottom', 'name' => __('GD Home Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_home_right_section')) {

+			register_sidebars(1, array('id' => 'geodir_home_right', 'name' => __('GD Home Right Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_home_bottom';

-        }

+			$geodir_sidebars[] = 'geodir_home_right';

+		}

 

-        /*===========================*/

-        /* Home page sidebars end*/

-        /*===========================*/

+		if (get_option('geodir_show_home_left_section')) {

+			register_sidebars(1, array('id' => 'geodir_home_left', 'name' => __('GD Home Left Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-        /*===========================*/

-        /* Listing page sidebars start*/

-        /*===========================*/

+			$geodir_sidebars[] = 'geodir_home_left';

+		}

 

-        if (get_option('geodir_show_listing_top_section')) {

-            register_sidebars(1, array('id' => 'geodir_listing_top', 'name' => __('GD Listing Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_home_bottom_section')) {

+			register_sidebars(1, array('id' => 'geodir_home_bottom', 'name' => __('GD Home Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_listing_top';

-        }

+			$geodir_sidebars[] = 'geodir_home_bottom';

+		}

 

-        if (get_option('geodir_show_listing_left_section')) {

-            register_sidebars(1, array('id' => 'geodir_listing_left_sidebar', 'name' => __('GD Listing Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		/*===========================*/

+		/* Home page sidebars end*/

+		/*===========================*/

 

-            $geodir_sidebars[] = 'geodir_listing_left_sidebar';

-        }

+		/*===========================*/

+		/* Listing page sidebars start*/

+		/*===========================*/

 

-        if (get_option('geodir_show_listing_right_section')) {

-            register_sidebars(1, array('id' => 'geodir_listing_right_sidebar', 'name' => __('GD Listing Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_listing_top_section')) {

+			register_sidebars(1, array('id' => 'geodir_listing_top', 'name' => __('GD Listing Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_listing_right_sidebar';

-        }

+			$geodir_sidebars[] = 'geodir_listing_top';

+		}

 

-        if (get_option('geodir_show_listing_bottom_section')) {

-            register_sidebars(1, array('id' => 'geodir_listing_bottom', 'name' => __('GD Listing Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_listing_left_section')) {

+			register_sidebars(1, array('id' => 'geodir_listing_left_sidebar', 'name' => __('GD Listing Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_listing_bottom';

-        }

+			$geodir_sidebars[] = 'geodir_listing_left_sidebar';

+		}

 

-        /*===========================*/

-        /* Listing page sidebars start*/

-        /*===========================*/

+		if (get_option('geodir_show_listing_right_section')) {

+			register_sidebars(1, array('id' => 'geodir_listing_right_sidebar', 'name' => __('GD Listing Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-        /*===========================*/

-        /* Search page sidebars start*/

-        /*===========================*/

+			$geodir_sidebars[] = 'geodir_listing_right_sidebar';

+		}

 

-        if (get_option('geodir_show_search_top_section')) {

-            register_sidebars(1, array('id' => 'geodir_search_top', 'name' => __('GD Search Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_listing_bottom_section')) {

+			register_sidebars(1, array('id' => 'geodir_listing_bottom', 'name' => __('GD Listing Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_search_top';

-        }

+			$geodir_sidebars[] = 'geodir_listing_bottom';

+		}

 

-        if (get_option('geodir_show_search_left_section')) {

-            register_sidebars(1, array('id' => 'geodir_search_left_sidebar', 'name' => __('GD Search Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		/*===========================*/

+		/* Listing page sidebars start*/

+		/*===========================*/

 

-            $geodir_sidebars[] = 'geodir_search_left_sidebar';

-        }

+		/*===========================*/

+		/* Search page sidebars start*/

+		/*===========================*/

 

-        if (get_option('geodir_show_search_right_section')) {

-            register_sidebars(1, array('id' => 'geodir_search_right_sidebar', 'name' => __('GD Search Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_search_top_section')) {

+			register_sidebars(1, array('id' => 'geodir_search_top', 'name' => __('GD Search Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_search_right_sidebar';

-        }

+			$geodir_sidebars[] = 'geodir_search_top';

+		}

 

-        if (get_option('geodir_show_search_bottom_section')) {

-            register_sidebars(1, array('id' => 'geodir_search_bottom', 'name' => __('GD Search Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_search_left_section')) {

+			register_sidebars(1, array('id' => 'geodir_search_left_sidebar', 'name' => __('GD Search Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_search_bottom';

-        }

+			$geodir_sidebars[] = 'geodir_search_left_sidebar';

+		}

 

-        /*===========================*/

-        /* Search page sidebars end*/

-        /*===========================*/

+		if (get_option('geodir_show_search_right_section')) {

+			register_sidebars(1, array('id' => 'geodir_search_right_sidebar', 'name' => __('GD Search Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-        /*==================================*/

-        /* Detail/Single page sidebars start*/

-        /*==================================*/

-        if (get_option('geodir_show_detail_top_section')) {

-            register_sidebars(1, array('id' => 'geodir_detail_top', 'name' => __('GD Detail Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+			$geodir_sidebars[] = 'geodir_search_right_sidebar';

+		}

 

-            $geodir_sidebars[] = 'geodir_detail_top';

-        }

+		if (get_option('geodir_show_search_bottom_section')) {

+			register_sidebars(1, array('id' => 'geodir_search_bottom', 'name' => __('GD Search Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-        register_sidebars(1, array('id' => 'geodir_detail_sidebar', 'name' => __('GD Detail Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+			$geodir_sidebars[] = 'geodir_search_bottom';

+		}

 

-        $geodir_sidebars[] = 'geodir_detail_sidebar';

+		/*===========================*/

+		/* Search page sidebars end*/

+		/*===========================*/

 

-        if (get_option('geodir_show_detail_bottom_section')) {

-            register_sidebars(1, array('id' => 'geodir_detail_bottom', 'name' => __('GD Detail Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		/*==================================*/

+		/* Detail/Single page sidebars start*/

+		/*==================================*/

+		if (get_option('geodir_show_detail_top_section')) {

+			register_sidebars(1, array('id' => 'geodir_detail_top', 'name' => __('GD Detail Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_detail_bottom';

-        }

+			$geodir_sidebars[] = 'geodir_detail_top';

+		}

 

-        /*==================================*/

-        /* Detail/Single page sidebars end*/

-        /*==================================*/

+		register_sidebars(1, array('id' => 'geodir_detail_sidebar', 'name' => __('GD Detail Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-        /*==================================*/

-        /* Author page sidebars start       */

-        /*==================================*/

+		$geodir_sidebars[] = 'geodir_detail_sidebar';

 

-        if (get_option('geodir_show_author_top_section')) {

-            register_sidebars(1, array('id' => 'geodir_author_top', 'name' => __('GD Author Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_detail_bottom_section')) {

+			register_sidebars(1, array('id' => 'geodir_detail_bottom', 'name' => __('GD Detail Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_author_top';

-        }

+			$geodir_sidebars[] = 'geodir_detail_bottom';

+		}

 

-        if (get_option('geodir_show_author_left_section')) {

-            register_sidebars(1, array('id' => 'geodir_author_left_sidebar', 'name' => __('GD Author Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		/*==================================*/

+		/* Detail/Single page sidebars end*/

+		/*==================================*/

 

-            $geodir_sidebars[] = 'geodir_author_left_sidebar';

-        }

+		/*==================================*/

+		/* Author page sidebars start       */

+		/*==================================*/

 

-        if (get_option('geodir_show_author_right_section')) {

-            register_sidebars(1, array('id' => 'geodir_author_right_sidebar', 'name' => __('GD Author Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_author_top_section')) {

+			register_sidebars(1, array('id' => 'geodir_author_top', 'name' => __('GD Author Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_author_right_sidebar';

-        }

+			$geodir_sidebars[] = 'geodir_author_top';

+		}

 

-        if (get_option('geodir_show_author_bottom_section')) {

-            register_sidebars(1, array('id' => 'geodir_author_bottom', 'name' => __('GD Author Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_author_left_section')) {

+			register_sidebars(1, array('id' => 'geodir_author_left_sidebar', 'name' => __('GD Author Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-            $geodir_sidebars[] = 'geodir_author_bottom';

-        }

+			$geodir_sidebars[] = 'geodir_author_left_sidebar';

+		}

 

-        /*==================================*/

-        /* Author page sidebars end         */

-        /*==================================*/

+		if (get_option('geodir_show_author_right_section')) {

+			register_sidebars(1, array('id' => 'geodir_author_right_sidebar', 'name' => __('GD Author Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-        /*==================================*/

-        /* Add listing page sidebars start       */

-        /*==================================*/

+			$geodir_sidebars[] = 'geodir_author_right_sidebar';

+		}

 

-        register_sidebars(1, array('id' => 'geodir_add_listing_sidebar', 'name' => __('GD Add Listing Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+		if (get_option('geodir_show_author_bottom_section')) {

+			register_sidebars(1, array('id' => 'geodir_author_bottom', 'name' => __('GD Author Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

 

-        $geodir_sidebars[] = 'geodir_add_listing_sidebar';

+			$geodir_sidebars[] = 'geodir_author_bottom';

+		}

 

-        /*==================================*/

-        /* Add listing page sidebars end         */

-        /*==================================*/

+		/*==================================*/

+		/* Author page sidebars end         */

+		/*==================================*/

 

-    }

+		/*==================================*/

+		/* Add listing page sidebars start       */

+		/*==================================*/

+

+		register_sidebars(1, array('id' => 'geodir_add_listing_sidebar', 'name' => __('GD Add Listing Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));

+

+		$geodir_sidebars[] = 'geodir_add_listing_sidebar';

+

+		/*==================================*/

+		/* Add listing page sidebars end         */

+		/*==================================*/

+

+	}

 }

 

 

 if (!function_exists('register_geodir_widgets')) {

-    /**

-     * Registers all Widgets.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function register_geodir_widgets()

-    {

-        /**

-         * Login Widget.

-         *

-         * @since 1.0.0

-         */

-        class geodir_loginwidget extends WP_Widget

-        {

-            /**

-             * Register the login widget with WordPress.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

-             */

-            public function __construct() {

-                $widget_ops = array('classname' => 'geodir_loginbox', 'description' => __('Geodirectory Loginbox Widget', 'geodirectory'));

-                parent::__construct(

-                    'geodir_loginbox', // Base ID

-                    __('GD > Loginbox', 'geodirectory'), // Name

-                    $widget_ops// Args

-                );

-            }

-

-            /**

-             * Front-end display content for login widget.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $args     Widget arguments.

-             * @param array $instance Saved values from database.

-             */

-            public function widget($args, $instance)

-            {

-                geodir_loginwidget_output($args, $instance);

-            }

-

-            /**

-             * Sanitize login widget form values as they are saved.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $new_instance Values just sent to be saved.

-             * @param array $old_instance Previously saved values from database.

-             *

-             * @return array Updated safe values to be saved.

-             */

-            public function update($new_instance, $old_instance)

-            {

-                //save the widget

-                $instance = $old_instance;

-                $instance['title'] = strip_tags($new_instance['title']);

-

-                return $instance;

-            }

-

-            /**

-             * Back-end login widget settings form.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $instance Previously saved values from database.

-             * @return string|void

-             */

-            public function form($instance)

-            {

-                //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

-                $title = strip_tags($instance['title']);

-

-                ?>

+	/**

+	 * Registers all Widgets.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function register_geodir_widgets()

+	{

+		/**

+		 * Login Widget.

+		 *

+		 * @since 1.0.0

+		 */

+		class geodir_loginwidget extends WP_Widget

+		{

+			/**

+			 * Register the login widget with WordPress.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+			 */

+			public function __construct() {

+				$widget_ops = array('classname' => 'geodir_loginbox', 'description' => __('Geodirectory Loginbox Widget', 'geodirectory'));

+				parent::__construct(

+					'geodir_loginbox', // Base ID

+					__('GD > Loginbox', 'geodirectory'), // Name

+					$widget_ops// Args

+				);

+			}

+

+			/**

+			 * Front-end display content for login widget.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $args     Widget arguments.

+			 * @param array $instance Saved values from database.

+			 */

+			public function widget($args, $instance)

+			{

+				geodir_loginwidget_output($args, $instance);

+			}

+

+			/**

+			 * Sanitize login widget form values as they are saved.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $new_instance Values just sent to be saved.

+			 * @param array $old_instance Previously saved values from database.

+			 *

+			 * @return array Updated safe values to be saved.

+			 */

+			public function update($new_instance, $old_instance)

+			{

+				//save the widget

+				$instance = $old_instance;

+				$instance['title'] = strip_tags($new_instance['title']);

+

+				return $instance;

+			}

+

+			/**

+			 * Back-end login widget settings form.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $instance Previously saved values from database.

+			 * @return string|void

+			 */

+			public function form($instance)

+			{

+				//widgetform in backend

+				$instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

+				$title = strip_tags($instance['title']);

+

+				?>

                 <p><label

                         for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Widget Title', 'geodirectory'); ?>

                         : <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"

@@ -313,64 +313,64 @@ 
 

 

             <?php

-            }

-        }

-

-        register_widget('geodir_loginwidget');

-

-

-        /**

-         * GeoDirectory Social Like Widget.

-         *

-         * @since 1.0.0

-         */

-        class geodir_social_like_widget extends WP_Widget

-        {

-

-            /**

-             * Register the social like widget with WordPress.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

-             */

-            public function __construct() {

-                $widget_ops = array('classname' => 'geodir_social_like_widget', 'description' => __('GD > Twitter,Facebook and Google+ buttons', 'geodirectory'));

-                parent::__construct(

-                    'social_like_widget', // Base ID

-                    __('GD > Social Like', 'geodirectory'), // Name

-                    $widget_ops// Args

-                );

-            }

-

-            /**

-             * Front-end display content for social like widget.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $args     Widget arguments.

-             * @param array $instance Saved values from database.

-             */

-            public function widget($args, $instance)

-            {

-                // prints the widget

-                extract($args, EXTR_SKIP);

-

-                /**

-                 * Filter the widget title text.

-                 *

-                 * @since 1.0.0

-                 * @global object $current_user Current user object.

-                 * @param string $title The widget title text.

-                 */

-                $title = empty($instance['title']) ? '&nbsp;' : apply_filters('widget_title', $instance['title']);

-

-                global $current_user, $post;

-                echo $before_widget;

-                ?>

+			}

+		}

+

+		register_widget('geodir_loginwidget');

+

+

+		/**

+		 * GeoDirectory Social Like Widget.

+		 *

+		 * @since 1.0.0

+		 */

+		class geodir_social_like_widget extends WP_Widget

+		{

+

+			/**

+			 * Register the social like widget with WordPress.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+			 */

+			public function __construct() {

+				$widget_ops = array('classname' => 'geodir_social_like_widget', 'description' => __('GD > Twitter,Facebook and Google+ buttons', 'geodirectory'));

+				parent::__construct(

+					'social_like_widget', // Base ID

+					__('GD > Social Like', 'geodirectory'), // Name

+					$widget_ops// Args

+				);

+			}

+

+			/**

+			 * Front-end display content for social like widget.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $args     Widget arguments.

+			 * @param array $instance Saved values from database.

+			 */

+			public function widget($args, $instance)

+			{

+				// prints the widget

+				extract($args, EXTR_SKIP);

+

+				/**

+				 * Filter the widget title text.

+				 *

+				 * @since 1.0.0

+				 * @global object $current_user Current user object.

+				 * @param string $title The widget title text.

+				 */

+				$title = empty($instance['title']) ? '&nbsp;' : apply_filters('widget_title', $instance['title']);

+

+				global $current_user, $post;

+				echo $before_widget;

+				?>

 

                 <?php //if ( get_option('gd_tweet_button') ) {

-                ?>

+				?>

 

                 <a href="http://twitter.com/share"

                    class="twitter-share-button"><?php _e('Tweet', 'geodirectory');?></a>

@@ -378,23 +378,23 @@ 
                 <script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>

 

                 <?php //}

-                ?>

+				?>

 

                 <?php // if ( get_option('gd_facebook_button') ) {

-                ?>

+				?>

 

                 <iframe <?php if (isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)) {

-                    echo 'allowtransparency="true"';

-                }?> class="facebook"

+					echo 'allowtransparency="true"';

+				}?> class="facebook"

                     src="//www.facebook.com/plugins/like.php?href=<?php echo urlencode(geodir_curPageURL()); ?>&amp;layout=button_count&amp;show_faces=false&amp;width=100&amp;action=like&amp;colorscheme=light"

                     style="border:none; overflow:hidden; width:100px; height:20px"></iframe>

 

 

                 <?php //}

-                ?>

+				?>

 

                 <?php //if ( get_option('gd_google_button') ) {

-                ?>

+				?>

                 <script>

                     window.___gcfg = {

                         parsetags: 'explicit'

@@ -408,118 +408,118 @@ 
                         "count": "true"

                     });</script>

                 <?php //}

-                echo $after_widget;

-

-            }

-

-            /**

-             * Sanitize social like widget form values as they are saved.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $new_instance Values just sent to be saved.

-             * @param array $old_instance Previously saved values from database.

-             *

-             * @return array Updated safe values to be saved.

-             */

-            public function update($new_instance, $old_instance)

-            {

-                //save the widget

-                $instance = $old_instance;

-                $instance['title'] = strip_tags($new_instance['title']);

-                return $instance;

-            }

-

-            /**

-             * Back-end social like widget settings form.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $instance Previously saved values from database.

-             * @return string|void

-             */

-            public function form($instance)

-            {

-                //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => ''));

-                $title = strip_tags($instance['title']);

-                ?>

+				echo $after_widget;

+

+			}

+

+			/**

+			 * Sanitize social like widget form values as they are saved.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $new_instance Values just sent to be saved.

+			 * @param array $old_instance Previously saved values from database.

+			 *

+			 * @return array Updated safe values to be saved.

+			 */

+			public function update($new_instance, $old_instance)

+			{

+				//save the widget

+				$instance = $old_instance;

+				$instance['title'] = strip_tags($new_instance['title']);

+				return $instance;

+			}

+

+			/**

+			 * Back-end social like widget settings form.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $instance Previously saved values from database.

+			 * @return string|void

+			 */

+			public function form($instance)

+			{

+				//widgetform in backend

+				$instance = wp_parse_args((array)$instance, array('title' => ''));

+				$title = strip_tags($instance['title']);

+				?>

                 <p>No settings for this widget</p>

 

 

             <?php

-            }

-        }

-

-        register_widget('geodir_social_like_widget');

-

-

-        /**

-         * GeoDirectory Feedburner Subscribe widget.

-         *

-         * @since 1.0.0

-         */

-        class geodirsubscribeWidget extends WP_Widget

-        {

-

-            /**

-             * Register the feedburner subscribe widget with WordPress.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

-             */

-            public function __construct() {

-                $widget_ops = array('classname' => 'geodir-subscribe', 'description' => __('GD > Google Feedburner Subscribe', 'geodirectory'));

-                parent::__construct(

-                    'widget_subscribeWidget', // Base ID

-                    __('GD > Subscribe', 'geodirectory'), // Name

-                    $widget_ops// Args

-                );

-            }

-

-            /**

-             * Front-end display content for feedburner subscribe widget.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $args     Widget arguments.

-             * @param array $instance Saved values from database.

-             */

-            public function widget($args, $instance)

-            {

-                // prints the widget

-                extract($args, EXTR_SKIP);

-

-                /**

-                 * Filter the widget instance id.

-                 *

-                 * @since 1.0.0

-                 * @param string $id The widget instance id.

-                 */

-                $id = empty($instance['id']) ? '' : apply_filters('widget_id', $instance['id']);

-

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

-                $title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

-

-                /**

-                 * Filter the widget text.

-                 *

-                 * @since 1.0.0

-                 * @param string $text The widget text.

-                 */

-                $text = empty($instance['text']) ? '' : apply_filters('widget_text', $instance['text']);

-

-                echo $before_widget;

-                ?>

+			}

+		}

+

+		register_widget('geodir_social_like_widget');

+

+

+		/**

+		 * GeoDirectory Feedburner Subscribe widget.

+		 *

+		 * @since 1.0.0

+		 */

+		class geodirsubscribeWidget extends WP_Widget

+		{

+

+			/**

+			 * Register the feedburner subscribe widget with WordPress.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+			 */

+			public function __construct() {

+				$widget_ops = array('classname' => 'geodir-subscribe', 'description' => __('GD > Google Feedburner Subscribe', 'geodirectory'));

+				parent::__construct(

+					'widget_subscribeWidget', // Base ID

+					__('GD > Subscribe', 'geodirectory'), // Name

+					$widget_ops// Args

+				);

+			}

+

+			/**

+			 * Front-end display content for feedburner subscribe widget.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $args     Widget arguments.

+			 * @param array $instance Saved values from database.

+			 */

+			public function widget($args, $instance)

+			{

+				// prints the widget

+				extract($args, EXTR_SKIP);

+

+				/**

+				 * Filter the widget instance id.

+				 *

+				 * @since 1.0.0

+				 * @param string $id The widget instance id.

+				 */

+				$id = empty($instance['id']) ? '' : apply_filters('widget_id', $instance['id']);

+

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

+				$title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

+

+				/**

+				 * Filter the widget text.

+				 *

+				 * @since 1.0.0

+				 * @param string $text The widget text.

+				 */

+				$text = empty($instance['text']) ? '' : apply_filters('widget_text', $instance['text']);

+

+				echo $before_widget;

+				?>

 

                 <?php echo $before_title . $title; ?>  <a href="<?php if ($id) {

-                echo 'http://feeds2.feedburner.com/' . $id;

-            } else {

-                bloginfo('rss_url');

-            } ?>"><i class="fa fa-rss-square"></i> </a><?php echo $after_title;?>

+				echo 'http://feeds2.feedburner.com/' . $id;

+			} else {

+				bloginfo('rss_url');

+			} ?>"><i class="fa fa-rss-square"></i> </a><?php echo $after_title;?>

 

                 <?php if ($text <> "") { ?>

 

@@ -544,57 +544,57 @@ 
                 </form>

 

                 <?php

-                echo $after_widget;

+				echo $after_widget;

 

-            }

+			}

 

-            /**

-             * Sanitize feedburner subscribe widget form values as they are saved.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $new_instance Values just sent to be saved.

-             * @param array $old_instance Previously saved values from database.

-             *

-             * @return array Updated safe values to be saved.

-             */

-            public function update($new_instance, $old_instance)

-            {

+			/**

+			 * Sanitize feedburner subscribe widget form values as they are saved.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $new_instance Values just sent to be saved.

+			 * @param array $old_instance Previously saved values from database.

+			 *

+			 * @return array Updated safe values to be saved.

+			 */

+			public function update($new_instance, $old_instance)

+			{

 

-                //save the widget

-                $instance = $old_instance;

-                $instance['id'] = strip_tags($new_instance['id']);

-                $instance['title'] = ($new_instance['title']);

-                $instance['text'] = ($new_instance['text']);

+				//save the widget

+				$instance = $old_instance;

+				$instance['id'] = strip_tags($new_instance['id']);

+				$instance['title'] = ($new_instance['title']);

+				$instance['text'] = ($new_instance['text']);

 

 

-                return $instance;

-            }

+				return $instance;

+			}

 

-            /**

-             * Back-end feedburner subscribe widget settings form.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $instance Previously saved values from database.

-             * @return string|void

-             */

-            public function form($instance)

-            {

-                //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'advt1' => '', 'text' => '', 'twitter' => '', 'facebook' => '', 'digg' => '', 'myspace' => ''));

+			/**

+			 * Back-end feedburner subscribe widget settings form.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $instance Previously saved values from database.

+			 * @return string|void

+			 */

+			public function form($instance)

+			{

+				//widgetform in backend

+				$instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'advt1' => '', 'text' => '', 'twitter' => '', 'facebook' => '', 'digg' => '', 'myspace' => ''));

 

-                $id = strip_tags($instance['id']);

+				$id = strip_tags($instance['id']);

 

-                $title = strip_tags($instance['title']);

+				$title = strip_tags($instance['title']);

 

-                $text = strip_tags($instance['text']);

+				$text = strip_tags($instance['text']);

 

 

 

-                ?>

+				?>

                 <p><label

                         for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title', 'geodirectory');?>:

                         <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"

@@ -613,101 +613,101 @@ 
                                   name="<?php echo $this->get_field_name('text'); ?>"><?php echo esc_attr($text); ?></textarea></label>

                 </p>

             <?php

-            }

-        }

-

-        register_widget('geodirsubscribeWidget');

-

-        /**

-         * GeoDirectory advertise widget.

-         *

-         * @since 1.0.0

-         */

-        class geodiradvtwidget extends WP_Widget

-        {

-

-            /**

-             * Register the advertise widget with WordPress.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

-             */

-            public function __construct() {

-                $widget_ops = array('classname' => 'GeoDirectory Advertise', 'description' => __('GD > common advertise widget in sidebar, bottom section', 'geodirectory'));

-                parent::__construct(

-                    'advtwidget', // Base ID

-                    __('GD > Advertise', 'geodirectory'), // Name

-                    $widget_ops// Args

-                );

-            }

-

-

-            /**

-             * Front-end display content for advertise widget.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $args     Widget arguments.

-             * @param array $instance Saved values from database.

-             */

-            public function widget($args, $instance)

-            {

-

-                // prints the widget

-

-                extract($args, EXTR_SKIP);

-

-                /**

-                 * Filter the description text.

-                 *

-                 * @since 1.0.0

-                 * @param string $desc1 The widget description text.

-                 */

-                $desc1 = empty($instance['desc1']) ? '&nbsp;' : apply_filters('widget_desc1', $instance['desc1']);

-                echo $before_widget;

-                ?>

+			}

+		}

+

+		register_widget('geodirsubscribeWidget');

+

+		/**

+		 * GeoDirectory advertise widget.

+		 *

+		 * @since 1.0.0

+		 */

+		class geodiradvtwidget extends WP_Widget

+		{

+

+			/**

+			 * Register the advertise widget with WordPress.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+			 */

+			public function __construct() {

+				$widget_ops = array('classname' => 'GeoDirectory Advertise', 'description' => __('GD > common advertise widget in sidebar, bottom section', 'geodirectory'));

+				parent::__construct(

+					'advtwidget', // Base ID

+					__('GD > Advertise', 'geodirectory'), // Name

+					$widget_ops// Args

+				);

+			}

+

+

+			/**

+			 * Front-end display content for advertise widget.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $args     Widget arguments.

+			 * @param array $instance Saved values from database.

+			 */

+			public function widget($args, $instance)

+			{

+

+				// prints the widget

+

+				extract($args, EXTR_SKIP);

+

+				/**

+				 * Filter the description text.

+				 *

+				 * @since 1.0.0

+				 * @param string $desc1 The widget description text.

+				 */

+				$desc1 = empty($instance['desc1']) ? '&nbsp;' : apply_filters('widget_desc1', $instance['desc1']);

+				echo $before_widget;

+				?>

                 <?php if ($desc1 <> "") { ?>

                 <?php echo $desc1; ?>

             <?php }

-                echo $after_widget;

-            }

-

-            /**

-             * Sanitize advertise widget form values as they are saved.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $new_instance Values just sent to be saved.

-             * @param array $old_instance Previously saved values from database.

-             *

-             * @return array Updated safe values to be saved.

-             */

-            public function update($new_instance, $old_instance)

-            {

-                //save the widget

-                $instance = $old_instance;

-                $instance['desc1'] = ($new_instance['desc1']);

-                return $instance;

-            }

-

-            /**

-             * Back-end advertise widget settings form.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $instance Previously saved values from database.

-             * @return string|void

-             */

-            public function form($instance)

-            {

-                //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

-

-                $desc1 = ($instance['desc1']);

-                ?>

+				echo $after_widget;

+			}

+

+			/**

+			 * Sanitize advertise widget form values as they are saved.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $new_instance Values just sent to be saved.

+			 * @param array $old_instance Previously saved values from database.

+			 *

+			 * @return array Updated safe values to be saved.

+			 */

+			public function update($new_instance, $old_instance)

+			{

+				//save the widget

+				$instance = $old_instance;

+				$instance['desc1'] = ($new_instance['desc1']);

+				return $instance;

+			}

+

+			/**

+			 * Back-end advertise widget settings form.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $instance Previously saved values from database.

+			 * @return string|void

+			 */

+			public function form($instance)

+			{

+				//widgetform in backend

+				$instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

+

+				$desc1 = ($instance['desc1']);

+				?>

                 <p><label

                         for="<?php echo $this->get_field_id('desc1'); ?>"><?php _e('Your Advt code (ex.google adsense, etc.)', 'geodirectory');?>

                         <textarea class="widefat" rows="6" cols="20" id="<?php echo $this->get_field_id('desc1'); ?>"

@@ -715,65 +715,65 @@ 
                 </p>

 

             <?php

-            }

-        }

-

-        register_widget('geodiradvtwidget');

-

-        /**

-         * GeoDirectory Flickr widget.

-         *

-         * @since 1.0.0

-         */

-        class GeodirFlickrWidget extends WP_Widget

-        {

-

-            /**

-             * Register the flickr widget with WordPress.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

-             */

-            public function __construct() {

-                $widget_ops = array('classname' => 'Geo Dir Flickr Photos ', 'description' => __('GD > Flickr Photos', 'geodirectory'));

-                parent::__construct(

-                    'widget_flickrwidget', // Base ID

-                    __('GD > Flickr Photos', 'geodirectory'), // Name

-                    $widget_ops// Args

-                );

-            }

-

-            /**

-             * Front-end display content for flickr widget.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $args     Widget arguments.

-             * @param array $instance Saved values from database.

-             */

-            public function widget($args, $instance)

-            {

-

-                // prints the widget

-                extract($args, EXTR_SKIP);

-

-                echo $before_widget;

-

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

-                $id = empty($instance['id']) ? '&nbsp;' : apply_filters('widget_id', $instance['id']);

-

-                /**

-                 * Filter the widget number.

-                 *

-                 * This is used in the flicker widget to show how many images to show.

-                 *

-                 * @since 1.0.0

-                 * @param string $number The image count.

-                 */

-                $number = empty($instance['number']) ? '&nbsp;' : apply_filters('widget_number', $instance['number']);

-                echo $before_title . __('Photo Gallery', 'geodirectory') . $after_title;

-                ?>

+			}

+		}

+

+		register_widget('geodiradvtwidget');

+

+		/**

+		 * GeoDirectory Flickr widget.

+		 *

+		 * @since 1.0.0

+		 */

+		class GeodirFlickrWidget extends WP_Widget

+		{

+

+			/**

+			 * Register the flickr widget with WordPress.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+			 */

+			public function __construct() {

+				$widget_ops = array('classname' => 'Geo Dir Flickr Photos ', 'description' => __('GD > Flickr Photos', 'geodirectory'));

+				parent::__construct(

+					'widget_flickrwidget', // Base ID

+					__('GD > Flickr Photos', 'geodirectory'), // Name

+					$widget_ops// Args

+				);

+			}

+

+			/**

+			 * Front-end display content for flickr widget.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $args     Widget arguments.

+			 * @param array $instance Saved values from database.

+			 */

+			public function widget($args, $instance)

+			{

+

+				// prints the widget

+				extract($args, EXTR_SKIP);

+

+				echo $before_widget;

+

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

+				$id = empty($instance['id']) ? '&nbsp;' : apply_filters('widget_id', $instance['id']);

+

+				/**

+				 * Filter the widget number.

+				 *

+				 * This is used in the flicker widget to show how many images to show.

+				 *

+				 * @since 1.0.0

+				 * @param string $number The image count.

+				 */

+				$number = empty($instance['number']) ? '&nbsp;' : apply_filters('widget_number', $instance['number']);

+				echo $before_title . __('Photo Gallery', 'geodirectory') . $after_title;

+				?>

 

                 <div class="geodir-flickr clearfix">

 

@@ -784,45 +784,45 @@ 
 

 

                 <?php echo $after_widget;

-            }

-

-            /**

-             * Sanitize flickr widget form values as they are saved.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $new_instance Values just sent to be saved.

-             * @param array $old_instance Previously saved values from database.

-             *

-             * @return array Updated safe values to be saved.

-             */

-            public function update($new_instance, $old_instance)

-            {

-                //save the widget

-                $instance = $old_instance;

-                $instance['id'] = strip_tags($new_instance['id']);

-                $instance['number'] = strip_tags($new_instance['number']);

-                return $instance;

-            }

-

-            /**

-             * Back-end flickr widget settings form.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $instance Previously saved values from database.

-             * @return string|void

-             */

-            public function form($instance)

-            {

-

-                //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'number' => ''));

-                $id = strip_tags($instance['id']);

-                $number = strip_tags($instance['number']);

-                ?>

+			}

+

+			/**

+			 * Sanitize flickr widget form values as they are saved.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $new_instance Values just sent to be saved.

+			 * @param array $old_instance Previously saved values from database.

+			 *

+			 * @return array Updated safe values to be saved.

+			 */

+			public function update($new_instance, $old_instance)

+			{

+				//save the widget

+				$instance = $old_instance;

+				$instance['id'] = strip_tags($new_instance['id']);

+				$instance['number'] = strip_tags($new_instance['number']);

+				return $instance;

+			}

+

+			/**

+			 * Back-end flickr widget settings form.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $instance Previously saved values from database.

+			 * @return string|void

+			 */

+			public function form($instance)

+			{

+

+				//widgetform in backend

+				$instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'number' => ''));

+				$id = strip_tags($instance['id']);

+				$number = strip_tags($instance['number']);

+				?>

 

                 <p>

                     <label

@@ -843,99 +843,99 @@ 
                     </label>

                 </p>

             <?php

-            }

-        }

-

-        register_widget('GeodirFlickrWidget');

-

-        /**

-         * GeoDirectory Twitter widget.

-         *

-         * @since 1.0.0

-         */

-        class geodir_twitter extends WP_Widget

-        {

-            /**

-             * Register the Twitter widget with WordPress.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

-             */

-            public function __construct() {

-                $widget_ops = array('classname' => 'Twitter', 'description' => __('GD > Twitter Feed', 'geodirectory'));

-                parent::__construct(

-                    'widget_Twidget', // Base ID

-                    __('GD > Twitter', 'geodirectory'), // Name

-                    $widget_ops// Args

-                );

-            }

-

-

-            /**

-             * Front-end display content for Twitter widget.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $args     Widget arguments.

-             * @param array $instance Saved values from database.

-             */

-            public function widget($args, $instance)

-            {

-

-                // prints the widget

-

-                extract($args, EXTR_SKIP);

-

-                /**

-                 * Filter the twitter widget description text.

-                 *

-                 * @since 1.0.0

-                 * @param string $desc1 The widget description text.

-                 */

-                $desc1 = empty($instance['gd_tw_desc1']) ? '&nbsp;' : apply_filters('gd_tw_widget_desc1', $instance['gd_tw_desc1']);

-                echo $before_widget;

-                if ($desc1 <> "") {

-                    echo $desc1;

-                }

-                echo $after_widget;

-            }

-

-            /**

-             * Sanitize twitter widget form values as they are saved.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $new_instance Values just sent to be saved.

-             * @param array $old_instance Previously saved values from database.

-             *

-             * @return array Updated safe values to be saved.

-             */

-            public function update($new_instance, $old_instance)

-            {

-                //save the widget

-                $instance = $old_instance;

-                $instance['gd_tw_desc1'] = ($new_instance['gd_tw_desc1']);

-                return $instance;

-            }

-

-            /**

-             * Back-end twitter widget settings form.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $instance Previously saved values from database.

-             * @return string|void

-             */

-            public function form($instance)

-            {

-                //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'gd_tw_desc1' => ''));

-

-                $desc1 = ($instance['gd_tw_desc1']);

-                ?>

+			}

+		}

+

+		register_widget('GeodirFlickrWidget');

+

+		/**

+		 * GeoDirectory Twitter widget.

+		 *

+		 * @since 1.0.0

+		 */

+		class geodir_twitter extends WP_Widget

+		{

+			/**

+			 * Register the Twitter widget with WordPress.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+			 */

+			public function __construct() {

+				$widget_ops = array('classname' => 'Twitter', 'description' => __('GD > Twitter Feed', 'geodirectory'));

+				parent::__construct(

+					'widget_Twidget', // Base ID

+					__('GD > Twitter', 'geodirectory'), // Name

+					$widget_ops// Args

+				);

+			}

+

+

+			/**

+			 * Front-end display content for Twitter widget.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $args     Widget arguments.

+			 * @param array $instance Saved values from database.

+			 */

+			public function widget($args, $instance)

+			{

+

+				// prints the widget

+

+				extract($args, EXTR_SKIP);

+

+				/**

+				 * Filter the twitter widget description text.

+				 *

+				 * @since 1.0.0

+				 * @param string $desc1 The widget description text.

+				 */

+				$desc1 = empty($instance['gd_tw_desc1']) ? '&nbsp;' : apply_filters('gd_tw_widget_desc1', $instance['gd_tw_desc1']);

+				echo $before_widget;

+				if ($desc1 <> "") {

+					echo $desc1;

+				}

+				echo $after_widget;

+			}

+

+			/**

+			 * Sanitize twitter widget form values as they are saved.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $new_instance Values just sent to be saved.

+			 * @param array $old_instance Previously saved values from database.

+			 *

+			 * @return array Updated safe values to be saved.

+			 */

+			public function update($new_instance, $old_instance)

+			{

+				//save the widget

+				$instance = $old_instance;

+				$instance['gd_tw_desc1'] = ($new_instance['gd_tw_desc1']);

+				return $instance;

+			}

+

+			/**

+			 * Back-end twitter widget settings form.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $instance Previously saved values from database.

+			 * @return string|void

+			 */

+			public function form($instance)

+			{

+				//widgetform in backend

+				$instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'gd_tw_desc1' => ''));

+

+				$desc1 = ($instance['gd_tw_desc1']);

+				?>

                 <p><label

                         for="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"><?php _e('Your twitter code', 'geodirectory');?>

                         <textarea class="widefat" rows="6" cols="20"

@@ -944,179 +944,179 @@ 
                 </p>

 

             <?php

-            }

-        }

-

-        register_widget('geodir_twitter');

-

-        /**

-         * GeoDirectory Advanced Search widget.

-         *

-         * @since 1.0.0

-         */

-        class geodir_advance_search_widget extends WP_Widget

-        {

-            /**

-             * Register the advanced search widget with WordPress.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

-             */

-            public function __construct() {

-                $widget_ops = array('classname' => 'geodir_advance_search_widget', 'description' => __('GD > Search', 'geodirectory'),'post_type'=>'');

-                parent::__construct(

-                    'geodir_advance_search', // Base ID

-                    __('GD > Search', 'geodirectory'), // Name

-                    $widget_ops// Args

-                );

-            }

-

-

-            /**

-             * Front-end display content for advanced search widget.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $args     Widget arguments.

-             * @param array $instance Saved values from database.

-             */

-            public function widget($args, $instance)

-            {

-                /**

-                 * Filter the search widget arguments.

-                 *

-                 * @since 1.5.7

-                 * @param array $args The widget arguments.

-                 * @param array $instance The widget instance.

-                 */

-                $args = apply_filters('widget_geodir_advance_search_args',$args,$instance);

-

-                // prints the widget

-                extract($args, EXTR_SKIP);

-

-                if(isset($post_type) && $post_type){

-                    geodir_get_search_post_type($post_type);// set the post type

-                }else{

-                    geodir_get_search_post_type();// set the post type

-                }

-

-                echo $before_widget;

-

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

-                $title = empty($instance['title']) ? __('Search', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

-

-                geodir_get_template_part('listing', 'filter-form');

-

-                echo $after_widget;

-

-                // after outputing the search reset the CPT

-                global $geodir_search_post_type;

-                $geodir_search_post_type = '';

-            }

-

-            /**

-             * Sanitize advanced search widget form values as they are saved.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $new_instance Values just sent to be saved.

-             * @param array $old_instance Previously saved values from database.

-             *

-             * @return array Updated safe values to be saved.

-             */

-            public function update($new_instance, $old_instance)

-            {

-                //save the widget

-                //Nothing to save

-                return isset($instance) ? $instance : array();

-            }

-

-            /**

-             * Back-end advanced search widget settings form.

-             *

-             * @since 1.0.0

-             * @since 1.5.1 Declare function public.

-             *

-             * @param array $instance Previously saved values from database.

-             * @return string|void

-             */

-            public function form($instance)

-            {

-                //widgetform in backend

-                echo __("This is a search widget to show advance search for gedodirectory listings.", 'geodirectory');

-            }

-        }

-

-        register_widget('geodir_advance_search_widget');

-

-

-        /**

-         * Contains all functions for popular widget.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('geodirectory-widgets/geodirectory_popular_widget.php');

-        /**

-         * Contains all functions for listing slider widget.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('geodirectory-widgets/geodirectory_listing_slider_widget.php');

-        /**

-         * Contains all functions for home map widget.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('geodirectory-widgets/home_map_widget.php');

-        /**

-         * Contains all functions for listing map widget.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('geodirectory-widgets/listing_map_widget.php');

-        /**

-         * Contains all functions for reviews widget.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('geodirectory-widgets/geodirectory_reviews_widget.php');

-        /**

-         * Contains all functions for related listing widget.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('geodirectory-widgets/geodirectory_related_listing_widget.php');

-        /**

-         * Contains all functions for bestof widget.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('geodirectory-widgets/geodirectory_bestof_widget.php');

+			}

+		}

+

+		register_widget('geodir_twitter');

+

+		/**

+		 * GeoDirectory Advanced Search widget.

+		 *

+		 * @since 1.0.0

+		 */

+		class geodir_advance_search_widget extends WP_Widget

+		{

+			/**

+			 * Register the advanced search widget with WordPress.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+			 */

+			public function __construct() {

+				$widget_ops = array('classname' => 'geodir_advance_search_widget', 'description' => __('GD > Search', 'geodirectory'),'post_type'=>'');

+				parent::__construct(

+					'geodir_advance_search', // Base ID

+					__('GD > Search', 'geodirectory'), // Name

+					$widget_ops// Args

+				);

+			}

+

+

+			/**

+			 * Front-end display content for advanced search widget.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $args     Widget arguments.

+			 * @param array $instance Saved values from database.

+			 */

+			public function widget($args, $instance)

+			{

+				/**

+				 * Filter the search widget arguments.

+				 *

+				 * @since 1.5.7

+				 * @param array $args The widget arguments.

+				 * @param array $instance The widget instance.

+				 */

+				$args = apply_filters('widget_geodir_advance_search_args',$args,$instance);

+

+				// prints the widget

+				extract($args, EXTR_SKIP);

+

+				if(isset($post_type) && $post_type){

+					geodir_get_search_post_type($post_type);// set the post type

+				}else{

+					geodir_get_search_post_type();// set the post type

+				}

+

+				echo $before_widget;

+

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

+				$title = empty($instance['title']) ? __('Search', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

+

+				geodir_get_template_part('listing', 'filter-form');

+

+				echo $after_widget;

+

+				// after outputing the search reset the CPT

+				global $geodir_search_post_type;

+				$geodir_search_post_type = '';

+			}

+

+			/**

+			 * Sanitize advanced search widget form values as they are saved.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $new_instance Values just sent to be saved.

+			 * @param array $old_instance Previously saved values from database.

+			 *

+			 * @return array Updated safe values to be saved.

+			 */

+			public function update($new_instance, $old_instance)

+			{

+				//save the widget

+				//Nothing to save

+				return isset($instance) ? $instance : array();

+			}

+

+			/**

+			 * Back-end advanced search widget settings form.

+			 *

+			 * @since 1.0.0

+			 * @since 1.5.1 Declare function public.

+			 *

+			 * @param array $instance Previously saved values from database.

+			 * @return string|void

+			 */

+			public function form($instance)

+			{

+				//widgetform in backend

+				echo __("This is a search widget to show advance search for gedodirectory listings.", 'geodirectory');

+			}

+		}

+

+		register_widget('geodir_advance_search_widget');

+

+

+		/**

+		 * Contains all functions for popular widget.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('geodirectory-widgets/geodirectory_popular_widget.php');

+		/**

+		 * Contains all functions for listing slider widget.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('geodirectory-widgets/geodirectory_listing_slider_widget.php');

+		/**

+		 * Contains all functions for home map widget.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('geodirectory-widgets/home_map_widget.php');

+		/**

+		 * Contains all functions for listing map widget.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('geodirectory-widgets/listing_map_widget.php');

+		/**

+		 * Contains all functions for reviews widget.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('geodirectory-widgets/geodirectory_reviews_widget.php');

+		/**

+		 * Contains all functions for related listing widget.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('geodirectory-widgets/geodirectory_related_listing_widget.php');

+		/**

+		 * Contains all functions for bestof widget.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('geodirectory-widgets/geodirectory_bestof_widget.php');

+		/**

+		 * Contains all functions for cpt categories widget.

+		 *

+		 * @since 1.5.4

+		 * @package GeoDirectory

+		 */

+		include_once('geodirectory-widgets/geodirectory_cpt_categories_widget.php');

 		/**

-         * Contains all functions for cpt categories widget.

-         *

-         * @since 1.5.4

-         * @package GeoDirectory

-         */

-        include_once('geodirectory-widgets/geodirectory_cpt_categories_widget.php');

-        /**

-         * Contains all functions for features widget.

-         *

-         * @since 1.5.6

-         * @package GeoDirectory

-         * @todo make the image field recurring

-         */

-        include_once('geodirectory-widgets/geodirectory_features_widget.php');

-    }

+		 * Contains all functions for features widget.

+		 *

+		 * @since 1.5.6

+		 * @package GeoDirectory

+		 * @todo make the image field recurring

+		 */

+		include_once('geodirectory-widgets/geodirectory_features_widget.php');

+	}

 

 }

 

Spacing +24 added lines, -24 removed lines

@@ -301,7 +301,7 @@ 
             public function form($instance)

             {

                 //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

+                $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

                 $title = strip_tags($instance['title']);

 

                 ?>

@@ -373,7 +373,7 @@ 
                 ?>

 

                 <a href="http://twitter.com/share"

-                   class="twitter-share-button"><?php _e('Tweet', 'geodirectory');?></a>

+                   class="twitter-share-button"><?php _e('Tweet', 'geodirectory'); ?></a>

 

                 <script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>

 

@@ -443,7 +443,7 @@ 
             public function form($instance)

             {

                 //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => ''));

+                $instance = wp_parse_args((array) $instance, array('title' => ''));

                 $title = strip_tags($instance['title']);

                 ?>

                 <p>No settings for this widget</p>

@@ -515,11 +515,11 @@ 
                 echo $before_widget;

                 ?>

 

-                <?php echo $before_title . $title; ?>  <a href="<?php if ($id) {

-                echo 'http://feeds2.feedburner.com/' . $id;

+                <?php echo $before_title.$title; ?>  <a href="<?php if ($id) {

+                echo 'http://feeds2.feedburner.com/'.$id;

             } else {

                 bloginfo('rss_url');

-            } ?>"><i class="fa fa-rss-square"></i> </a><?php echo $after_title;?>

+            } ?>"><i class="fa fa-rss-square"></i> </a><?php echo $after_title; ?>

 

                 <?php if ($text <> "") { ?>

 

@@ -584,7 +584,7 @@ 
             public function form($instance)

             {

                 //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'advt1' => '', 'text' => '', 'twitter' => '', 'facebook' => '', 'digg' => '', 'myspace' => ''));

+                $instance = wp_parse_args((array) $instance, array('title' => '', 'id' => '', 'advt1' => '', 'text' => '', 'twitter' => '', 'facebook' => '', 'digg' => '', 'myspace' => ''));

 

                 $id = strip_tags($instance['id']);

 

@@ -596,19 +596,19 @@ 
 

                 ?>

                 <p><label

-                        for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title', 'geodirectory');?>:

+                        for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title', 'geodirectory'); ?>:

                         <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"

                                name="<?php echo $this->get_field_name('title'); ?>" type="text"

                                value="<?php echo esc_attr($title); ?>"/></label></p>

 

                 <p><label

-                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Feedburner ID (ex :- geotheme)', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Feedburner ID (ex :- geotheme)', 'geodirectory'); ?>

                         : <input class="widefat" id="<?php echo $this->get_field_id('id'); ?>"

                                  name="<?php echo $this->get_field_name('id'); ?>" type="text"

                                  value="<?php echo esc_attr($id); ?>"/></label></p>

 

                 <p><label

-                        for="<?php echo $this->get_field_id('text'); ?>"><?php _e('Short Description', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('text'); ?>"><?php _e('Short Description', 'geodirectory'); ?>

                         <textarea class="widefat" rows="6" cols="20" id="<?php echo $this->get_field_id('text'); ?>"

                                   name="<?php echo $this->get_field_name('text'); ?>"><?php echo esc_attr($text); ?></textarea></label>

                 </p>

@@ -704,12 +704,12 @@ 
             public function form($instance)

             {

                 //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

+                $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

 

                 $desc1 = ($instance['desc1']);

                 ?>

                 <p><label

-                        for="<?php echo $this->get_field_id('desc1'); ?>"><?php _e('Your Advt code (ex.google adsense, etc.)', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('desc1'); ?>"><?php _e('Your Advt code (ex.google adsense, etc.)', 'geodirectory'); ?>

                         <textarea class="widefat" rows="6" cols="20" id="<?php echo $this->get_field_id('desc1'); ?>"

                                   name="<?php echo $this->get_field_name('desc1'); ?>"><?php echo esc_attr($desc1); ?></textarea></label>

                 </p>

@@ -772,7 +772,7 @@ 
                  * @param string $number The image count.

                  */

                 $number = empty($instance['number']) ? '&nbsp;' : apply_filters('widget_number', $instance['number']);

-                echo $before_title . __('Photo Gallery', 'geodirectory') . $after_title;

+                echo $before_title.__('Photo Gallery', 'geodirectory').$after_title;

                 ?>

 

                 <div class="geodir-flickr clearfix">

@@ -819,14 +819,14 @@ 
             {

 

                 //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'number' => ''));

+                $instance = wp_parse_args((array) $instance, array('title' => '', 'id' => '', 'number' => ''));

                 $id = strip_tags($instance['id']);

                 $number = strip_tags($instance['number']);

                 ?>

 

                 <p>

                     <label

-                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Flickr ID', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Flickr ID', 'geodirectory'); ?>

                         (<a href="http://www.idgettr.com">idGettr</a>):

                         <input class="widefat" id="<?php echo $this->get_field_id('id'); ?>"

                                name="<?php echo $this->get_field_name('id'); ?>" type="text"

@@ -836,7 +836,7 @@ 
 

                 <p>

                     <label

-                        for="<?php echo $this->get_field_id('number'); ?>"><?php _e('Number of photos:', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('number'); ?>"><?php _e('Number of photos:', 'geodirectory'); ?>

                         <input class="widefat" id="<?php echo $this->get_field_id('number'); ?>"

                                name="<?php echo $this->get_field_name('number'); ?>" type="text"

                                value="<?php echo esc_attr($number); ?>"/>

@@ -932,12 +932,12 @@ 
             public function form($instance)

             {

                 //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'gd_tw_desc1' => ''));

+                $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'gd_tw_desc1' => ''));

 

                 $desc1 = ($instance['gd_tw_desc1']);

                 ?>

                 <p><label

-                        for="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"><?php _e('Your twitter code', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"><?php _e('Your twitter code', 'geodirectory'); ?>

                         <textarea class="widefat" rows="6" cols="20"

                                   id="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"

                                   name="<?php echo $this->get_field_name('gd_tw_desc1'); ?>"><?php echo esc_attr($desc1); ?></textarea></label>

@@ -963,7 +963,7 @@ 
              * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

              */

             public function __construct() {

-                $widget_ops = array('classname' => 'geodir_advance_search_widget', 'description' => __('GD > Search', 'geodirectory'),'post_type'=>'');

+                $widget_ops = array('classname' => 'geodir_advance_search_widget', 'description' => __('GD > Search', 'geodirectory'), 'post_type'=>'');

                 parent::__construct(

                     'geodir_advance_search', // Base ID

                     __('GD > Search', 'geodirectory'), // Name

@@ -990,15 +990,15 @@ 
                  * @param array $args The widget arguments.

                  * @param array $instance The widget instance.

                  */

-                $args = apply_filters('widget_geodir_advance_search_args',$args,$instance);

+                $args = apply_filters('widget_geodir_advance_search_args', $args, $instance);

 

                 // prints the widget

                 extract($args, EXTR_SKIP);

 

-                if(isset($post_type) && $post_type){

-                    geodir_get_search_post_type($post_type);// set the post type

-                }else{

-                    geodir_get_search_post_type();// set the post type

+                if (isset($post_type) && $post_type) {

+                    geodir_get_search_post_type($post_type); // set the post type

+                } else {

+                    geodir_get_search_post_type(); // set the post type

                 }

 

                 echo $before_widget;

Braces +1 added lines, -1 removed lines

@@ -997,7 +997,7 @@
 

                 if(isset($post_type) && $post_type){

                     geodir_get_search_post_type($post_type);// set the post type

-                }else{

+                } else{

                     geodir_get_search_post_type();// set the post type

                 }

 

geodirectory-functions/compatibility/Genesis.php

Indentation +168 added lines, -168 removed lines

@@ -17,26 +17,26 @@ 
 function gd_compat_php_genesis()
 {
 // REPLACE GENESIS BREADCRUMBS WITH GD BREADCRUMBS
-    remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
 
 
-    // make top section wide
-    remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10);
-    remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
-    remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
-    remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
+	// make top section wide
+	remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10);
+	remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
+	remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
+	remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
 
-    // REMOVE PAGE TITLES
-    remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
-    remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
-    remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
+	// REMOVE PAGE TITLES
+	remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
+	remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
+	remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
 
 
 }
@@ -53,25 +53,25 @@ 
 function gd_genesis_compat_left_sidebars()
 {
 
-    if (is_page_geodir_home()) {
-        remove_action('geodir_home_sidebar_left', 'geodir_action_home_sidebar_left', 10);
-        add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11);
-    } elseif (geodir_is_page('location')) {
-        remove_action('geodir_location_sidebar_left', 'geodir_action_home_sidebar_left', 10);
-        add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11);
-    } elseif (geodir_is_page('listing')) {
-        remove_action('geodir_listings_sidebar_left', 'geodir_action_listings_sidebar_left', 10);
-        add_action('geodir_wrapper_close', 'geodir_action_listings_sidebar_left', 11);
-    } elseif (geodir_is_page('detail') && get_option('geodir_detail_sidebar_left_section')) {
-        //remove_action( 'geodir_detail_sidebar', 'geodir_action_details_sidebar', 10 );
-        //add_action( 'geodir_wrapper_close', 'geodir_action_details_sidebar', 11 );
-    } elseif (geodir_is_page('search')) {
-        remove_action('geodir_search_sidebar_left', 'geodir_action_search_sidebar_left', 10);
-        add_action('geodir_wrapper_close', 'geodir_action_search_sidebar_left', 11);
-    } elseif (geodir_is_page('author')) {
-        remove_action('geodir_author_sidebar_left', 'geodir_action_author_sidebar_left', 10);
-        add_action('geodir_wrapper_close', 'geodir_action_author_sidebar_left', 11);
-    }
+	if (is_page_geodir_home()) {
+		remove_action('geodir_home_sidebar_left', 'geodir_action_home_sidebar_left', 10);
+		add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11);
+	} elseif (geodir_is_page('location')) {
+		remove_action('geodir_location_sidebar_left', 'geodir_action_home_sidebar_left', 10);
+		add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11);
+	} elseif (geodir_is_page('listing')) {
+		remove_action('geodir_listings_sidebar_left', 'geodir_action_listings_sidebar_left', 10);
+		add_action('geodir_wrapper_close', 'geodir_action_listings_sidebar_left', 11);
+	} elseif (geodir_is_page('detail') && get_option('geodir_detail_sidebar_left_section')) {
+		//remove_action( 'geodir_detail_sidebar', 'geodir_action_details_sidebar', 10 );
+		//add_action( 'geodir_wrapper_close', 'geodir_action_details_sidebar', 11 );
+	} elseif (geodir_is_page('search')) {
+		remove_action('geodir_search_sidebar_left', 'geodir_action_search_sidebar_left', 10);
+		add_action('geodir_wrapper_close', 'geodir_action_search_sidebar_left', 11);
+	} elseif (geodir_is_page('author')) {
+		remove_action('geodir_author_sidebar_left', 'geodir_action_author_sidebar_left', 10);
+		add_action('geodir_wrapper_close', 'geodir_action_author_sidebar_left', 11);
+	}
 
 
 }
@@ -88,65 +88,65 @@ 
  */
 function geodir_set_body_scs($classes)
 {
-    $remove_class = false;
-    $new_class = '';
-    if (is_page_geodir_home() || geodir_is_page('location')) {
-        $remove_class = true;
-        if (get_option('geodir_show_home_left_section')) {
-            $new_class .= 'sidebar-';
-        }
-        if (get_option('geodir_show_home_contant_section')) {
-            $new_class .= 'content';
-        }
-        if (get_option('geodir_show_home_right_section')) {
-            $new_class .= '-sidebar';
-        }
-    } elseif (geodir_is_page('listing')) {
-        $remove_class = true;
-        if (get_option('geodir_show_listing_left_section')) {
-            $new_class .= 'sidebar-';
-        }
-        $new_class .= 'content';
-        if (get_option('geodir_show_listing_right_section')) {
-            $new_class .= '-sidebar';
-        }
-    } elseif (geodir_is_page('detail')) {
-        $remove_class = true;
-        if (get_option('geodir_detail_sidebar_left_section')) {
-            $new_class .= 'sidebar-content gd-details-sidebar-left';
-        } else {
-            $new_class .= 'content-sidebar';
-        }
-    } elseif (geodir_is_page('search')) {
-        $remove_class = true;
-        if (get_option('geodir_show_search_left_section')) {
-            $new_class .= 'sidebar-';
-        }
-        $new_class .= 'content';
-        if (get_option('geodir_show_search_right_section')) {
-            $new_class .= '-sidebar';
-        }
-    } elseif (geodir_is_page('author')) {
-        $remove_class = true;
-        if (get_option('geodir_show_author_left_section')) {
-            $new_class .= 'sidebar-';
-        }
-        $new_class .= 'content';
-        if (get_option('geodir_show_author_right_section')) {
-            $new_class .= '-sidebar';
-        }
-    } elseif (geodir_is_page('add-listing')) {
-        $remove_class = true;
-        $new_class .= 'content-sidebar';
-    }
-
-    if ($remove_class) {
-        $classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content'));
-        //str_replace(array('content-sidebar','sidebar-content','content-sidebar-sidebar','sidebar-sidebar-content','sidebar-content-sidebar','full-width-content'),array('','','','','',''),$classes);
-        $classes[] = $new_class;
-    }
-
-    return $classes;
+	$remove_class = false;
+	$new_class = '';
+	if (is_page_geodir_home() || geodir_is_page('location')) {
+		$remove_class = true;
+		if (get_option('geodir_show_home_left_section')) {
+			$new_class .= 'sidebar-';
+		}
+		if (get_option('geodir_show_home_contant_section')) {
+			$new_class .= 'content';
+		}
+		if (get_option('geodir_show_home_right_section')) {
+			$new_class .= '-sidebar';
+		}
+	} elseif (geodir_is_page('listing')) {
+		$remove_class = true;
+		if (get_option('geodir_show_listing_left_section')) {
+			$new_class .= 'sidebar-';
+		}
+		$new_class .= 'content';
+		if (get_option('geodir_show_listing_right_section')) {
+			$new_class .= '-sidebar';
+		}
+	} elseif (geodir_is_page('detail')) {
+		$remove_class = true;
+		if (get_option('geodir_detail_sidebar_left_section')) {
+			$new_class .= 'sidebar-content gd-details-sidebar-left';
+		} else {
+			$new_class .= 'content-sidebar';
+		}
+	} elseif (geodir_is_page('search')) {
+		$remove_class = true;
+		if (get_option('geodir_show_search_left_section')) {
+			$new_class .= 'sidebar-';
+		}
+		$new_class .= 'content';
+		if (get_option('geodir_show_search_right_section')) {
+			$new_class .= '-sidebar';
+		}
+	} elseif (geodir_is_page('author')) {
+		$remove_class = true;
+		if (get_option('geodir_show_author_left_section')) {
+			$new_class .= 'sidebar-';
+		}
+		$new_class .= 'content';
+		if (get_option('geodir_show_author_right_section')) {
+			$new_class .= '-sidebar';
+		}
+	} elseif (geodir_is_page('add-listing')) {
+		$remove_class = true;
+		$new_class .= 'content-sidebar';
+	}
+
+	if ($remove_class) {
+		$classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content'));
+		//str_replace(array('content-sidebar','sidebar-content','content-sidebar-sidebar','sidebar-sidebar-content','sidebar-content-sidebar','full-width-content'),array('','','','','',''),$classes);
+		$classes[] = $new_class;
+	}
+
+	return $classes;
 
 }
 
@@ -160,17 +160,17 @@ 
 function gd_genesis_compat_add_top_section_back()
 {
 
-    if (is_page_geodir_home() || geodir_is_page('location')) {
-        geodir_action_geodir_sidebar_home_top();
-    } elseif (geodir_is_page('listing')) {
-        geodir_action_geodir_sidebar_listings_top();
-    } elseif (geodir_is_page('detail')) {
-        geodir_action_geodir_sidebar_detail_top();
-    } elseif (geodir_is_page('search')) {
-        geodir_action_geodir_sidebar_search_top();
-    } elseif (geodir_is_page('author')) {
-        geodir_action_geodir_sidebar_author_top();
-    }
+	if (is_page_geodir_home() || geodir_is_page('location')) {
+		geodir_action_geodir_sidebar_home_top();
+	} elseif (geodir_is_page('listing')) {
+		geodir_action_geodir_sidebar_listings_top();
+	} elseif (geodir_is_page('detail')) {
+		geodir_action_geodir_sidebar_detail_top();
+	} elseif (geodir_is_page('search')) {
+		geodir_action_geodir_sidebar_search_top();
+	} elseif (geodir_is_page('author')) {
+		geodir_action_geodir_sidebar_author_top();
+	}
 
 
 }
@@ -183,12 +183,12 @@ 
  */
 function geodir_replace_breadcrumb()
 {
-    if (is_front_page() && geodir_is_page('home') && !geodir_is_page('login')) {
-    } else {
-        echo '<div class="geodir-breadcrumb-bar"><div class="wrap">';
-        geodir_breadcrumb();
-        echo '</div></div>';
-    }
+	if (is_front_page() && geodir_is_page('home') && !geodir_is_page('login')) {
+	} else {
+		echo '<div class="geodir-breadcrumb-bar"><div class="wrap">';
+		geodir_breadcrumb();
+		echo '</div></div>';
+	}
 }
 
 // Force Full Width on signup page
@@ -201,9 +201,9 @@ 
  */
 function geodir_genesis_meta()
 {
-    if (geodir_is_page('login')) {
-        add_filter('genesis_pre_get_option_site_layout', '__genesis_return_full_width_content');
-    }
+	if (geodir_is_page('login')) {
+		add_filter('genesis_pre_get_option_site_layout', '__genesis_return_full_width_content');
+	}
 }
 
 add_action('geodir_add_listing_page_title', 'geodir_add_listing_page_title_genesis_before', 8);
@@ -216,7 +216,7 @@ 
 function geodir_add_listing_page_title_genesis_before()
 {
 
-    echo "<div class='entry' >";
+	echo "<div class='entry' >";
 }
 
 
@@ -230,7 +230,7 @@ 
 function geodir_add_listing_form_genesis_after()
 {
 
-    echo "</div>";
+	echo "</div>";
 }
 
 
@@ -249,38 +249,38 @@ 
 {
 
 
-    $title = '';
-    $subtitle = '';
-
-    if (geodir_is_page('listing')) {
-        echo '<div class="wrap gd-title-wrap">';
-        geodir_action_listings_title();
-        echo '</div>';
-    }
-
-    if (geodir_is_page('add-listing')) {
-        echo '<div class="wrap gd-title-wrap">';
-        geodir_action_add_listing_page_title();
-        echo '</div>';
-    }
-
-    if (geodir_is_page('author')) {
-        echo '<div class="wrap gd-title-wrap">';
-        geodir_action_author_page_title();
-        echo '</div>';
-    }
-
-    if (geodir_is_page('detail') || geodir_is_page('preview')) {
-        echo '<div class="wrap gd-title-wrap">';
-        echo get_the_title();
-        echo '</div>';
-    }
-
-    if (geodir_is_page('search')) {
-        echo '<div class="wrap gd-title-wrap">';
-        geodir_action_search_page_title();
-        echo '</div>';
-    }
+	$title = '';
+	$subtitle = '';
+
+	if (geodir_is_page('listing')) {
+		echo '<div class="wrap gd-title-wrap">';
+		geodir_action_listings_title();
+		echo '</div>';
+	}
+
+	if (geodir_is_page('add-listing')) {
+		echo '<div class="wrap gd-title-wrap">';
+		geodir_action_add_listing_page_title();
+		echo '</div>';
+	}
+
+	if (geodir_is_page('author')) {
+		echo '<div class="wrap gd-title-wrap">';
+		geodir_action_author_page_title();
+		echo '</div>';
+	}
+
+	if (geodir_is_page('detail') || geodir_is_page('preview')) {
+		echo '<div class="wrap gd-title-wrap">';
+		echo get_the_title();
+		echo '</div>';
+	}
+
+	if (geodir_is_page('search')) {
+		echo '<div class="wrap gd-title-wrap">';
+		geodir_action_search_page_title();
+		echo '</div>';
+	}
 }
 
 
@@ -293,8 +293,8 @@ 
  */
 function gd_genesis_listing_page_title_bar()
 {
-    geodir_action_listings_title();
-    //geodir_action_listings_description();
+	geodir_action_listings_title();
+	//geodir_action_listings_description();
 }
 
 
@@ -307,19 +307,19 @@ 
  */
 function gd_compat_php_genesis_geo_1280_fix()
 {
-    if (function_exists('geo1280_search_bar')) {
-        remove_action('genesis_after_header', 'geo1280_search_bar', 20);
-        add_action('genesis_after_header', 'geo1280_search_bar_fix', 4);
+	if (function_exists('geo1280_search_bar')) {
+		remove_action('genesis_after_header', 'geo1280_search_bar', 20);
+		add_action('genesis_after_header', 'geo1280_search_bar_fix', 4);
 
-        //
+		//
 
-        remove_action('genesis_after_header', 'geodir_replace_breadcrumb', 20);
-        remove_action('genesis_before_content_sidebar_wrap', 'geodir_replace_breadcrumb', 20);
-        add_action('geodir_wrapper_open', 'geodir_replace_breadcrumb', 105);
+		remove_action('genesis_after_header', 'geodir_replace_breadcrumb', 20);
+		remove_action('genesis_before_content_sidebar_wrap', 'geodir_replace_breadcrumb', 20);
+		add_action('geodir_wrapper_open', 'geodir_replace_breadcrumb', 105);
 
-        remove_action('genesis_before_content_sidebar_wrap', 'geo1280_page_title', 10);
-        add_action('geodir_wrapper_open', 'geo1280_page_title', 101);
-    }
+		remove_action('genesis_before_content_sidebar_wrap', 'geo1280_page_title', 10);
+		add_action('geodir_wrapper_open', 'geo1280_page_title', 101);
+	}
 }
 
 /**
@@ -331,11 +331,11 @@ 
 function geo1280_search_bar_fix()
 {
 
-    echo '<div class="geo1280-placeholder"></div>';
-    if (is_active_sidebar('search-bar')) {
-        genesis_widget_area('search-bar', array(
-            'before' => '<div class="search-bar widget-area"><div class="wrap">',
-            'after' => '</div></div>',
-        ));
-    }
+	echo '<div class="geo1280-placeholder"></div>';
+	if (is_active_sidebar('search-bar')) {
+		genesis_widget_area('search-bar', array(
+			'before' => '<div class="search-bar widget-area"><div class="wrap">',
+			'after' => '</div></div>',
+		));
+	}
 }

geodirectory-templates/geodir-information.php

Indentation +15 added lines, -15 removed lines

@@ -12,27 +12,27 @@
         <div class="clearfix">
             <div id="geodir_content">
                 <?php
-                /** This action is documented in geodirectory-templates/geodir-home.php */
-                do_action('geodir_add_page_content', 'before', 'info-page');
-                global $information;
-                echo '<h5 class="geodir_information">';
-                echo $information;
-                echo '</h5>';
-                /** This action is documented in geodirectory-templates/geodir-home.php */
-                do_action('geodir_add_page_content', 'after', 'info-page');
-                ?>
+				/** This action is documented in geodirectory-templates/geodir-home.php */
+				do_action('geodir_add_page_content', 'before', 'info-page');
+				global $information;
+				echo '<h5 class="geodir_information">';
+				echo $information;
+				echo '</h5>';
+				/** This action is documented in geodirectory-templates/geodir-home.php */
+				do_action('geodir_add_page_content', 'after', 'info-page');
+				?>
             </div>
             <!-- geodir_content ends here-->
             <div id="gd-sidebar-wrapper">
                 <div class="geodir-sidebar-main">
                     <div class="geodir-gd-sidebar">
                         <?php
-                        /**
-                         * Calls the author sidebar.
-                         *
-                         * @since 1.6.11
-                         */
-                        dynamic_sidebar('geodir_author_right_sidebar'); ?>
+						/**
+						 * Calls the author sidebar.
+						 *
+						 * @since 1.6.11
+						 */
+						dynamic_sidebar('geodir_author_right_sidebar'); ?>
                     </div>
                 </div>
             </div>