GeoDirectory / geodirectory

geodirectory-admin/geodir_admin_ajax.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	 *
 	 * @since 1.0.0
 	 */
-	include_once(geodir_plugin_path() . '/geodirectory-admin/option-pages/create_field.php');
+	include_once(geodir_plugin_path().'/geodirectory-admin/option-pages/create_field.php');
     die;
 }
 

Indentation +6 added lines, -6 removed lines

@@ -13,14 +13,14 @@
 	 * @since 1.0.0
 	 */
 	include_once(geodir_plugin_path() . '/geodirectory-admin/option-pages/create_field.php');
-    gd_die();
+	gd_die();
 }
 
 
 if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] != '') {
-    switch ($_REQUEST['ajax_action']):
-        case 'get_cat_dl':
-            geodir_get_categories_dl($_REQUEST['post_type'], $_REQUEST['selected'], false, true);
-            break;
-    endswitch;
+	switch ($_REQUEST['ajax_action']):
+		case 'get_cat_dl':
+			geodir_get_categories_dl($_REQUEST['post_type'], $_REQUEST['selected'], false, true);
+			break;
+	endswitch;
 }
\ No newline at end of file

geodirectory_widgets.php

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

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

Indentation +888 added lines, -888 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,169 +944,169 @@ 
                 </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'));

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

-

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

-            }

-

-            /**

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

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

+

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

+			}

+

+			/**

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

+	}

 

 }

 

geodirectory-widgets/geodirectory_features_widget.php

Spacing +29 added lines, -29 removed lines

@@ -33,7 +33,7 @@ 
         ?>
         <?php if ($title) {
         echo '<div class="geodir_list_heading clearfix">';
-        echo $before_title . $title . $after_title;
+        echo $before_title.$title.$after_title;
         echo '</div>';
     } ?>
         <?php
@@ -42,16 +42,16 @@ 
         $i = 1;
         while ($i < 100) {
 
-            if (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) {
+            if (isset($instance['title'.$i]) || isset($instance['image'.$i]) || isset($instance['desc'.$i])) {
                 echo "<li>";
-                if ($instance['title' . $i]) {
-                    echo "<h3 class='gd-fe-title'>" . $instance['title' . $i] . "</h3>";
+                if ($instance['title'.$i]) {
+                    echo "<h3 class='gd-fe-title'>".$instance['title'.$i]."</h3>";
                 }
-                if ($instance['image' . $i]) {
-                    echo "<div class='gd-fe-image'>" . gd_features_parse_image($instance['image' . $i], $icon_color) . "</div>";
+                if ($instance['image'.$i]) {
+                    echo "<div class='gd-fe-image'>".gd_features_parse_image($instance['image'.$i], $icon_color)."</div>";
                 }
-                if ($instance['desc' . $i]) {
-                    echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($instance['desc' . $i]) . "</div>";
+                if ($instance['desc'.$i]) {
+                    echo "<div class='gd-fe-desc'>".gd_features_parse_desc($instance['desc'.$i])."</div>";
                 }
                 echo "</li>";
             } else {
@@ -78,15 +78,15 @@ 
         $i = 1;
         while ($i < 100) {
 
-            if (isset($new_instance['title' . $i]) || isset($new_instance['image' . $i]) || isset($new_instance['desc' . $i])) {
-                if ($new_instance['title' . $i]) {
-                    $instance['title' . $i] = $new_instance['title' . $i];
+            if (isset($new_instance['title'.$i]) || isset($new_instance['image'.$i]) || isset($new_instance['desc'.$i])) {
+                if ($new_instance['title'.$i]) {
+                    $instance['title'.$i] = $new_instance['title'.$i];
                 }
-                if ($new_instance['image' . $i]) {
-                    $instance['image' . $i] = $new_instance['image' . $i];
+                if ($new_instance['image'.$i]) {
+                    $instance['image'.$i] = $new_instance['image'.$i];
                 }
-                if ($new_instance['desc' . $i]) {
-                    $instance['desc' . $i] = $new_instance['desc' . $i];
+                if ($new_instance['desc'.$i]) {
+                    $instance['desc'.$i] = $new_instance['desc'.$i];
                 }
             } else {
                 break;
@@ -101,7 +101,7 @@ 
     public function form($instance)
     {
         //widgetform in backend
-        $instance = wp_parse_args((array)$instance, array(
+        $instance = wp_parse_args((array) $instance, array(
             'title' => '',
             'icon_color' => '#757575',
             'title1' => '',
@@ -138,35 +138,35 @@ 
         </p>
 
 
-        <div class="gd-fet-rep-<?php echo $this->get_field_id('xxx');?>">
+        <div class="gd-fet-rep-<?php echo $this->get_field_id('xxx'); ?>">
             <?php
 
             $i = 1;
             while ($i < 100) {
 
-                if ( $i==1 || (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) && ($instance['title' . $i] || $instance['image' . $i] || $instance['desc' . $i])) {
+                if ($i == 1 || (isset($instance['title'.$i]) || isset($instance['image'.$i]) || isset($instance['desc'.$i])) && ($instance['title'.$i] || $instance['image'.$i] || $instance['desc'.$i])) {
                     ?>
-                    <div class="gdrep<?php echo $i;?>">
+                    <div class="gdrep<?php echo $i; ?>">
                         <p class="features-title">
                             <label
                                 data-gdrep-title-num="1"><?php printf(__('Title %d:', 'geodirectory'), $i); ?></label>
-                            <input data-gdrep-title="1" name="<?php echo $this->get_field_name('title' . $i); ?>"
-                                   type="text" value="<?php echo esc_attr(strip_tags($instance['title' . $i])); ?>"
+                            <input data-gdrep-title="1" name="<?php echo $this->get_field_name('title'.$i); ?>"
+                                   type="text" value="<?php echo esc_attr(strip_tags($instance['title'.$i])); ?>"
                                    class="widefat"/>
                         </p>
 
                         <p class="features-image">
                             <label><?php echo __('Image URL:', 'geodirectory'); ?></label>
                             <input data-gdrep-image="1" type="text" class="widefat"
-                                   name="<?php echo $this->get_field_name('image' . $i); ?>"
-                                   value="<?php echo esc_attr(strip_tags($instance['image' . $i])); ?>"/>
+                                   name="<?php echo $this->get_field_name('image'.$i); ?>"
+                                   value="<?php echo esc_attr(strip_tags($instance['image'.$i])); ?>"/>
                         </p>
 
                         <p class="features-desc">
                             <label><?php echo __('Description:', 'geodirectory'); ?></label>
-                            <textarea data-gdrep-desc="1" name="<?php echo $this->get_field_name('desc' . $i); ?>"
+                            <textarea data-gdrep-desc="1" name="<?php echo $this->get_field_name('desc'.$i); ?>"
                                       rows="3"
-                                      class="widefat"><?php echo esc_attr(strip_tags($instance['desc' . $i])); ?></textarea>
+                                      class="widefat"><?php echo esc_attr(strip_tags($instance['desc'.$i])); ?></textarea>
                         </p>
                     </div>
                 <?php
@@ -179,8 +179,8 @@ 
 
             ?>
             <input class="button button-primary left"
-                   onclick="gd_featured_widget_repeat('gd-fet-rep-<?php echo $this->get_field_id('xxx');?>','<?php echo $this->get_field_name('xxx');?>')"
-                   type="button" value="<?php _e('Add item', 'geodirectory');?>"/>
+                   onclick="gd_featured_widget_repeat('gd-fet-rep-<?php echo $this->get_field_id('xxx'); ?>','<?php echo $this->get_field_name('xxx'); ?>')"
+                   type="button" value="<?php _e('Add item', 'geodirectory'); ?>"/>
         </div>
 
 
@@ -193,12 +193,12 @@ 
 function gd_features_parse_image($image, $icon_color)
 {
     if (substr($image, 0, 4) === "http") {
-        $image = '<img src="' . $image . '" />';
+        $image = '<img src="'.$image.'" />';
     } elseif (substr($image, 0, 3) === "fa-") {
         if (empty($icon_color)) {
             $icon_color = '#757575';
         }
-        $image = '<i style="color:' . $icon_color . '" class="fa ' . $image . '"></i>';
+        $image = '<i style="color:'.$icon_color.'" class="fa '.$image.'"></i>';
     }
     return $image;
 }

Indentation +128 added lines, -128 removed lines

@@ -3,117 +3,117 @@ 
 class Geodir_Features_Widget extends WP_Widget
 {
 
-    /**
-     * Class constructor.
-     */
-    public function __construct()
-    {
-        $widget_ops = array(
-            'description' => __('Displays "GD Features" widget', 'geodirectory'),
-            'classname' => 'widget_gd_features',
-        );
-        parent::__construct(false, $name = _x('GD > Features', 'widget name', 'geodirectory'), $widget_ops);
-
-    }
-
-    /**
-     * Display the widget.
-     *
-     * @param array $args Widget arguments.
-     * @param array $instance The widget settings, as saved by the user.
-     */
-    public function widget($args, $instance)
-    {
-        extract($args);
-
-        $title = empty($instance['title']) ? '' : apply_filters('gd_features_widget_title', __($instance['title'], 'geodirectory'));
-        $icon_color = empty($instance['icon_color']) ? '#757575' : apply_filters('gd_features_widget_icon_color', __($instance['icon_color'], 'geodirectory'));
-
-        echo $before_widget;
-        ?>
+	/**
+	 * Class constructor.
+	 */
+	public function __construct()
+	{
+		$widget_ops = array(
+			'description' => __('Displays "GD Features" widget', 'geodirectory'),
+			'classname' => 'widget_gd_features',
+		);
+		parent::__construct(false, $name = _x('GD > Features', 'widget name', 'geodirectory'), $widget_ops);
+
+	}
+
+	/**
+	 * Display the widget.
+	 *
+	 * @param array $args Widget arguments.
+	 * @param array $instance The widget settings, as saved by the user.
+	 */
+	public function widget($args, $instance)
+	{
+		extract($args);
+
+		$title = empty($instance['title']) ? '' : apply_filters('gd_features_widget_title', __($instance['title'], 'geodirectory'));
+		$icon_color = empty($instance['icon_color']) ? '#757575' : apply_filters('gd_features_widget_icon_color', __($instance['icon_color'], 'geodirectory'));
+
+		echo $before_widget;
+		?>
         <?php if ($title) {
-        echo '<div class="geodir_list_heading clearfix">';
-        echo $before_title . $title . $after_title;
-        echo '</div>';
-    } ?>
+		echo '<div class="geodir_list_heading clearfix">';
+		echo $before_title . $title . $after_title;
+		echo '</div>';
+	} ?>
         <?php
-        echo "<ul class='gd-features'>";
-
-        $i = 1;
-        while ($i < 100) {
-
-            if (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) {
-                echo "<li>";
-                if ($instance['title' . $i]) {
-                    echo "<h3 class='gd-fe-title'>" . $instance['title' . $i] . "</h3>";
-                }
-                if ($instance['image' . $i]) {
-                    echo "<div class='gd-fe-image'>" . gd_features_parse_image($instance['image' . $i], $icon_color) . "</div>";
-                }
-                if ($instance['desc' . $i]) {
-                    echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($instance['desc' . $i]) . "</div>";
-                }
-                echo "</li>";
-            } else {
-                break;
-            }
-
-            $i++;
-        }
-
-        echo "</ul>";
-        ?>
+		echo "<ul class='gd-features'>";
+
+		$i = 1;
+		while ($i < 100) {
+
+			if (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) {
+				echo "<li>";
+				if ($instance['title' . $i]) {
+					echo "<h3 class='gd-fe-title'>" . $instance['title' . $i] . "</h3>";
+				}
+				if ($instance['image' . $i]) {
+					echo "<div class='gd-fe-image'>" . gd_features_parse_image($instance['image' . $i], $icon_color) . "</div>";
+				}
+				if ($instance['desc' . $i]) {
+					echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($instance['desc' . $i]) . "</div>";
+				}
+				echo "</li>";
+			} else {
+				break;
+			}
+
+			$i++;
+		}
+
+		echo "</ul>";
+		?>
         <?php echo $after_widget; ?>
     <?php
-    }
-
-    public function update($new_instance, $old_instance)
-    {
-        //save the widget
-        $instance = $old_instance;
-
-        $instance['title'] = strip_tags($new_instance['title']);
-        $instance['icon_color'] = strip_tags($new_instance['icon_color']);
-
-        $i = 1;
-        while ($i < 100) {
-
-            if (isset($new_instance['title' . $i]) || isset($new_instance['image' . $i]) || isset($new_instance['desc' . $i])) {
-                if ($new_instance['title' . $i]) {
-                    $instance['title' . $i] = $new_instance['title' . $i];
-                }
-                if ($new_instance['image' . $i]) {
-                    $instance['image' . $i] = $new_instance['image' . $i];
-                }
-                if ($new_instance['desc' . $i]) {
-                    $instance['desc' . $i] = $new_instance['desc' . $i];
-                }
-            } else {
-                break;
-            }
-
-            $i++;
-        }
-
-        return $instance;
-    }
-
-    public function form($instance)
-    {
-        //widgetform in backend
-        $instance = wp_parse_args((array)$instance, array(
-            'title' => '',
-            'icon_color' => '#757575',
-            'title1' => '',
-            'image1' => '',
-            'desc1' => '',
-        ));
-
-
-        $title = strip_tags($instance['title']);
-        $icon_color = strip_tags($instance['icon_color']);
-
-        ?>
+	}
+
+	public function update($new_instance, $old_instance)
+	{
+		//save the widget
+		$instance = $old_instance;
+
+		$instance['title'] = strip_tags($new_instance['title']);
+		$instance['icon_color'] = strip_tags($new_instance['icon_color']);
+
+		$i = 1;
+		while ($i < 100) {
+
+			if (isset($new_instance['title' . $i]) || isset($new_instance['image' . $i]) || isset($new_instance['desc' . $i])) {
+				if ($new_instance['title' . $i]) {
+					$instance['title' . $i] = $new_instance['title' . $i];
+				}
+				if ($new_instance['image' . $i]) {
+					$instance['image' . $i] = $new_instance['image' . $i];
+				}
+				if ($new_instance['desc' . $i]) {
+					$instance['desc' . $i] = $new_instance['desc' . $i];
+				}
+			} else {
+				break;
+			}
+
+			$i++;
+		}
+
+		return $instance;
+	}
+
+	public function form($instance)
+	{
+		//widgetform in backend
+		$instance = wp_parse_args((array)$instance, array(
+			'title' => '',
+			'icon_color' => '#757575',
+			'title1' => '',
+			'image1' => '',
+			'desc1' => '',
+		));
+
+
+		$title = strip_tags($instance['title']);
+		$icon_color = strip_tags($instance['icon_color']);
+
+		?>
         <p>
             <b>Heads Up!</b> If you don't have enough content, You can keep some boxes blank.
         </p>
@@ -141,11 +141,11 @@ 
         <div class="gd-fet-rep-<?php echo $this->get_field_id('xxx');?>">
             <?php
 
-            $i = 1;
-            while ($i < 100) {
+			$i = 1;
+			while ($i < 100) {
 
-                if ( $i==1 || (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) && ($instance['title' . $i] || $instance['image' . $i] || $instance['desc' . $i])) {
-                    ?>
+				if ( $i==1 || (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) && ($instance['title' . $i] || $instance['image' . $i] || $instance['desc' . $i])) {
+					?>
                     <div class="gdrep<?php echo $i;?>">
                         <p class="features-title">
                             <label
@@ -170,14 +170,14 @@ 
                         </p>
                     </div>
                 <?php
-                } else {
-                    break;
-                }
+				} else {
+					break;
+				}
 
-                $i++;
-            }
+				$i++;
+			}
 
-            ?>
+			?>
             <input class="button button-primary left"
                    onclick="gd_featured_widget_repeat('gd-fet-rep-<?php echo $this->get_field_id('xxx');?>','<?php echo $this->get_field_name('xxx');?>')"
                    type="button" value="<?php _e('Add item', 'geodirectory');?>"/>
@@ -185,25 +185,25 @@ 
 
 
     <?php
-    }
+	}
 
 }
 
 register_widget("Geodir_Features_Widget");
 function gd_features_parse_image($image, $icon_color)
 {
-    if (substr($image, 0, 4) === "http") {
-        $image = '<img src="' . $image . '" />';
-    } elseif (substr($image, 0, 3) === "fa-") {
-        if (empty($icon_color)) {
-            $icon_color = '#757575';
-        }
-        $image = '<i style="color:' . $icon_color . '" class="fa ' . $image . '"></i>';
-    }
-    return $image;
+	if (substr($image, 0, 4) === "http") {
+		$image = '<img src="' . $image . '" />';
+	} elseif (substr($image, 0, 3) === "fa-") {
+		if (empty($icon_color)) {
+			$icon_color = '#757575';
+		}
+		$image = '<i style="color:' . $icon_color . '" class="fa ' . $image . '"></i>';
+	}
+	return $image;
 }
 
 function gd_features_parse_desc($desc)
 {
-    return $desc;
+	return $desc;
 }

tests/lib/wordpress-tests-lib/includes/mock-mailer.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-require_once( ABSPATH . '/wp-includes/class-phpmailer.php' );
+require_once(ABSPATH.'/wp-includes/class-phpmailer.php');
 
 class MockPHPMailer extends PHPMailer {
 	var $mock_sent = array();

tests/lib/wordpress-tests-lib/includes/testcase-xmlrpc.php

Spacing +7 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php
-include_once(ABSPATH . 'wp-admin/includes/admin.php');
-include_once(ABSPATH . WPINC . '/class-IXR.php');
-include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');
+include_once(ABSPATH.'wp-admin/includes/admin.php');
+include_once(ABSPATH.WPINC.'/class-IXR.php');
+include_once(ABSPATH.WPINC.'/class-wp-xmlrpc-server.php');
 
 class WP_XMLRPC_UnitTestCase extends WP_UnitTestCase {
 	protected $myxmlrpcserver;
@@ -9,21 +9,21 @@ 
 	function setUp() {
 		parent::setUp();
 
-		add_filter( 'pre_option_enable_xmlrpc', '__return_true' );
+		add_filter('pre_option_enable_xmlrpc', '__return_true');
 
 		$this->myxmlrpcserver = new wp_xmlrpc_server();
 	}
 
 	function tearDown() {
-		remove_filter( 'pre_option_enable_xmlrpc', '__return_true' );
+		remove_filter('pre_option_enable_xmlrpc', '__return_true');
 
 		$this->remove_added_uploads();
 
 		parent::tearDown();
 	}
 
-	protected function make_user_by_role( $role ) {
-		return self::factory()->user->create( array(
+	protected function make_user_by_role($role) {
+		return self::factory()->user->create(array(
 			'user_login' => $role,
 			'user_pass'  => $role,
 			'role'       => $role

tests/lib/wordpress-tests-lib/includes/trac.php

Spacing +22 added lines, -22 removed lines

@@ -13,46 +13,46 @@
 	 *
 	 * @return bool|null true if the ticket is resolved, false if not resolved, null on error
 	 */
-	public static function isTracTicketClosed( $trac_url, $ticket_id ) {
-		if ( ! extension_loaded( 'openssl' ) ) {
-			$trac_url = preg_replace( "/^https:/", "http:", $trac_url );
+	public static function isTracTicketClosed($trac_url, $ticket_id) {
+		if (!extension_loaded('openssl')) {
+			$trac_url = preg_replace("/^https:/", "http:", $trac_url);
 		}
 
-		if ( ! isset( self::$trac_ticket_cache[ $trac_url ] ) ) {
+		if (!isset(self::$trac_ticket_cache[$trac_url])) {
 			// In case you're running the tests offline, keep track of open tickets.
-			$file = DIR_TESTDATA . '/.trac-ticket-cache.' . str_replace( array( 'http://', 'https://', '/' ), array( '', '', '-' ), rtrim( $trac_url, '/' ) );
-			$tickets = @file_get_contents( $trac_url . '/query?status=%21closed&format=csv&col=id' );
+			$file = DIR_TESTDATA.'/.trac-ticket-cache.'.str_replace(array('http://', 'https://', '/'), array('', '', '-'), rtrim($trac_url, '/'));
+			$tickets = @file_get_contents($trac_url.'/query?status=%21closed&format=csv&col=id');
 			// Check if our HTTP request failed.
-			if ( false === $tickets ) {
-				if ( file_exists( $file ) ) {
-					register_shutdown_function( array( 'TracTickets', 'usingLocalCache' ) );
-					$tickets = file_get_contents( $file );
+			if (false === $tickets) {
+				if (file_exists($file)) {
+					register_shutdown_function(array('TracTickets', 'usingLocalCache'));
+					$tickets = file_get_contents($file);
 				} else {
-					register_shutdown_function( array( 'TracTickets', 'forcingKnownBugs' ) );
-					self::$trac_ticket_cache[ $trac_url ] = array();
+					register_shutdown_function(array('TracTickets', 'forcingKnownBugs'));
+					self::$trac_ticket_cache[$trac_url] = array();
 					return true; // Assume the ticket is closed, which means it gets run.
 				}
 			} else {
-				$tickets = substr( $tickets, 2 ); // remove 'id' column header
-				$tickets = trim( $tickets );
-				file_put_contents( $file, $tickets );
+				$tickets = substr($tickets, 2); // remove 'id' column header
+				$tickets = trim($tickets);
+				file_put_contents($file, $tickets);
 			}
-			$tickets = explode( "\r\n", $tickets );
-			self::$trac_ticket_cache[ $trac_url ] = $tickets;
+			$tickets = explode("\r\n", $tickets);
+			self::$trac_ticket_cache[$trac_url] = $tickets;
 		}
 
-		return ! in_array( $ticket_id, self::$trac_ticket_cache[ $trac_url ] );
+		return !in_array($ticket_id, self::$trac_ticket_cache[$trac_url]);
 	}
 
 	public static function usingLocalCache() {
-		echo PHP_EOL . "\x1b[0m\x1b[30;43m\x1b[2K";
-		echo 'INFO: Trac was inaccessible, so a local ticket status cache was used.' . PHP_EOL;
+		echo PHP_EOL."\x1b[0m\x1b[30;43m\x1b[2K";
+		echo 'INFO: Trac was inaccessible, so a local ticket status cache was used.'.PHP_EOL;
 		echo "\x1b[0m\x1b[2K";
 	}
 
 	public static function forcingKnownBugs() {
-		echo PHP_EOL . "\x1b[0m\x1b[37;41m\x1b[2K";
-		echo "ERROR: Trac was inaccessible, so known bugs weren't able to be skipped." . PHP_EOL;
+		echo PHP_EOL."\x1b[0m\x1b[37;41m\x1b[2K";
+		echo "ERROR: Trac was inaccessible, so known bugs weren't able to be skipped.".PHP_EOL;
 		echo "\x1b[0m\x1b[2K";
 	}
 }

geodirectory-admin/admin_template_tags.php

Braces +21 added lines, -13 removed lines

@@ -74,17 +74,20 @@ 
                                 $tab_link = $args['url'];

                             }

 

-                            if (!empty($args['request']))

-                                $tab_link = geodir_getlink($tab_link, $args['request']);

+                            if (!empty($args['request'])) {
+                                                            $tab_link = geodir_getlink($tab_link, $args['request']);
+                            }
 

                             if (isset($args['target']) && $args['target'] != '') {

                                 $tab_target = " target='" . sanitize_text_field($args['target']) . "' ";

-                            } else

-                                $tab_target = '';

+                            } else {
+                                                            $tab_target = '';
+                            }
 

                             $tab_active = '';

-                            if ($current_tab == $name)

-                                $tab_active = ' class="tab-active" ';

+                            if ($current_tab == $name) {
+                                                            $tab_active = ' class="tab-active" ';
+                            }
                             /**

                              * Called before the individual settings tabs are output.

                              *

@@ -122,8 +125,9 @@ 
 

                         <?php

                         unset($subtabs);

-                        if (isset($tabs[$current_tab]['subtabs']))

-                            $subtabs = $tabs[$current_tab]['subtabs'];

+                        if (isset($tabs[$current_tab]['subtabs'])) {
+                                                    $subtabs = $tabs[$current_tab]['subtabs'];
+                        }
                         $form_action = '';

 

                         if (!empty($subtabs)):

@@ -189,7 +193,10 @@ 
                      jQuery('#last_tab').val( jQuery(this).attr('href') );

                      return false;*/

                 });

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

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

                 // Countries

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

                     if (jQuery(this).val() == "specific") {

@@ -312,10 +319,11 @@ 
                 geodir_register_defaults();

             }*/

 

-            if (isset($_REQUEST['active_tab']) && ($_REQUEST['active_tab'] == 'dummy_data_settings' || $_REQUEST['active_tab'] == 'csv_upload_settings'))

-                $hide_save_button = "style='display:none;'";

-            else

-                $hide_save_button = '';

+            if (isset($_REQUEST['active_tab']) && ($_REQUEST['active_tab'] == 'dummy_data_settings' || $_REQUEST['active_tab'] == 'csv_upload_settings')) {
+                            $hide_save_button = "style='display:none;'";
+            } else {
+                            $hide_save_button = '';
+            }
 

             /**

              * Filter weather the default save button in the GD admin settings pages should be shown.

Indentation +529 added lines, -529 removed lines

@@ -7,33 +7,33 @@ 
  */

 

 if (!function_exists('geodir_admin_panel')) {

-    /**

-     * GeoDirectory Backend Admin Panel.

-     *

-     * Handles the display of the main GeoDirectory admin panel.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

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

-     * @global object $geodirectory GeoDirectory plugin object.

-     */

-    function geodir_admin_panel()

-    {

-        global $geodirectory;

-        global $current_tab;

-

-

-        ?>

+	/**

+	 * GeoDirectory Backend Admin Panel.

+	 *

+	 * Handles the display of the main GeoDirectory admin panel.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

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

+	 * @global object $geodirectory GeoDirectory plugin object.

+	 */

+	function geodir_admin_panel()

+	{

+		global $geodirectory;

+		global $current_tab;

+

+

+		?>

 

         <div id="gd-wrapper-main" class="wrap geodirectory">

             <?php

-            /**

-             * Called just after the opening wrapper div for the GD settings page in the admin area.

-             *

-             * @since 1.0.0

-             */

-            do_action('geodir_before_admin_panel');

-            ?>

+			/**

+			 * Called just after the opening wrapper div for the GD settings page in the admin area.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('geodir_before_admin_panel');

+			?>

 

             <div class="gd-wrapper gd-wrapper-vr clearfix">

 

@@ -44,75 +44,75 @@ 
                          alt="geo-logo" class="geo-logoalter"/>

                     <ul>

                         <?php

-                        $tabs = array();

-                        /**

-                         * Filter the GD admin settings tabs on the left of the admin menu.

-                         *

-                         * @since 1.0.0

-                         * @param array $tabs The array of tabs to display.

-                         */

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

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

-

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

-                            $label = $args['label'];

-

-

-                            $query_string = '';

-                            if (isset($args['subtabs']) && !empty($args['subtabs'])):

-

-                                $subtabs = $args['subtabs'];

-

-                                $query_string = '&subtab=' . $subtabs[0]['subtab'];

-

-                            endif;

-

-

-                            $tab_link = admin_url('admin.php?page=geodirectory&tab=' . $name . $query_string);

-

-                            if (isset($args['url']) && $args['url'] != '') {

-                                $tab_link = $args['url'];

-                            }

-

-                            if (!empty($args['request']))

-                                $tab_link = geodir_getlink($tab_link, $args['request']);

-

-                            if (isset($args['target']) && $args['target'] != '') {

-                                $tab_target = " target='" . sanitize_text_field($args['target']) . "' ";

-                            } else

-                                $tab_target = '';

-

-                            $tab_active = '';

-                            if ($current_tab == $name)

-                                $tab_active = ' class="tab-active" ';

-                            /**

-                             * Called before the individual settings tabs are output.

-                             *

-                             * @since 1.0.0

-                             * @param string $name The name of the settings tab.

-                             * @see 'geodir_after_settings_tabs'

-                             */

-                            do_action('geodir_before_settings_tabs', $name);

-                            echo '<li ' . $tab_active . ' ><a href="' . esc_url($tab_link) . '"  ' . $tab_target . ' >' . $label . '</a></li>';

-                            /**

-                             * Called after the individual settings tabs are output.

-                             *

-                             * @since 1.0.0

-                             * @param string $name The name of the settings tab.

-                             * @see 'geodir_before_settings_tabs'

-                             */

-                            do_action('geodir_after_settings_tabs', $name);

-                        endforeach;

-

-                        /**

-                         * Called after the GD settings tabs have been output.

-                         *

-                         * Called before the closing `ul` so can be used to add new settings tab links.

-                         *

-                         * @since 1.0.0

-                         */

-                        do_action('geodir_settings_tabs');

-                        ?>

+						$tabs = array();

+						/**

+						 * Filter the GD admin settings tabs on the left of the admin menu.

+						 *

+						 * @since 1.0.0

+						 * @param array $tabs The array of tabs to display.

+						 */

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

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

+

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

+							$label = $args['label'];

+

+

+							$query_string = '';

+							if (isset($args['subtabs']) && !empty($args['subtabs'])):

+

+								$subtabs = $args['subtabs'];

+

+								$query_string = '&subtab=' . $subtabs[0]['subtab'];

+

+							endif;

+

+

+							$tab_link = admin_url('admin.php?page=geodirectory&tab=' . $name . $query_string);

+

+							if (isset($args['url']) && $args['url'] != '') {

+								$tab_link = $args['url'];

+							}

+

+							if (!empty($args['request']))

+								$tab_link = geodir_getlink($tab_link, $args['request']);

+

+							if (isset($args['target']) && $args['target'] != '') {

+								$tab_target = " target='" . sanitize_text_field($args['target']) . "' ";

+							} else

+								$tab_target = '';

+

+							$tab_active = '';

+							if ($current_tab == $name)

+								$tab_active = ' class="tab-active" ';

+							/**

+							 * Called before the individual settings tabs are output.

+							 *

+							 * @since 1.0.0

+							 * @param string $name The name of the settings tab.

+							 * @see 'geodir_after_settings_tabs'

+							 */

+							do_action('geodir_before_settings_tabs', $name);

+							echo '<li ' . $tab_active . ' ><a href="' . esc_url($tab_link) . '"  ' . $tab_target . ' >' . $label . '</a></li>';

+							/**

+							 * Called after the individual settings tabs are output.

+							 *

+							 * @since 1.0.0

+							 * @param string $name The name of the settings tab.

+							 * @see 'geodir_before_settings_tabs'

+							 */

+							do_action('geodir_after_settings_tabs', $name);

+						endforeach;

+

+						/**

+						 * Called after the GD settings tabs have been output.

+						 *

+						 * Called before the closing `ul` so can be used to add new settings tab links.

+						 *

+						 * @since 1.0.0

+						 */

+						do_action('geodir_settings_tabs');

+						?>

                     </ul>

                 </div>

                 <!--gd-left-nav ends here-->

@@ -121,52 +121,52 @@ 
                     <div class="gd-tabs-main">

 

                         <?php

-                        unset($subtabs);

-                        if (isset($tabs[$current_tab]['subtabs']))

-                            $subtabs = $tabs[$current_tab]['subtabs'];

-                        $form_action = '';

+						unset($subtabs);

+						if (isset($tabs[$current_tab]['subtabs']))

+							$subtabs = $tabs[$current_tab]['subtabs'];

+						$form_action = '';

 

-                        if (!empty($subtabs)):

-                        ?>

+						if (!empty($subtabs)):

+						?>

                             <dl class="gd-tab-head">

                                 <?php

-                                foreach ($subtabs as $sub) {

-                                    $subtab_active = '';

-                                    if (isset($_REQUEST['subtab']) && $sub['subtab'] == $_REQUEST['subtab']) {

-                                        $subtab_active = 'class="gd-tab-active"';

-                                        $form_action = isset($sub['form_action']) ? $sub['form_action'] : '';

-                                    }

-

-                                    $sub_tabs_link = admin_url() . 'admin.php?page=geodirectory&tab=' . $current_tab . '&subtab=' . $sub['subtab'];

-                                    if (isset($sub['request']) && is_array($sub['request']) && !empty($sub['request'])) {

-                                        $sub_tabs_link = geodir_getlink($sub_tabs_link, $sub['request']);

-                                    }

-                                    echo '<dd ' . $subtab_active . ' id="claim_listing"><a href="' . esc_url($sub_tabs_link) . '" >' . sanitize_text_field($sub['label']) . '</a></dd>';

-                                }

-                                ?>

+								foreach ($subtabs as $sub) {

+									$subtab_active = '';

+									if (isset($_REQUEST['subtab']) && $sub['subtab'] == $_REQUEST['subtab']) {

+										$subtab_active = 'class="gd-tab-active"';

+										$form_action = isset($sub['form_action']) ? $sub['form_action'] : '';

+									}

+

+									$sub_tabs_link = admin_url() . 'admin.php?page=geodirectory&tab=' . $current_tab . '&subtab=' . $sub['subtab'];

+									if (isset($sub['request']) && is_array($sub['request']) && !empty($sub['request'])) {

+										$sub_tabs_link = geodir_getlink($sub_tabs_link, $sub['request']);

+									}

+									echo '<dd ' . $subtab_active . ' id="claim_listing"><a href="' . esc_url($sub_tabs_link) . '" >' . sanitize_text_field($sub['label']) . '</a></dd>';

+								}

+								?>

                             </dl>

 

                         <?php endif; ?>

                         <div class="gd-tab-content <?php if (empty($subtabs)) {

-                            echo "inner_contet_tabs";

-                        } ?>">

+							echo "inner_contet_tabs";

+						} ?>">

                             <form method="post" id="mainform"

                                   class="geodir_optionform <?php echo $current_tab . ' '; ?><?php if (isset($sub['subtab'])) {

-                                      echo sanitize_text_field($sub['subtab']);

-                                  } ?>" action="<?php echo $form_action; ?>" enctype="multipart/form-data">

+									  echo sanitize_text_field($sub['subtab']);

+								  } ?>" action="<?php echo $form_action; ?>" enctype="multipart/form-data">

                                 <input type="hidden" class="active_tab" name="active_tab"

                                        value="<?php if (isset($_REQUEST['active_tab'])) {

-                                           echo sanitize_text_field($_REQUEST['active_tab']);

-                                       } ?>"/>

+										   echo sanitize_text_field($_REQUEST['active_tab']);

+									   } ?>"/>

                                 <?php wp_nonce_field('geodir-settings', '_wpnonce', true, true); ?>

                                 <?php wp_nonce_field('geodir-settings-' . $current_tab, '_wpnonce-' . $current_tab, true, true); ?>

                                 <?php

-                                /**

-                                 * Used to call the content of each GD settings tab page.

-                                 *

-                                 * @since 1.0.0

-                                 */

-                                do_action('geodir_admin_option_form', $current_tab); ?>

+								/**

+								 * Used to call the content of each GD settings tab page.

+								 *

+								 * @since 1.0.0

+								 */

+								do_action('geodir_admin_option_form', $current_tab); ?>

                             </form>

                         </div>

 

@@ -267,7 +267,7 @@ 
         </script>

     <?php

 

-    }

+	}

 }

 

 

@@ -283,48 +283,48 @@ 
 function geodir_admin_option_form($tab_name)

 {

 

-    //echo $tab_name.'_array.php' ;

-    global $geodir_settings, $is_default, $mapzoom;

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

-        /**

-         * Contains settings array for given tab.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

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

-    }

-

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

-

-    switch ($tab_name) {

-

-        case 'general_settings':

-

-            geodir_admin_fields($geodir_settings['general_settings']);

-            /**

-             *

-             * Update Taxonomy Options *

-             *

-             **/

-            /*add_action('updated_option_place_prefix','update_listing_prefix');

+	//echo $tab_name.'_array.php' ;

+	global $geodir_settings, $is_default, $mapzoom;

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

+		/**

+		 * Contains settings array for given tab.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

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

+	}

+

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

+

+	switch ($tab_name) {

+

+		case 'general_settings':

+

+			geodir_admin_fields($geodir_settings['general_settings']);

+			/**

+			 *

+			 * Update Taxonomy Options *

+			 *

+			 **/

+			/*add_action('updated_option_place_prefix','update_listing_prefix');

             function update_listing_prefix(){

                 geodir_register_defaults();

             }*/

 

-            if (isset($_REQUEST['active_tab']) && ($_REQUEST['active_tab'] == 'dummy_data_settings' || $_REQUEST['active_tab'] == 'csv_upload_settings'))

-                $hide_save_button = "style='display:none;'";

-            else

-                $hide_save_button = '';

+			if (isset($_REQUEST['active_tab']) && ($_REQUEST['active_tab'] == 'dummy_data_settings' || $_REQUEST['active_tab'] == 'csv_upload_settings'))

+				$hide_save_button = "style='display:none;'";

+			else

+				$hide_save_button = '';

 

-            /**

-             * Filter weather the default save button in the GD admin settings pages should be shown.

-             *

-             * @since 1.0.0

-             * @param string $hide_save_button The style element, either blank or: style='display:none;'.

-             */

-            $hide_save_button = apply_filters('geodir_hide_save_button', $hide_save_button);

-            ?>

+			/**

+			 * Filter weather the default save button in the GD admin settings pages should be shown.

+			 *

+			 * @since 1.0.0

+			 * @param string $hide_save_button The style element, either blank or: style='display:none;'.

+			 */

+			$hide_save_button = apply_filters('geodir_hide_save_button', $hide_save_button);

+			?>

 

             <p class="submit">

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

@@ -334,36 +334,36 @@ 
             </div>

             

 		<?php break;

-        case 'design_settings' :

-            geodir_admin_fields($geodir_settings['design_settings']);

+		case 'design_settings' :

+			geodir_admin_fields($geodir_settings['design_settings']);

 

 

 

-            ?>

+			?>

 			<p class="submit">

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

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

 			</p>

 			</div>

         <?php break;

-        case 'permalink_settings' :

-            geodir_admin_fields($geodir_settings['permalink_settings']); ?>

+		case 'permalink_settings' :

+			geodir_admin_fields($geodir_settings['permalink_settings']); ?>

             <p class="submit">

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

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

             </p>

             </div>	

 		<?php break;

-        case 'title_meta_settings' :

-            geodir_admin_fields($geodir_settings['title_meta_settings']); ?>

+		case 'title_meta_settings' :

+			geodir_admin_fields($geodir_settings['title_meta_settings']); ?>

             <p class="submit">

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

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

             </p>

             </div>

 		<?php break;

-        case 'notifications_settings' :

-            geodir_admin_fields($geodir_settings['notifications_settings']); ?>

+		case 'notifications_settings' :

+			geodir_admin_fields($geodir_settings['notifications_settings']); ?>

 			

 			<p class="submit">

 				

@@ -373,36 +373,36 @@ 
 			</div>

 			

 		<?php break;

-        case 'default_location_settings' :

-            ?>

+		case 'default_location_settings' :

+			?>

             <div class="inner_content_tab_main">

                 <div class="gd-content-heading">

                     <?php global $wpdb;

 

 

-                    $location_result = geodir_get_default_location();

+					$location_result = geodir_get_default_location();

 

-                    $prefix = '';

+					$prefix = '';

 

 

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

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

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

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

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

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

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

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

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

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

 

 

-                    $map_title = __("Set Address On Map", 'geodirectory');

+					$map_title = __("Set Address On Map", 'geodirectory');

 

-                    ?>

+					?>

 

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

 

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

 

                     <input type="hidden" name="update_city" value="<?php if (isset($location_result->location_id)) {

-                        echo $location_result->location_id;

-                    } ?>">

+						echo $location_result->location_id;

+					} ?>">

 

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

 

@@ -415,8 +415,8 @@ 
                                     <input class="require" type="text" size="80" style="width:440px"

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

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

-                                               echo $location_result->city;

-                                           } ?>"/>

+											   echo $location_result->city;

+										   } ?>"/>

 

                                     <div

                                         class="gd-location_message_error"> <?php _e('This field is required.', 'geodirectory'); ?></div>

@@ -431,8 +431,8 @@ 
                                     <input class="require" type="text" size="80" style="width:440px"

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

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

-                                               echo $location_result->region;

-                                           } ?>"/>

+											   echo $location_result->region;

+										   } ?>"/>

 

                                     <div

                                         class="gd-location_message_error"> <?php _e('This field is required.', 'geodirectory'); ?></div>

@@ -446,8 +446,8 @@ 
                                 <div class="gtd-formfeild required" style="padding-top:10px;">

                                     <?php

 

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

-                                    ?>

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

+									?>

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

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

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

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

                             <td class="forminp">

                                 <?php

-                                /**

-                                 * Contains add listing page map functions.

-                                 *

-                                 * @since 1.0.0

-                                 */

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

+								/**

+								 * Contains add listing page map functions.

+								 *

+								 * @since 1.0.0

+								 */

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

                             </td>

                         </tr>

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

@@ -485,8 +485,8 @@ 
                                     <input type="text" class="require" size="80" style="width:440px"

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

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

-                                               echo $location_result->city_latitude;

-                                           } ?>"/>

+											   echo $location_result->city_latitude;

+										   } ?>"/>

 

                                     <div

                                         class="gd-location_message_error"><?php _e('This field is required.', 'geodirectory'); ?></div>

@@ -502,8 +502,8 @@ 
                                     <input type="text" class="require" size="80" style="width:440px"

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

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

-                                               echo $location_result->city_longitude;

-                                           } ?>"/>

+											   echo $location_result->city_longitude;

+										   } ?>"/>

 

                                     <div

                                         class="gd-location_message_error"><?php _e('This field is required.', 'geodirectory'); ?></div>

@@ -535,22 +535,22 @@ 
                 </div>

             </div>

             <?php break;

-        case $listing_type . '_fields_settings' :

+		case $listing_type . '_fields_settings' :

 

-            geodir_custom_post_type_form();

+			geodir_custom_post_type_form();

 

-            break;

-        case 'tools_settings' :

-            geodir_diagnostic_tools_setting_page();

-            break;

-        case 'compatibility_settings' :

-            geodir_theme_compatibility_setting_page();

-            break;		

+			break;

+		case 'tools_settings' :

+			geodir_diagnostic_tools_setting_page();

+			break;

+		case 'compatibility_settings' :

+			geodir_theme_compatibility_setting_page();

+			break;		

 		case 'import_export' :

-            geodir_import_export_page();

-            break;

+			geodir_import_export_page();

+			break;

 

-    }// end of switch

+	}// end of switch

 }

 

 

@@ -590,170 +590,170 @@ 
 function geodir_update_options_compatibility_settings()

 {

 

-    global $wpdb;

+	global $wpdb;

 

 

-    $theme_settings = array();

+	$theme_settings = array();

 

-    $theme_settings['geodir_wrapper_open_id'] = $_POST['geodir_wrapper_open_id'];

-    $theme_settings['geodir_wrapper_open_class'] = $_POST['geodir_wrapper_open_class'];

-    $theme_settings['geodir_wrapper_open_replace'] = stripslashes($_POST['geodir_wrapper_open_replace']);

+	$theme_settings['geodir_wrapper_open_id'] = $_POST['geodir_wrapper_open_id'];

+	$theme_settings['geodir_wrapper_open_class'] = $_POST['geodir_wrapper_open_class'];

+	$theme_settings['geodir_wrapper_open_replace'] = stripslashes($_POST['geodir_wrapper_open_replace']);

 

-    $theme_settings['geodir_wrapper_close_replace'] = stripslashes($_POST['geodir_wrapper_close_replace']);

+	$theme_settings['geodir_wrapper_close_replace'] = stripslashes($_POST['geodir_wrapper_close_replace']);

 

-    $theme_settings['geodir_wrapper_content_open_id'] = $_POST['geodir_wrapper_content_open_id'];

-    $theme_settings['geodir_wrapper_content_open_class'] = $_POST['geodir_wrapper_content_open_class'];

-    $theme_settings['geodir_wrapper_content_open_replace'] = stripslashes($_POST['geodir_wrapper_content_open_replace']);

+	$theme_settings['geodir_wrapper_content_open_id'] = $_POST['geodir_wrapper_content_open_id'];

+	$theme_settings['geodir_wrapper_content_open_class'] = $_POST['geodir_wrapper_content_open_class'];

+	$theme_settings['geodir_wrapper_content_open_replace'] = stripslashes($_POST['geodir_wrapper_content_open_replace']);

 

-    $theme_settings['geodir_wrapper_content_close_replace'] = stripslashes($_POST['geodir_wrapper_content_close_replace']);

+	$theme_settings['geodir_wrapper_content_close_replace'] = stripslashes($_POST['geodir_wrapper_content_close_replace']);

 

-    $theme_settings['geodir_article_open_id'] = $_POST['geodir_article_open_id'];

-    $theme_settings['geodir_article_open_class'] = $_POST['geodir_article_open_class'];

-    $theme_settings['geodir_article_open_replace'] = stripslashes($_POST['geodir_article_open_replace']);

+	$theme_settings['geodir_article_open_id'] = $_POST['geodir_article_open_id'];

+	$theme_settings['geodir_article_open_class'] = $_POST['geodir_article_open_class'];

+	$theme_settings['geodir_article_open_replace'] = stripslashes($_POST['geodir_article_open_replace']);

 

-    $theme_settings['geodir_article_close_replace'] = stripslashes($_POST['geodir_article_close_replace']);

+	$theme_settings['geodir_article_close_replace'] = stripslashes($_POST['geodir_article_close_replace']);

 

-    $theme_settings['geodir_sidebar_right_open_id'] = $_POST['geodir_sidebar_right_open_id'];

-    $theme_settings['geodir_sidebar_right_open_class'] = $_POST['geodir_sidebar_right_open_class'];

-    $theme_settings['geodir_sidebar_right_open_replace'] = stripslashes($_POST['geodir_sidebar_right_open_replace']);

+	$theme_settings['geodir_sidebar_right_open_id'] = $_POST['geodir_sidebar_right_open_id'];

+	$theme_settings['geodir_sidebar_right_open_class'] = $_POST['geodir_sidebar_right_open_class'];

+	$theme_settings['geodir_sidebar_right_open_replace'] = stripslashes($_POST['geodir_sidebar_right_open_replace']);

 

-    $theme_settings['geodir_sidebar_right_close_replace'] = stripslashes($_POST['geodir_sidebar_right_close_replace']);

+	$theme_settings['geodir_sidebar_right_close_replace'] = stripslashes($_POST['geodir_sidebar_right_close_replace']);

 

-    $theme_settings['geodir_sidebar_left_open_id'] = $_POST['geodir_sidebar_left_open_id'];

-    $theme_settings['geodir_sidebar_left_open_class'] = $_POST['geodir_sidebar_left_open_class'];

-    $theme_settings['geodir_sidebar_left_open_replace'] = stripslashes($_POST['geodir_sidebar_left_open_replace']);

+	$theme_settings['geodir_sidebar_left_open_id'] = $_POST['geodir_sidebar_left_open_id'];

+	$theme_settings['geodir_sidebar_left_open_class'] = $_POST['geodir_sidebar_left_open_class'];

+	$theme_settings['geodir_sidebar_left_open_replace'] = stripslashes($_POST['geodir_sidebar_left_open_replace']);

 

-    $theme_settings['geodir_sidebar_left_close_replace'] = stripslashes($_POST['geodir_sidebar_left_close_replace']);

+	$theme_settings['geodir_sidebar_left_close_replace'] = stripslashes($_POST['geodir_sidebar_left_close_replace']);

 

-    $theme_settings['geodir_main_content_open_id'] = $_POST['geodir_main_content_open_id'];

-    $theme_settings['geodir_main_content_open_class'] = $_POST['geodir_main_content_open_class'];

-    $theme_settings['geodir_main_content_open_replace'] = stripslashes($_POST['geodir_main_content_open_replace']);

+	$theme_settings['geodir_main_content_open_id'] = $_POST['geodir_main_content_open_id'];

+	$theme_settings['geodir_main_content_open_class'] = $_POST['geodir_main_content_open_class'];

+	$theme_settings['geodir_main_content_open_replace'] = stripslashes($_POST['geodir_main_content_open_replace']);

 

-    $theme_settings['geodir_main_content_close_replace'] = stripslashes($_POST['geodir_main_content_close_replace']);

+	$theme_settings['geodir_main_content_close_replace'] = stripslashes($_POST['geodir_main_content_close_replace']);

 

 // Other Actions

-    $theme_settings['geodir_top_content_add'] = stripslashes($_POST['geodir_top_content_add']);

-    $theme_settings['geodir_before_main_content_add'] = stripslashes($_POST['geodir_before_main_content_add']);

+	$theme_settings['geodir_top_content_add'] = stripslashes($_POST['geodir_top_content_add']);

+	$theme_settings['geodir_before_main_content_add'] = stripslashes($_POST['geodir_before_main_content_add']);

 

 // Filters

-    $theme_settings['geodir_full_page_class_filter'] = stripslashes($_POST['geodir_full_page_class_filter']);

-    $theme_settings['geodir_before_widget_filter'] = stripslashes($_POST['geodir_before_widget_filter']);

-    $theme_settings['geodir_after_widget_filter'] = stripslashes($_POST['geodir_after_widget_filter']);

-    $theme_settings['geodir_before_title_filter'] = stripslashes($_POST['geodir_before_title_filter']);

-    $theme_settings['geodir_after_title_filter'] = stripslashes($_POST['geodir_after_title_filter']);

-    $theme_settings['geodir_menu_li_class_filter'] = stripslashes($_POST['geodir_menu_li_class_filter']);

-    $theme_settings['geodir_sub_menu_ul_class_filter'] = stripslashes($_POST['geodir_sub_menu_ul_class_filter']);

-    $theme_settings['geodir_sub_menu_li_class_filter'] = stripslashes($_POST['geodir_sub_menu_li_class_filter']);

-    $theme_settings['geodir_menu_a_class_filter'] = stripslashes($_POST['geodir_menu_a_class_filter']);

-    $theme_settings['geodir_sub_menu_a_class_filter'] = stripslashes($_POST['geodir_sub_menu_a_class_filter']);

+	$theme_settings['geodir_full_page_class_filter'] = stripslashes($_POST['geodir_full_page_class_filter']);

+	$theme_settings['geodir_before_widget_filter'] = stripslashes($_POST['geodir_before_widget_filter']);

+	$theme_settings['geodir_after_widget_filter'] = stripslashes($_POST['geodir_after_widget_filter']);

+	$theme_settings['geodir_before_title_filter'] = stripslashes($_POST['geodir_before_title_filter']);

+	$theme_settings['geodir_after_title_filter'] = stripslashes($_POST['geodir_after_title_filter']);

+	$theme_settings['geodir_menu_li_class_filter'] = stripslashes($_POST['geodir_menu_li_class_filter']);

+	$theme_settings['geodir_sub_menu_ul_class_filter'] = stripslashes($_POST['geodir_sub_menu_ul_class_filter']);

+	$theme_settings['geodir_sub_menu_li_class_filter'] = stripslashes($_POST['geodir_sub_menu_li_class_filter']);

+	$theme_settings['geodir_menu_a_class_filter'] = stripslashes($_POST['geodir_menu_a_class_filter']);

+	$theme_settings['geodir_sub_menu_a_class_filter'] = stripslashes($_POST['geodir_sub_menu_a_class_filter']);

 //location manager filters

-    $theme_settings['geodir_location_switcher_menu_li_class_filter'] = stripslashes($_POST['geodir_location_switcher_menu_li_class_filter']);

-    $theme_settings['geodir_location_switcher_menu_a_class_filter'] = stripslashes($_POST['geodir_location_switcher_menu_a_class_filter']);

-    $theme_settings['geodir_location_switcher_menu_sub_ul_class_filter'] = stripslashes($_POST['geodir_location_switcher_menu_sub_ul_class_filter']);

-    $theme_settings['geodir_location_switcher_menu_sub_li_class_filter'] = stripslashes($_POST['geodir_location_switcher_menu_sub_li_class_filter']);

+	$theme_settings['geodir_location_switcher_menu_li_class_filter'] = stripslashes($_POST['geodir_location_switcher_menu_li_class_filter']);

+	$theme_settings['geodir_location_switcher_menu_a_class_filter'] = stripslashes($_POST['geodir_location_switcher_menu_a_class_filter']);

+	$theme_settings['geodir_location_switcher_menu_sub_ul_class_filter'] = stripslashes($_POST['geodir_location_switcher_menu_sub_ul_class_filter']);

+	$theme_settings['geodir_location_switcher_menu_sub_li_class_filter'] = stripslashes($_POST['geodir_location_switcher_menu_sub_li_class_filter']);

 

 

 // theme required css

-    $theme_settings['geodir_theme_compat_css'] = stripslashes($_POST['geodir_theme_compat_css']);

+	$theme_settings['geodir_theme_compat_css'] = stripslashes($_POST['geodir_theme_compat_css']);

 

 // theme required js

-    $theme_settings['geodir_theme_compat_js'] = stripslashes($_POST['geodir_theme_compat_js']);

+	$theme_settings['geodir_theme_compat_js'] = stripslashes($_POST['geodir_theme_compat_js']);

 

 // theme compat name

-    $theme_settings['gd_theme_compat'] = $_POST['gd_theme_compat'];

-    if ($theme_settings['gd_theme_compat'] == '') {

-        update_option('gd_theme_compat', '');

-        update_option('theme_compatibility_setting', '');

-        return;

-    }

+	$theme_settings['gd_theme_compat'] = $_POST['gd_theme_compat'];

+	if ($theme_settings['gd_theme_compat'] == '') {

+		update_option('gd_theme_compat', '');

+		update_option('theme_compatibility_setting', '');

+		return;

+	}

 

 // theme default options

-    $theme_settings['geodir_theme_compat_default_options'] = '';

+	$theme_settings['geodir_theme_compat_default_options'] = '';

 

 

 //supported theme code

-    $theme_settings['geodir_theme_compat_code'] = false;

-

-    $theme = wp_get_theme();

-

-    if ($theme->parent()) {

-        $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));

-    } else {

-        $theme_name = str_replace(" ", "_", $theme->get('Name'));

-    }

-

-    if (in_array($theme_name, array('Avada', 'Enfold', 'X', 'Divi', 'Genesis', 'Jupiter', 'Multi_News'))) {// list of themes that have php files

-        $theme_settings['geodir_theme_compat_code'] = $theme_name;

-    }

-

-

-    $theme_name = $theme_name . "_custom";

-    $theme_arr = get_option('gd_theme_compats');

-    update_option('gd_theme_compat', $theme_name);

-    /**

-     * Called before the theme compatibility settings are saved to the DB.

-     *

-     * @since 1.4.0

-     * @param array $theme_settings {

-     *    Attributes of the theme compatibility settings array.

-     *

-     *    @type string $geodir_wrapper_open_id Geodir wrapper open html id.

-     *    @type string $geodir_wrapper_open_class Geodir wrapper open html class.

-     *    @type string $geodir_wrapper_open_replace Geodir wrapper open content replace.

-     *    @type string $geodir_wrapper_close_replace Geodir wrapper close content replace.

-     *    @type string $geodir_wrapper_content_open_id Geodir wrapper content open html id.

-     *    @type string $geodir_wrapper_content_open_class Geodir wrapper content open html class.

-     *    @type string $geodir_wrapper_content_open_replace Geodir wrapper content open content replace.

-     *    @type string $geodir_wrapper_content_close_replace Geodir wrapper content close content replace.

-     *    @type string $geodir_article_open_id Geodir article open html id.

-     *    @type string $geodir_article_open_class Geodir article open html class.

-     *    @type string $geodir_article_open_replace Geodir article open content replace.

-     *    @type string $geodir_article_close_replace Geodir article close content replace.

-     *    @type string $geodir_sidebar_right_open_id Geodir sidebar right open html id.

-     *    @type string $geodir_sidebar_right_open_class Geodir sidebar right open html class.

-     *    @type string $geodir_sidebar_right_open_replace Geodir sidebar right open content replace.

-     *    @type string $geodir_sidebar_right_close_replace Geodir sidebar right close content replace.

-     *    @type string $geodir_sidebar_left_open_id Geodir sidebar left open html id.

-     *    @type string $geodir_sidebar_left_open_class Geodir sidebar left open html class.

-     *    @type string $geodir_sidebar_left_open_replace Geodir sidebar left open content replace.

-     *    @type string $geodir_sidebar_left_close_replace Geodir sidebar left close content replace.

-     *    @type string $geodir_main_content_open_id Geodir main content open html id.

-     *    @type string $geodir_main_content_open_class Geodir main content open html class.

-     *    @type string $geodir_main_content_open_replace Geodir main content open content replace.

-     *    @type string $geodir_main_content_close_replace Geodir main content close content replace.

-     *    @type string $geodir_top_content_add Geodir top content add.

-     *    @type string $geodir_before_main_content_add Geodir before main content add.

-     *    @type string $geodir_full_page_class_filter Geodir full page class filter.

-     *    @type string $geodir_before_widget_filter Geodir before widget filter.

-     *    @type string $geodir_after_widget_filter Geodir after widget filter.

-     *    @type string $geodir_before_title_filter Geodir before title filter.

-     *    @type string $geodir_after_title_filter Geodir after title filter.

-     *    @type string $geodir_menu_li_class_filter Geodir menu li class filter.

-     *    @type string $geodir_sub_menu_ul_class_filter Geodir sub menu ul class filter.

-     *    @type string $geodir_sub_menu_li_class_filter Geodir sub menu li class filter.

-     *    @type string $geodir_menu_a_class_filter Geodir menu a class filter.

-     *    @type string $geodir_sub_menu_a_class_filter Geodir sub menu a class filter.

-     *    @type string $geodir_location_switcher_menu_li_class_filter Geodir location switcher menu li class filter.

-     *    @type string $geodir_location_switcher_menu_a_class_filter Geodir location switcher menu a class filter.

-     *    @type string $geodir_location_switcher_menu_sub_ul_class_filter Geodir location switcher menu sub ul class filter.

-     *    @type string $geodir_location_switcher_menu_sub_li_class_filter Geodir location switcher menu sub li class filter.

-     *    @type string $geodir_theme_compat_css Geodir theme compatibility css.

-     *    @type string $geodir_theme_compat_js Geodir theme compatibility js.

-     *    @type string $gd_theme_compat Gd theme compatibility.

-     *    @type string $geodir_theme_compat_default_options Geodir theme compatibility default options.

-     *    @type bool $geodir_theme_compat_code Geodir theme compatibility code Ex: 'Avada.

-     *

-     * }

-     */

-    do_action('gd_compat_save_settings', $theme_settings);

+	$theme_settings['geodir_theme_compat_code'] = false;

+

+	$theme = wp_get_theme();

+

+	if ($theme->parent()) {

+		$theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));

+	} else {

+		$theme_name = str_replace(" ", "_", $theme->get('Name'));

+	}

+

+	if (in_array($theme_name, array('Avada', 'Enfold', 'X', 'Divi', 'Genesis', 'Jupiter', 'Multi_News'))) {// list of themes that have php files

+		$theme_settings['geodir_theme_compat_code'] = $theme_name;

+	}

+

+

+	$theme_name = $theme_name . "_custom";

+	$theme_arr = get_option('gd_theme_compats');

+	update_option('gd_theme_compat', $theme_name);

+	/**

+	 * Called before the theme compatibility settings are saved to the DB.

+	 *

+	 * @since 1.4.0

+	 * @param array $theme_settings {

+	 *    Attributes of the theme compatibility settings array.

+	 *

+	 *    @type string $geodir_wrapper_open_id Geodir wrapper open html id.

+	 *    @type string $geodir_wrapper_open_class Geodir wrapper open html class.

+	 *    @type string $geodir_wrapper_open_replace Geodir wrapper open content replace.

+	 *    @type string $geodir_wrapper_close_replace Geodir wrapper close content replace.

+	 *    @type string $geodir_wrapper_content_open_id Geodir wrapper content open html id.

+	 *    @type string $geodir_wrapper_content_open_class Geodir wrapper content open html class.

+	 *    @type string $geodir_wrapper_content_open_replace Geodir wrapper content open content replace.

+	 *    @type string $geodir_wrapper_content_close_replace Geodir wrapper content close content replace.

+	 *    @type string $geodir_article_open_id Geodir article open html id.

+	 *    @type string $geodir_article_open_class Geodir article open html class.

+	 *    @type string $geodir_article_open_replace Geodir article open content replace.

+	 *    @type string $geodir_article_close_replace Geodir article close content replace.

+	 *    @type string $geodir_sidebar_right_open_id Geodir sidebar right open html id.

+	 *    @type string $geodir_sidebar_right_open_class Geodir sidebar right open html class.

+	 *    @type string $geodir_sidebar_right_open_replace Geodir sidebar right open content replace.

+	 *    @type string $geodir_sidebar_right_close_replace Geodir sidebar right close content replace.

+	 *    @type string $geodir_sidebar_left_open_id Geodir sidebar left open html id.

+	 *    @type string $geodir_sidebar_left_open_class Geodir sidebar left open html class.

+	 *    @type string $geodir_sidebar_left_open_replace Geodir sidebar left open content replace.

+	 *    @type string $geodir_sidebar_left_close_replace Geodir sidebar left close content replace.

+	 *    @type string $geodir_main_content_open_id Geodir main content open html id.

+	 *    @type string $geodir_main_content_open_class Geodir main content open html class.

+	 *    @type string $geodir_main_content_open_replace Geodir main content open content replace.

+	 *    @type string $geodir_main_content_close_replace Geodir main content close content replace.

+	 *    @type string $geodir_top_content_add Geodir top content add.

+	 *    @type string $geodir_before_main_content_add Geodir before main content add.

+	 *    @type string $geodir_full_page_class_filter Geodir full page class filter.

+	 *    @type string $geodir_before_widget_filter Geodir before widget filter.

+	 *    @type string $geodir_after_widget_filter Geodir after widget filter.

+	 *    @type string $geodir_before_title_filter Geodir before title filter.

+	 *    @type string $geodir_after_title_filter Geodir after title filter.

+	 *    @type string $geodir_menu_li_class_filter Geodir menu li class filter.

+	 *    @type string $geodir_sub_menu_ul_class_filter Geodir sub menu ul class filter.

+	 *    @type string $geodir_sub_menu_li_class_filter Geodir sub menu li class filter.

+	 *    @type string $geodir_menu_a_class_filter Geodir menu a class filter.

+	 *    @type string $geodir_sub_menu_a_class_filter Geodir sub menu a class filter.

+	 *    @type string $geodir_location_switcher_menu_li_class_filter Geodir location switcher menu li class filter.

+	 *    @type string $geodir_location_switcher_menu_a_class_filter Geodir location switcher menu a class filter.

+	 *    @type string $geodir_location_switcher_menu_sub_ul_class_filter Geodir location switcher menu sub ul class filter.

+	 *    @type string $geodir_location_switcher_menu_sub_li_class_filter Geodir location switcher menu sub li class filter.

+	 *    @type string $geodir_theme_compat_css Geodir theme compatibility css.

+	 *    @type string $geodir_theme_compat_js Geodir theme compatibility js.

+	 *    @type string $gd_theme_compat Gd theme compatibility.

+	 *    @type string $geodir_theme_compat_default_options Geodir theme compatibility default options.

+	 *    @type bool $geodir_theme_compat_code Geodir theme compatibility code Ex: 'Avada.

+	 *

+	 * }

+	 */

+	do_action('gd_compat_save_settings', $theme_settings);

 

 //if($_POST['gd_theme_compat'])==

-    $theme_arr[$theme_name] = $theme_settings;

-    update_option('gd_theme_compats', $theme_arr);

+	$theme_arr[$theme_name] = $theme_settings;

+	update_option('gd_theme_compats', $theme_arr);

 

 

 //print_r($theme_settings);exit;

-    update_option('theme_compatibility_setting', $theme_settings);

+	update_option('theme_compatibility_setting', $theme_settings);

 

 }

 

@@ -766,12 +766,12 @@ 
  */

 function geodir_theme_compatibility_setting_page()

 {

-    global $wpdb;

-    $tc = get_option('theme_compatibility_setting');

-    //print_r($tc);

-    //print_r(wp_get_theme());

+	global $wpdb;

+	$tc = get_option('theme_compatibility_setting');

+	//print_r($tc);

+	//print_r(wp_get_theme());

 

-    ?>

+	?>

     <div class="inner_content_tab_main">

         <div class="gd-content-heading">

 

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

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

                 <?php

-                $theme_arr = get_option('gd_theme_compats');

-                $theme_active = get_option('gd_theme_compat');

-                if (is_array($theme_arr)) {

-                    foreach ($theme_arr as $key => $theme) {

-                        $sel = '';

-                        if ($theme_active == $key) {

-                            $sel = "selected";

-                        }

-                        echo "<option $sel>$key</option>";

-                    }

+				$theme_arr = get_option('gd_theme_compats');

+				$theme_active = get_option('gd_theme_compat');

+				if (is_array($theme_arr)) {

+					foreach ($theme_arr as $key => $theme) {

+						$sel = '';

+						if ($theme_active == $key) {

+							$sel = "selected";

+						}

+						echo "<option $sel>$key</option>";

+					}

 

 

-                }

+				}

 

-                ?>

+				?>

             </select>

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

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

@@ -936,11 +936,11 @@ 
                         <small>geodir_wrapper_open</small>

                     </td>

                     <td><input value="<?php if (isset($tc['geodir_wrapper_open_id'])) {

-                            echo $tc['geodir_wrapper_open_id'];

-                        }?>" type="text" name="geodir_wrapper_open_id" placeholder="geodir-wrapper"/></td>

+							echo $tc['geodir_wrapper_open_id'];

+						}?>" type="text" name="geodir_wrapper_open_id" placeholder="geodir-wrapper"/></td>

                     <td><input value="<?php if (isset($tc['geodir_wrapper_open_class'])) {

-                            echo $tc['geodir_wrapper_open_class'];

-                        }?>" type="text" name="geodir_wrapper_open_class" placeholder=""/></td>

+							echo $tc['geodir_wrapper_open_class'];

+						}?>" type="text" name="geodir_wrapper_open_class" placeholder=""/></td>

                 </tr>

 

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

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

                         <textarea name="geodir_wrapper_open_replace"

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

-                                echo $tc['geodir_wrapper_open_replace'];

-                            }?></textarea>

+								echo $tc['geodir_wrapper_open_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

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

                         <textarea name="geodir_wrapper_close_replace"

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

-                                echo $tc['geodir_wrapper_close_replace'];

-                            }?></textarea>

+								echo $tc['geodir_wrapper_close_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

@@ -980,12 +980,12 @@ 
                         <small>geodir_wrapper_content_open</small>

                     </td>

                     <td><input value="<?php if (isset($tc['geodir_wrapper_content_open_id'])) {

-                            echo $tc['geodir_wrapper_content_open_id'];

-                        }?>" type="text" name="geodir_wrapper_content_open_id" placeholder="geodir-wrapper-content"/>

+							echo $tc['geodir_wrapper_content_open_id'];

+						}?>" type="text" name="geodir_wrapper_content_open_id" placeholder="geodir-wrapper-content"/>

                     </td>

                     <td><input value="<?php if (isset($tc['geodir_wrapper_content_open_class'])) {

-                            echo $tc['geodir_wrapper_content_open_class'];

-                        }?>" type="text" name="geodir_wrapper_content_open_class" placeholder=""/></td>

+							echo $tc['geodir_wrapper_content_open_class'];

+						}?>" type="text" name="geodir_wrapper_content_open_class" placeholder=""/></td>

                 </tr>

 

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

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

                         <textarea name="geodir_wrapper_content_open_replace"

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

-                                echo $tc['geodir_wrapper_content_open_replace'];

-                            }?></textarea>

+								echo $tc['geodir_wrapper_content_open_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

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

                         <textarea name="geodir_wrapper_content_close_replace"

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

-                                echo $tc['geodir_wrapper_content_close_replace'];

-                            }?></textarea>

+								echo $tc['geodir_wrapper_content_close_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

@@ -1024,11 +1024,11 @@ 
                         <small>geodir_article_open</small>

                     </td>

                     <td><input value="<?php if (isset($tc['geodir_article_open_id'])) {

-                            echo $tc['geodir_article_open_id'];

-                        }?>" type="text" name="geodir_article_open_id" placeholder="geodir-wrapper-content"/></td>

+							echo $tc['geodir_article_open_id'];

+						}?>" type="text" name="geodir_article_open_id" placeholder="geodir-wrapper-content"/></td>

                     <td><input value="<?php if (isset($tc['geodir_article_open_class'])) {

-                            echo $tc['geodir_article_open_class'];

-                        }?>" type="text" name="geodir_article_open_class" placeholder=""/></td>

+							echo $tc['geodir_article_open_class'];

+						}?>" type="text" name="geodir_article_open_class" placeholder=""/></td>

                 </tr>

 

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

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

                         <textarea name="geodir_article_open_replace"

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

-                                echo $tc['geodir_article_open_replace'];

-                            }?></textarea>

+								echo $tc['geodir_article_open_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

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

                         <textarea name="geodir_article_close_replace"

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

-                                echo $tc['geodir_article_close_replace'];

-                            }?></textarea>

+								echo $tc['geodir_article_close_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

@@ -1066,11 +1066,11 @@ 
                         <small>geodir_sidebar_right_open</small>

                     </td>

                     <td><input value="<?php if (isset($tc['geodir_sidebar_right_open_id'])) {

-                            echo $tc['geodir_sidebar_right_open_id'];

-                        }?>" type="text" name="geodir_sidebar_right_open_id" placeholder="geodir-sidebar-right"/></td>

+							echo $tc['geodir_sidebar_right_open_id'];

+						}?>" type="text" name="geodir_sidebar_right_open_id" placeholder="geodir-sidebar-right"/></td>

                     <td><input value="<?php if (isset($tc['geodir_sidebar_right_open_class'])) {

-                            echo $tc['geodir_sidebar_right_open_class'];

-                        }?>" type="text" name="geodir_sidebar_right_open_class"

+							echo $tc['geodir_sidebar_right_open_class'];

+						}?>" type="text" name="geodir_sidebar_right_open_class"

                                placeholder="geodir-sidebar-right geodir-listings-sidebar-right"/></td>

                 </tr>

 

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

                         <textarea name="geodir_sidebar_right_open_replace"

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

-                                echo $tc['geodir_sidebar_right_open_replace'];

-                            }?></textarea>

+								echo $tc['geodir_sidebar_right_open_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

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

                         <textarea name="geodir_sidebar_right_close_replace"

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

-                                echo $tc['geodir_sidebar_right_close_replace'];

-                            }?></textarea>

+								echo $tc['geodir_sidebar_right_close_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

@@ -1110,11 +1110,11 @@ 
                         <small>geodir_sidebar_left_open</small>

                     </td>

                     <td><input value="<?php if (isset($tc['geodir_sidebar_left_open_id'])) {

-                            echo $tc['geodir_sidebar_left_open_id'];

-                        }?>" type="text" name="geodir_sidebar_left_open_id" placeholder="geodir-sidebar-left"/></td>

+							echo $tc['geodir_sidebar_left_open_id'];

+						}?>" type="text" name="geodir_sidebar_left_open_id" placeholder="geodir-sidebar-left"/></td>

                     <td><input value="<?php if (isset($tc['geodir_sidebar_left_open_class'])) {

-                            echo $tc['geodir_sidebar_left_open_class'];

-                        }?>" type="text" name="geodir_sidebar_left_open_class"

+							echo $tc['geodir_sidebar_left_open_class'];

+						}?>" type="text" name="geodir_sidebar_left_open_class"

                                placeholder="geodir-sidebar-left geodir-listings-sidebar-left"/></td>

                 </tr>

 

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

                         <textarea name="geodir_sidebar_left_open_replace"

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

-                                echo $tc['geodir_sidebar_left_open_replace'];

-                            }?></textarea>

+								echo $tc['geodir_sidebar_left_open_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

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

                         <textarea name="geodir_sidebar_left_close_replace"

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

-                                echo $tc['geodir_sidebar_left_close_replace'];

-                            }?></textarea>

+								echo $tc['geodir_sidebar_left_close_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

@@ -1153,11 +1153,11 @@ 
                         <small>geodir_main_content_open</small>

                     </td>

                     <td><input value="<?php if (isset($tc['geodir_main_content_open_id'])) {

-                            echo $tc['geodir_main_content_open_id'];

-                        }?>" type="text" name="geodir_main_content_open_id" placeholder="geodir-main-content"/></td>

+							echo $tc['geodir_main_content_open_id'];

+						}?>" type="text" name="geodir_main_content_open_id" placeholder="geodir-main-content"/></td>

                     <td><input value="<?php if (isset($tc['geodir_main_content_open_class'])) {

-                            echo $tc['geodir_main_content_open_class'];

-                        }?>" type="text" name="geodir_main_content_open_class" placeholder="CURRENT-PAGE-page"/></td>

+							echo $tc['geodir_main_content_open_class'];

+						}?>" type="text" name="geodir_main_content_open_class" placeholder="CURRENT-PAGE-page"/></td>

                 </tr>

 

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

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

                         <textarea name="geodir_main_content_open_replace"

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

-                                echo $tc['geodir_main_content_open_replace'];

-                            }?></textarea>

+								echo $tc['geodir_main_content_open_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

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

                         <textarea name="geodir_main_content_close_replace"

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

-                                echo $tc['geodir_main_content_close_replace'];

-                            }?></textarea>

+								echo $tc['geodir_main_content_close_replace'];

+							}?></textarea>

                     </td>

                 </tr>

 

@@ -1210,8 +1210,8 @@ 
                     </td>

                     <td><textarea name="geodir_top_content_add"

                                   placeholder=''><?php if (isset($tc['geodir_top_content_add'])) {

-                                echo $tc['geodir_top_content_add'];

-                            }?></textarea></td>

+								echo $tc['geodir_top_content_add'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1220,8 +1220,8 @@ 
                     </td>

                     <td><textarea name="geodir_before_main_content_add"

                                   placeholder=''><?php if (isset($tc['geodir_before_main_content_add'])) {

-                                echo $tc['geodir_before_main_content_add'];

-                            }?></textarea></td>

+								echo $tc['geodir_before_main_content_add'];

+							}?></textarea></td>

                 </tr>

 

 

@@ -1244,8 +1244,8 @@ 
                     </td>

                     <td><textarea name="geodir_full_page_class_filter"

                                   placeholder='geodir_full_page clearfix'><?php if (isset($tc['geodir_full_page_class_filter'])) {

-                                echo $tc['geodir_full_page_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_full_page_class_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1254,8 +1254,8 @@ 
                     </td>

                     <td><textarea name="geodir_before_widget_filter"

                                   placeholder='<section id="%1$s" class="widget geodir-widget %2$s">'><?php if (isset($tc['geodir_before_widget_filter'])) {

-                                echo $tc['geodir_before_widget_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_before_widget_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1264,8 +1264,8 @@ 
                     </td>

                     <td><textarea name="geodir_after_widget_filter"

                                   placeholder='</section>'><?php if (isset($tc['geodir_after_widget_filter'])) {

-                                echo $tc['geodir_after_widget_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_after_widget_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1274,8 +1274,8 @@ 
                     </td>

                     <td><textarea name="geodir_before_title_filter"

                                   placeholder='<h3 class="widget-title">'><?php if (isset($tc['geodir_before_title_filter'])) {

-                                echo $tc['geodir_before_title_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_before_title_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1284,8 +1284,8 @@ 
                     </td>

                     <td><textarea name="geodir_after_title_filter"

                                   placeholder='</h3>'><?php if (isset($tc['geodir_after_title_filter'])) {

-                                echo $tc['geodir_after_title_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_after_title_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1294,8 +1294,8 @@ 
                     </td>

                     <td><textarea name="geodir_menu_li_class_filter"

                                   placeholder='menu-item'><?php if (isset($tc['geodir_menu_li_class_filter'])) {

-                                echo $tc['geodir_menu_li_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_menu_li_class_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1304,8 +1304,8 @@ 
                     </td>

                     <td><textarea name="geodir_sub_menu_ul_class_filter"

                                   placeholder='sub-menu'><?php if (isset($tc['geodir_sub_menu_ul_class_filter'])) {

-                                echo $tc['geodir_sub_menu_ul_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_sub_menu_ul_class_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1314,8 +1314,8 @@ 
                     </td>

                     <td><textarea name="geodir_sub_menu_li_class_filter"

                                   placeholder='menu-item'><?php if (isset($tc['geodir_sub_menu_li_class_filter'])) {

-                                echo $tc['geodir_sub_menu_li_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_sub_menu_li_class_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1324,8 +1324,8 @@ 
                     </td>

                     <td><textarea name="geodir_menu_a_class_filter"

                                   placeholder=''><?php if (isset($tc['geodir_menu_a_class_filter'])) {

-                                echo $tc['geodir_menu_a_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_menu_a_class_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1334,8 +1334,8 @@ 
                     </td>

                     <td><textarea name="geodir_sub_menu_a_class_filter"

                                   placeholder=''><?php if (isset($tc['geodir_sub_menu_a_class_filter'])) {

-                                echo $tc['geodir_sub_menu_a_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_sub_menu_a_class_filter'];

+							}?></textarea></td>

                 </tr>

 

 

@@ -1345,8 +1345,8 @@ 
                     </td>

                     <td><textarea name="geodir_location_switcher_menu_li_class_filter"

                                   placeholder='menu-item menu-item-type-social menu-item-type-social gd-location-switcher'><?php if (isset($tc['geodir_location_switcher_menu_li_class_filter'])) {

-                                echo $tc['geodir_location_switcher_menu_li_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_location_switcher_menu_li_class_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1355,8 +1355,8 @@ 
                     </td>

                     <td><textarea name="geodir_location_switcher_menu_a_class_filter"

                                   placeholder=''><?php if (isset($tc['geodir_location_switcher_menu_a_class_filter'])) {

-                                echo $tc['geodir_location_switcher_menu_a_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_location_switcher_menu_a_class_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1365,8 +1365,8 @@ 
                     </td>

                     <td><textarea name="geodir_location_switcher_menu_sub_ul_class_filter"

                                   placeholder='sub-menu'><?php if (isset($tc['geodir_location_switcher_menu_sub_ul_class_filter'])) {

-                                echo $tc['geodir_location_switcher_menu_sub_ul_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_location_switcher_menu_sub_ul_class_filter'];

+							}?></textarea></td>

                 </tr>

 

                 <tr>

@@ -1375,21 +1375,21 @@ 
                     </td>

                     <td><textarea name="geodir_location_switcher_menu_sub_li_class_filter"

                                   placeholder='menu-item gd-location-switcher-menu-item'><?php if (isset($tc['geodir_location_switcher_menu_sub_li_class_filter'])) {

-                                echo $tc['geodir_location_switcher_menu_sub_li_class_filter'];

-                            }?></textarea></td>

+								echo $tc['geodir_location_switcher_menu_sub_li_class_filter'];

+							}?></textarea></td>

                 </tr>

 

 

 

                 <?php

-                /**

-                 * Allows more filter setting to be added to theme compatibility settings page.

-                 *

-                 * Called after the last setting in "Other filters" section of theme compatibility settings.

-                 *

-                 * @since 1.4.0

-                 */

-                do_action('gd_compat_other_filters');?>

+				/**

+				 * Allows more filter setting to be added to theme compatibility settings page.

+				 *

+				 * Called after the last setting in "Other filters" section of theme compatibility settings.

+				 *

+				 * @since 1.4.0

+				 */

+				do_action('gd_compat_other_filters');?>

 

                 </tbody>

             </table>

@@ -1402,8 +1402,8 @@ 
                 <tr>

                     <td><textarea name="geodir_theme_compat_css"

                                   placeholder=''><?php if (isset($tc['geodir_theme_compat_css'])) {

-                                echo $tc['geodir_theme_compat_css'];

-                            }?></textarea></td>

+								echo $tc['geodir_theme_compat_css'];

+							}?></textarea></td>

                 </tr>

 

 

@@ -1417,8 +1417,8 @@ 
                 <tr>

                     <td><textarea name="geodir_theme_compat_js"

                                   placeholder=''><?php if (isset($tc['geodir_theme_compat_js'])) {

-                                echo $tc['geodir_theme_compat_js'];

-                            }?></textarea></td>

+								echo $tc['geodir_theme_compat_js'];

+							}?></textarea></td>

                 </tr>

 

 

@@ -1445,23 +1445,23 @@ 
  */

 function geodir_custom_post_type_form()

 {

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

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

 

-    $sub_tab = ($_REQUEST['subtab'] != '') ? $_REQUEST['subtab'] : '';

+	$sub_tab = ($_REQUEST['subtab'] != '') ? $_REQUEST['subtab'] : '';

 

 

-    ?>

+	?>

 

     <div class="gd-content-heading">

         <?php

-        /**

-         * Filter custom fields panel heading.

-         *

-         * @since 1.0.0

-         * @param string $sub_tab Sub tab name.

-         * @param string $listing_type Post type.

-         */

-        ?>

+		/**

+		 * Filter custom fields panel heading.

+		 *

+		 * @since 1.0.0

+		 * @param string $sub_tab Sub tab name.

+		 * @param string $listing_type Post type.

+		 */

+		?>

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

     </div>

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

@@ -1469,25 +1469,25 @@ 
 

             <div class="side-sortables" id="geodir-available-fields">

                 <?php

-                /**

-                 * Filter custom field available fields heading.

-                 *

-                 * @since 1.0.0

-                 * @param string $sub_tab Sub tab name.

-                 * @param string $listing_type Post type.

-                 */

-                ?>

+				/**

+				 * Filter custom field available fields heading.

+				 *

+				 * @since 1.0.0

+				 * @param string $sub_tab Sub tab name.

+				 * @param string $listing_type Post type.

+				 */

+				?>

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

 							</span></h3>

                 <?php

-                /**

-                 * Filter custom field available fields note text.

-                 *

-                 * @since 1.0.0

-                 * @param string $sub_tab Sub tab name.

-                 * @param string $listing_type Post type.

-                 */

-                ?>

+				/**

+				 * Filter custom field available fields note text.

+				 *

+				 * @since 1.0.0

+				 * @param string $sub_tab Sub tab name.

+				 * @param string $listing_type Post type.

+				 */

+				?>

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

 

                 <h3><?php _e('Setup New Field','geodirectory');?></h3>

@@ -1496,13 +1496,13 @@ 
                     <div id="gt-form-builder-tab" class="gt-tabs-panel">

 

                         <?php

-                        /**

-                         * Adds the available fields to the custom fields settings page per post type.

-                         *

-                         * @since 1.0.0

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

-                         */

-                        do_action('geodir_manage_available_fields', $sub_tab); ?>

+						/**

+						 * Adds the available fields to the custom fields settings page per post type.

+						 *

+						 * @since 1.0.0

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

+						 */

+						do_action('geodir_manage_available_fields', $sub_tab); ?>

 

                         <div style="clear:both"></div>

                     </div>

@@ -1515,13 +1515,13 @@ 
                     <div id="gt-form-builder-tab" class="gt-tabs-panel">

 

                         <?php

-                        /**

-                         * Adds the available fields to the custom fields predefined settings page per post type.

-                         *

-                         * @since 1.6.9

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

-                         */

-                        do_action('geodir_manage_available_fields_predefined', $sub_tab); ?>

+						/**

+						 * Adds the available fields to the custom fields predefined settings page per post type.

+						 *

+						 * @since 1.6.9

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

+						 */

+						do_action('geodir_manage_available_fields_predefined', $sub_tab); ?>

 

                         <div style="clear:both"></div>

                     </div>

@@ -1534,13 +1534,13 @@ 
                     <div id="gt-form-builder-tab" class="gt-tabs-panel">

 

                         <?php

-                        /**

-                         * Adds the available fields to the custom fields custom added settings page per post type.

-                         *

-                         * @since 1.6.9

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

-                         */

-                        do_action('geodir_manage_available_fields_custom', $sub_tab); ?>

+						/**

+						 * Adds the available fields to the custom fields custom added settings page per post type.

+						 *

+						 * @since 1.6.9

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

+						 */

+						do_action('geodir_manage_available_fields_custom', $sub_tab); ?>

 

                         <div style="clear:both"></div>

                     </div>

@@ -1554,25 +1554,25 @@ 
             <div class="side-sortables" id="geodir-selected-fields">

                 <h3 class="hndle">

                     <?php

-                    /**

-                     * Filter custom field selected fields heading.

-                     *

-                     * @since 1.0.0

-                     * @param string $sub_tab Sub tab name.

-                     * @param string $listing_type Post type.

-                     */

-                    ?>

+					/**

+					 * Filter custom field selected fields heading.

+					 *

+					 * @since 1.0.0

+					 * @param string $sub_tab Sub tab name.

+					 * @param string $listing_type Post type.

+					 */

+					?>

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

                 </h3>

                 <?php

-                /**

-                 * Filter custom field selected fields note text.

-                 *

-                 * @since 1.0.0

-                 * @param string $sub_tab Sub tab name.

-                 * @param string $listing_type Post type.

-                 */

-                ?>

+				/**

+				 * Filter custom field selected fields note text.

+				 *

+				 * @since 1.0.0

+				 * @param string $sub_tab Sub tab name.

+				 * @param string $listing_type Post type.

+				 */

+				?>

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

 

                 <div class="inside">

@@ -1580,13 +1580,13 @@ 
                     <div id="gt-form-builder-tab" class="gt-tabs-panel">

                         <div class="field_row_main">

                             <?php

-                            /**

-                             * Adds the selected fields and setting to the custom fields settings page per post type.

-                             *

-                             * @since 1.0.0

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

-                             */

-                            do_action('geodir_manage_selected_fields', $sub_tab); ?>

+							/**

+							 * Adds the selected fields and setting to the custom fields settings page per post type.

+							 *

+							 * @since 1.0.0

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

+							 */

+							do_action('geodir_manage_selected_fields', $sub_tab); ?>

                         </div>

                         <div style="clear:both"></div>

                     </div>

@@ -1609,7 +1609,7 @@ 
  */

 function geodir_diagnostic_tools_setting_page()

 {

-    ?>

+	?>

     <div class="inner_content_tab_main">

         <div class="gd-content-heading">

 

@@ -1711,13 +1711,13 @@ 
 					</td>

 				</tr>

                 <?php

-                /**

-                 * Allows you to add more setting to the GD>Tools settings page.

-                 *

-                 * Called after the last setting on the GD>Tools page.

-                 * @since 1.0.0

-                 */

-                do_action('geodir_diagnostic_tool');?>

+				/**

+				 * Allows you to add more setting to the GD>Tools settings page.

+				 *

+				 * Called after the last setting on the GD>Tools page.

+				 * @since 1.0.0

+				 */

+				do_action('geodir_diagnostic_tool');?>

 

                 </tbody>

             </table>

Spacing +112 added lines, -112 removed lines

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

                          */

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

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

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

 

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

                             $label = $args['label'];

@@ -63,12 +63,12 @@ 
 

                                 $subtabs = $args['subtabs'];

 

-                                $query_string = '&subtab=' . $subtabs[0]['subtab'];

+                                $query_string = '&subtab='.$subtabs[0]['subtab'];

 

                             endif;

 

 

-                            $tab_link = admin_url('admin.php?page=geodirectory&tab=' . $name . $query_string);

+                            $tab_link = admin_url('admin.php?page=geodirectory&tab='.$name.$query_string);

 

                             if (isset($args['url']) && $args['url'] != '') {

                                 $tab_link = $args['url'];

@@ -78,7 +78,7 @@ 
                                 $tab_link = geodir_getlink($tab_link, $args['request']);

 

                             if (isset($args['target']) && $args['target'] != '') {

-                                $tab_target = " target='" . sanitize_text_field($args['target']) . "' ";

+                                $tab_target = " target='".sanitize_text_field($args['target'])."' ";

                             } else

                                 $tab_target = '';

 

@@ -93,7 +93,7 @@ 
                              * @see 'geodir_after_settings_tabs'

                              */

                             do_action('geodir_before_settings_tabs', $name);

-                            echo '<li ' . $tab_active . ' ><a href="' . esc_url($tab_link) . '"  ' . $tab_target . ' >' . $label . '</a></li>';

+                            echo '<li '.$tab_active.' ><a href="'.esc_url($tab_link).'"  '.$tab_target.' >'.$label.'</a></li>';

                             /**

                              * Called after the individual settings tabs are output.

                              *

@@ -137,11 +137,11 @@ 
                                         $form_action = isset($sub['form_action']) ? $sub['form_action'] : '';

                                     }

 

-                                    $sub_tabs_link = admin_url() . 'admin.php?page=geodirectory&tab=' . $current_tab . '&subtab=' . $sub['subtab'];

+                                    $sub_tabs_link = admin_url().'admin.php?page=geodirectory&tab='.$current_tab.'&subtab='.$sub['subtab'];

                                     if (isset($sub['request']) && is_array($sub['request']) && !empty($sub['request'])) {

                                         $sub_tabs_link = geodir_getlink($sub_tabs_link, $sub['request']);

                                     }

-                                    echo '<dd ' . $subtab_active . ' id="claim_listing"><a href="' . esc_url($sub_tabs_link) . '" >' . sanitize_text_field($sub['label']) . '</a></dd>';

+                                    echo '<dd '.$subtab_active.' id="claim_listing"><a href="'.esc_url($sub_tabs_link).'" >'.sanitize_text_field($sub['label']).'</a></dd>';

                                 }

                                 ?>

                             </dl>

@@ -151,7 +151,7 @@ 
                             echo "inner_contet_tabs";

                         } ?>">

                             <form method="post" id="mainform"

-                                  class="geodir_optionform <?php echo $current_tab . ' '; ?><?php if (isset($sub['subtab'])) {

+                                  class="geodir_optionform <?php echo $current_tab.' '; ?><?php if (isset($sub['subtab'])) {

                                       echo sanitize_text_field($sub['subtab']);

                                   } ?>" action="<?php echo $form_action; ?>" enctype="multipart/form-data">

                                 <input type="hidden" class="active_tab" name="active_tab"

@@ -159,7 +159,7 @@ 
                                            echo sanitize_text_field($_REQUEST['active_tab']);

                                        } ?>"/>

                                 <?php wp_nonce_field('geodir-settings', '_wpnonce', true, true); ?>

-                                <?php wp_nonce_field('geodir-settings-' . $current_tab, '_wpnonce-' . $current_tab, true, true); ?>

+                                <?php wp_nonce_field('geodir-settings-'.$current_tab, '_wpnonce-'.$current_tab, true, true); ?>

                                 <?php

                                 /**

                                  * Used to call the content of each GD settings tab page.

@@ -189,7 +189,7 @@ 
                      jQuery('#last_tab').val( jQuery(this).attr('href') );

                      return false;*/

                 });

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

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

                 // Countries

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

                     if (jQuery(this).val() == "specific") {

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

                         if (changed) {

                             window.onbeforeunload = function () {

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

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

                             }

                         } else {

                             window.onbeforeunload = '';

@@ -285,14 +285,14 @@ 
 

     //echo $tab_name.'_array.php' ;

     global $geodir_settings, $is_default, $mapzoom;

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

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

         /**

          * Contains settings array for given tab.

          *

          * @since 1.0.0

          * @package GeoDirectory

          */

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

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

     }

 

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

@@ -327,7 +327,7 @@ 
             ?>

 

             <p class="submit">

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

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

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

             </p>

             

@@ -396,7 +396,7 @@ 
 

                     ?>

 

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

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

 

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

 

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

                     } ?>">

 

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

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

 

                     <table class="form-table default_location_form">

                         <tbody>

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

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

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

                             <td class="forminp">

                                 <div class="gtd-formfeild required">

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

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

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

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

                                                echo $location_result->city;

                                            } ?>"/>

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

                         </tr>

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

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

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

                             <td class="forminp">

                                 <div class="gtd-formfeild required">

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

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

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

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

                                                echo $location_result->region;

                                            } ?>"/>

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

                         </tr>

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

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

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

                             <td class="forminp">

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

                                     <?php

@@ -450,7 +450,7 @@ 
                                     ?>

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

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

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

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

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

                                             data-showeverywhere="0">

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

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

                         <tr valign="top" class="single_select_page gd-add-location-map">

                             <th class="titledesc"

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

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

                             <td class="forminp">

                                 <?php

                                 /**

@@ -475,15 +475,15 @@ 
                                  *

                                  * @since 1.0.0

                                  */

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

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

                             </td>

                         </tr>

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

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

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

                             <td class="forminp">

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

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

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

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

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

                                                echo $location_result->city_latitude;

                                            } ?>"/>

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

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

                             <th class="titledesc"

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

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

                             <td class="forminp">

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

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

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

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

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

                                                echo $location_result->city_longitude;

                                            } ?>"/>

@@ -535,7 +535,7 @@ 
                 </div>

             </div>

             <?php break;

-        case $listing_type . '_fields_settings' :

+        case $listing_type.'_fields_settings' :

 

             geodir_custom_post_type_form();

 

@@ -687,7 +687,7 @@ 
     }

 

 

-    $theme_name = $theme_name . "_custom";

+    $theme_name = $theme_name."_custom";

     $theme_arr = get_option('gd_theme_compats');

     update_option('gd_theme_compat', $theme_name);

     /**

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

 

 

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

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

             <style>

                 .gd-theme-compat-table {

                     width: 100%;

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

             <?php }?>

 

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

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

 

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

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

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

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

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

                 <?php

                 $theme_arr = get_option('gd_theme_compats');

                 $theme_active = get_option('gd_theme_compat');

@@ -830,20 +830,20 @@ 
                 ?>

             </select>

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

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

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

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

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

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

 

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

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

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

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

             </div>

             <script>

 

                 function gd_comp_export() {

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

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

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

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

                         return false;

                     }

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

@@ -877,9 +877,9 @@ 
 

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

                         if (response == '0') {

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

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

                         } else {

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

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

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

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

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

@@ -920,14 +920,14 @@ 
 

             </script>

 

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

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

 

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

                 <tbody>

                 <tr>

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

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

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

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

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

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

                 </tr>

 

 

@@ -945,7 +945,7 @@ 
 

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

                     <td colspan="3">

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

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

                         <textarea name="geodir_wrapper_open_replace"

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

                                 echo $tc['geodir_wrapper_open_replace'];

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

                     </td>

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

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

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

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

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

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

                 </tr>

 

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

                     <td colspan="3">

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

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

                         <textarea name="geodir_wrapper_close_replace"

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

                                 echo $tc['geodir_wrapper_close_replace'];

@@ -990,7 +990,7 @@ 
 

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

                     <td colspan="3">

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

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

                         <textarea name="geodir_wrapper_content_open_replace"

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

                                 echo $tc['geodir_wrapper_content_open_replace'];

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

                     </td>

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

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

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

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

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

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

                 </tr>

 

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

                     <td colspan="3">

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

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

                         <textarea name="geodir_wrapper_content_close_replace"

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

                                 echo $tc['geodir_wrapper_content_close_replace'];

@@ -1033,7 +1033,7 @@ 
 

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

                     <td colspan="3">

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

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

                         <textarea name="geodir_article_open_replace"

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

                                 echo $tc['geodir_article_open_replace'];

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

                     </td>

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

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

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

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

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

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

                 </tr>

 

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

                     <td colspan="3">

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

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

                         <textarea name="geodir_article_close_replace"

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

                                 echo $tc['geodir_article_close_replace'];

@@ -1076,7 +1076,7 @@ 
 

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

                     <td colspan="3">

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

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

                         <textarea name="geodir_sidebar_right_open_replace"

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

                                 echo $tc['geodir_sidebar_right_open_replace'];

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

                     </td>

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

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

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

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

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

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

                 </tr>

 

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

                     <td colspan="3">

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

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

                         <textarea name="geodir_sidebar_right_close_replace"

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

                                 echo $tc['geodir_sidebar_right_close_replace'];

@@ -1120,7 +1120,7 @@ 
 

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

                     <td colspan="3">

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

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

                         <textarea name="geodir_sidebar_left_open_replace"

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

                                 echo $tc['geodir_sidebar_left_open_replace'];

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

                     </td>

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

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

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

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

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

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

                 </tr>

 

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

                     <td colspan="3">

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

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

                         <textarea name="geodir_sidebar_left_close_replace"

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

                                 echo $tc['geodir_sidebar_left_close_replace'];

@@ -1162,7 +1162,7 @@ 
 

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

                     <td colspan="3">

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

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

                         <textarea name="geodir_main_content_open_replace"

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

                                 echo $tc['geodir_main_content_open_replace'];

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

                     </td>

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

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

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

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

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

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

                 </tr>

 

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

                     <td colspan="3">

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

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

                         <textarea name="geodir_main_content_close_replace"

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

                                 echo $tc['geodir_main_content_close_replace'];

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

             </table>

 

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

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

 

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

                 <tbody>

                 <tr>

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

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

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

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

                 </tr>

 

 

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

 

 

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

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

 

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

                 <tbody>

                 <tr>

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

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

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

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

                 </tr>

 

                 <tr>

@@ -1389,13 +1389,13 @@ 
                  *

                  * @since 1.4.0

                  */

-                do_action('gd_compat_other_filters');?>

+                do_action('gd_compat_other_filters'); ?>

 

                 </tbody>

             </table>

 

 

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

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

 

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

                 <tbody>

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

             </table>

 

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

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

 

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

                 <tbody>

@@ -1428,7 +1428,7 @@ 
 

             <p class="submit">

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

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

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

             </p>

 

         </div>

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

          */

         ?>

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

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

     </div>

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

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

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

                  */

                 ?>

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

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

 							</span></h3>

                 <?php

                 /**

@@ -1488,9 +1488,9 @@ 
                  * @param string $listing_type Post type.

                  */

                 ?>

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

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

 

-                <h3><?php _e('Setup New Field','geodirectory');?></h3>

+                <h3><?php _e('Setup New Field', 'geodirectory'); ?></h3>

                 <div class="inside">

 

                     <div id="gt-form-builder-tab" class="gt-tabs-panel">

@@ -1509,7 +1509,7 @@ 
 

                 </div>

 

-                <h3><?php _e('Predefined Fields','geodirectory');?></h3>

+                <h3><?php _e('Predefined Fields', 'geodirectory'); ?></h3>

                 <div class="inside">

 

                     <div id="gt-form-builder-tab" class="gt-tabs-panel">

@@ -1528,7 +1528,7 @@ 
 

                 </div>

 

-                <h3><?php _e('Custom Fields','geodirectory');?></h3>

+                <h3><?php _e('Custom Fields', 'geodirectory'); ?></h3>

                 <div class="inside">

 

                     <div id="gt-form-builder-tab" class="gt-tabs-panel">

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

                      */

                     ?>

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

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

                 </h3>

                 <?php

                 /**

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

                  */

                 ?>

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

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

 

                 <div class="inside">

 

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

 

 

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

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

             <style>

                 .gd-tools-table {

                     width: 100%;

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

                 <tbody>

                 <tr>

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

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

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

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

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

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

                 </tr>

 

 

                 <tr>

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

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

                     <td>

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

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

                     </td>

                     <td>

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

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

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

                     </td>

                 </tr>

 

 

                 <tr>

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

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

                     <td>

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

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

                     </td>

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

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

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

                     </td>

                 </tr>

 

                 <tr>

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

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

                     <td>

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

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

                     </td>

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

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

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

                     </td>

                 </tr>

 

                 <tr>

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

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

                     <td>

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

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

                     </td>

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

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

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

                     </td>

                 </tr>

 

                 <tr>

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

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

                     <td>

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

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

                     </td>

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

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

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

                     </td>

                 </tr>

 

 

                 <tr>

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

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

                     <td>

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

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

                     </td>

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

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

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

                     </td>

                 </tr>

 				<tr>

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

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

 					<td>

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

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

 					</td>

 					<td>

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

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

 					</td>

 				</tr>

                 <?php

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

                  * @since 1.0.0

                  */

-                do_action('geodir_diagnostic_tool');?>

+                do_action('geodir_diagnostic_tool'); ?>

 

                 </tbody>

             </table>

tests/test-GeoDirectory.php

Doc Comments +6 added lines

@@ -956,6 +956,9 @@ 
         flush_rewrite_rules( true );
     }
 
+    /**
+     * @param string $widget
+     */
     function the_widget_form( $widget, $instance = array() ) {
         global $wp_widget_factory;
 
@@ -968,6 +971,9 @@ 
         $widget_obj->form($instance);
     }
 
+    /**
+     * @param string $widget
+     */
     function the_widget_form_update( $widget, $new_instance = array(), $old_instance = array() ) {
         global $wp_widget_factory;
 

Braces +6 added lines, -3 removed lines

@@ -167,8 +167,9 @@ 
         $geodir_is_widget_listing = false;
 
         $GLOBALS['post'] = $current_post;
-        if (!empty($current_post))
-            setup_postdata($current_post);
+        if (!empty($current_post)) {
+                    setup_postdata($current_post);
+        }
         $map_jason = $current_map_jason;
         $map_canvas_arr = $current_map_canvas_arr;
 
@@ -916,8 +917,10 @@ 
         elseif ( is_date()		   && $template = get_date_template()		   ) :
         elseif ( is_archive()		&& $template = get_archive_template()		) :
         elseif ( is_paged()		  && $template = get_paged_template()		  ) :
-        else :
+        else {
+        	:
             $template = get_index_template();
+        }
         endif;
         /**
          * Filter the path of the current template before including it.

Spacing +134 added lines, -134 removed lines

@@ -16,15 +16,15 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
         $this->assertTrue(is_int($post_id));
 
-        $this->go_to( get_permalink($post_id) );
+        $this->go_to(get_permalink($post_id));
 
         ob_start();
         geodir_breadcrumb();
@@ -119,7 +119,7 @@ 
 //            'before_title' => '<ul>',
 //            'after_title' => '<ul>'
 //        );
-        include_once geodir_plugin_path() . "/geodirectory-widgets/geodirectory_cpt_categories_widget.php";
+        include_once geodir_plugin_path()."/geodirectory-widgets/geodirectory_cpt_categories_widget.php";
         $params = array(
             'title' => '',
             'post_type' => array(), // NULL for all
@@ -177,7 +177,7 @@ 
     public function testRegTemplate() {
 //        var_dump(geodir_login_page_id());
         wp_set_current_user(0);
-        $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';
+        $template = geodir_plugin_path().'/geodirectory-templates/geodir-signup.php';
 
         ob_start();
         include($template);
@@ -191,7 +191,7 @@ 
         global $information;
         $information = "hello world";
 
-        $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';
+        $template = geodir_plugin_path().'/geodirectory-templates/geodir-information.php';
 
         ob_start();
         include($template);
@@ -209,9 +209,9 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -220,7 +220,7 @@ 
         $_REQUEST['listing_type'] = 'gd_place';
         $_REQUEST['pid'] = $post_id;
         ob_start();
-        $this->go_to( get_permalink(geodir_success_page_id()) );
+        $this->go_to(get_permalink(geodir_success_page_id()));
         $this->load_template();
         $output = ob_get_contents();
         ob_end_clean();
@@ -236,9 +236,9 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -270,7 +270,7 @@ 
         );
 
         ob_start();
-        $this->go_to( get_permalink(geodir_preview_page_id()) );
+        $this->go_to(get_permalink(geodir_preview_page_id()));
         $this->load_template();
         $output = ob_get_contents();
         ob_end_clean();
@@ -281,7 +281,7 @@ 
         wp_set_current_user(1);
 
         ob_start();
-        $this->go_to( get_permalink(geodir_add_listing_page_id()) );
+        $this->go_to(get_permalink(geodir_add_listing_page_id()));
         $this->load_template();
         $output = ob_get_contents();
         ob_end_clean();
@@ -292,7 +292,7 @@ 
         wp_set_current_user(1);
 
         ob_start();
-        $this->go_to( get_permalink(geodir_location_page_id()) );
+        $this->go_to(get_permalink(geodir_location_page_id()));
         $this->load_template();
         $output = ob_get_contents();
         ob_end_clean();
@@ -307,15 +307,15 @@ 
 
         $this->setPermalinkStructure();
 
-        $homepage = get_page_by_title( 'GD Home page' );
-        if ( $homepage )
+        $homepage = get_page_by_title('GD Home page');
+        if ($homepage)
         {
-            update_option( 'page_on_front', $homepage->ID );
-            update_option( 'show_on_front', 'page' );
+            update_option('page_on_front', $homepage->ID);
+            update_option('show_on_front', 'page');
         }
 
         ob_start();
-        $this->go_to( home_url('/') );
+        $this->go_to(home_url('/'));
         $this->load_template();
         $output = ob_get_contents();
         ob_end_clean();
@@ -323,7 +323,7 @@ 
 
 
         ob_start();
-        $this->go_to( home_url('/?post_type=gd_place') );
+        $this->go_to(home_url('/?post_type=gd_place'));
         $this->load_template();
         $output = ob_get_contents();
         ob_end_clean();
@@ -335,9 +335,9 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -346,7 +346,7 @@ 
         global $preview;
         $preview = false;
         ob_start();
-        $this->go_to( get_permalink($post_id) );
+        $this->go_to(get_permalink($post_id));
         $this->load_template();
         $output = ob_get_contents();
         ob_end_clean();
@@ -355,7 +355,7 @@ 
         ob_start();
         $_REQUEST['stype'] = 'gd_place';
         $_REQUEST['geodir_dashbord'] = true;
-        $this->go_to( get_author_posts_url($user_id) );
+        $this->go_to(get_author_posts_url($user_id));
         $this->load_template();
         $output = ob_get_contents();
         ob_end_clean();
@@ -367,7 +367,7 @@ 
         ob_start();
         $_REQUEST['geodir_search'] = "1";
         $_REQUEST['stype'] = 'gd_place';
-        $this->go_to( home_url('/?geodir_search=1&stype=gd_place&s=test&snear=&sgeo_lat=&sgeo_lon=') );
+        $this->go_to(home_url('/?geodir_search=1&stype=gd_place&s=test&snear=&sgeo_lat=&sgeo_lon='));
         $this->load_template();
         $output = ob_get_contents();
         ob_end_clean();
@@ -383,9 +383,9 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -413,9 +413,9 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -436,23 +436,23 @@ 
         $menuname = 'Primary Menu';
         $menulocation = 'primary';
         // Does the menu exist already?
-        $menu_exists = wp_get_nav_menu_object( $menuname );
+        $menu_exists = wp_get_nav_menu_object($menuname);
 
         // If it doesn't exist, let's create it.
-        if( !$menu_exists){
+        if (!$menu_exists) {
             $menu_id = wp_create_nav_menu($menuname);
 
             // Set up default BuddyPress links and add them to the menu.
             wp_update_nav_menu_item($menu_id, 0, array(
                 'menu-item-title' =>  __('Home'),
                 'menu-item-classes' => 'home',
-                'menu-item-url' => home_url( '/' ),
+                'menu-item-url' => home_url('/'),
                 'menu-item-status' => 'publish'));
 
-            if( !has_nav_menu( $menulocation ) ){
+            if (!has_nav_menu($menulocation)) {
                 $locations = get_theme_mod('nav_menu_locations');
                 $locations[$menulocation] = $menu_id;
-                set_theme_mod( 'nav_menu_locations', $locations );
+                set_theme_mod('nav_menu_locations', $locations);
             }
 
             update_option('geodir_theme_location_nav', array('primary'));
@@ -469,20 +469,20 @@ 
     }
 
     public function testBestOfWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_bestof_widget.php';
+        $template = geodir_plugin_path().'/geodirectory-widgets/geodirectory_bestof_widget.php';
         include_once($template);
 
         ob_start();
         $instance = array();
         $instance['use_viewing_post_type'] = '1';
         $instance['excerpt_type'] = 'show-reviews';
-        the_widget( 'geodir_bestof_widget' );
+        the_widget('geodir_bestof_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('bestof-widget-tab-layout', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_bestof_widget' );
+        $this->the_widget_form('geodir_bestof_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Number of categories', $output);
@@ -498,7 +498,7 @@ 
             'excerpt_type' => 'show-desc',
             'use_viewing_post_type' => '1'
         );
-        $output = $this->the_widget_form_update( 'geodir_bestof_widget', $new_instance );
+        $output = $this->the_widget_form_update('geodir_bestof_widget', $new_instance);
         $this->assertContains('20', $output['character_count']);
 
         ob_start();
@@ -510,17 +510,17 @@ 
     }
 
     public function testCptCatsWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_cpt_categories_widget.php';
+        $template = geodir_plugin_path().'/geodirectory-widgets/geodirectory_cpt_categories_widget.php';
         include_once($template);
 
         ob_start();
-        the_widget( 'geodir_cpt_categories_widget' );
+        the_widget('geodir_cpt_categories_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir_cpt_categories_widget', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_cpt_categories_widget' );
+        $this->the_widget_form('geodir_cpt_categories_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Select CPT', $output);
@@ -536,13 +536,13 @@ 
             'max_count' => 'all',
             'max_level' => '1'
         );
-        $output = $this->the_widget_form_update( 'geodir_cpt_categories_widget', $new_instance );
+        $output = $this->the_widget_form_update('geodir_cpt_categories_widget', $new_instance);
         $this->assertContains('count', $output['sort_by']);
 
     }
 
     public function testFeaturesWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_features_widget.php';
+        $template = geodir_plugin_path().'/geodirectory-widgets/geodirectory_features_widget.php';
         include_once($template);
 
         $instance = array(
@@ -554,13 +554,13 @@ 
         );
 
         ob_start();
-        the_widget( 'Geodir_Features_Widget', $instance);
+        the_widget('Geodir_Features_Widget', $instance);
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('widget_gd_features', $output);
 
         ob_start();
-        $this->the_widget_form( 'Geodir_Features_Widget', $instance );
+        $this->the_widget_form('Geodir_Features_Widget', $instance);
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Font Awesome Icon Color', $output);
@@ -572,23 +572,23 @@ 
             'image1' => 'fa-recycle',
             'desc1' => 'cool',
         );
-        $output = $this->the_widget_form_update( 'Geodir_Features_Widget', $new_instance );
+        $output = $this->the_widget_form_update('Geodir_Features_Widget', $new_instance);
         $this->assertContains('Features', $output['title']);
 
     }
 
     public function testSliderWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_listing_slider_widget.php';
+        $template = geodir_plugin_path().'/geodirectory-widgets/geodirectory_listing_slider_widget.php';
         include_once($template);
 
         ob_start();
-        the_widget( 'geodir_listing_slider_widget' );
+        the_widget('geodir_listing_slider_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir_listing_slider_view', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_listing_slider_widget' );
+        $this->the_widget_form('geodir_listing_slider_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Slide Show Speed', $output);
@@ -610,23 +610,23 @@ 
             'list_sort' => 'latest',
             'show_featured_only' => '',
         );
-        $output = $this->the_widget_form_update( 'geodir_listing_slider_widget', $new_instance );
+        $output = $this->the_widget_form_update('geodir_listing_slider_widget', $new_instance);
         $this->assertContains('latest', $output['list_sort']);
 
     }
 
     public function testPopularWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_popular_widget.php';
+        $template = geodir_plugin_path().'/geodirectory-widgets/geodirectory_popular_widget.php';
         include_once($template);
 
         ob_start();
-        the_widget( 'geodir_popular_post_category' );
+        the_widget('geodir_popular_post_category');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir_popular_post_category', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_popular_post_category' );
+        $this->the_widget_form('geodir_popular_post_category');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Default post type to use', $output);
@@ -636,19 +636,19 @@ 
             'category_limit' => 15,
             'default_post_type' => ''
         );
-        $output = $this->the_widget_form_update( 'geodir_popular_post_category', $new_instance );
+        $output = $this->the_widget_form_update('geodir_popular_post_category', $new_instance);
         $this->assertEquals(15, $output['category_limit']);
 
         ob_start();
         $instance = array();
         $instance['category_title'] = '';
-        the_widget( 'geodir_popular_postview', $instance );
+        the_widget('geodir_popular_postview', $instance);
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir_popular_post_view', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_popular_postview' );
+        $this->the_widget_form('geodir_popular_postview');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Post Category', $output);
@@ -671,7 +671,7 @@ 
             'with_videos_only' => '',
             'use_viewing_post_type' => ''
         );
-        $output = $this->the_widget_form_update( 'geodir_popular_postview', $new_instance );
+        $output = $this->the_widget_form_update('geodir_popular_postview', $new_instance);
         $this->assertContains('gridview_onehalf', $output['layout']);
 
     }
@@ -683,9 +683,9 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             global $post;
             $post_id = get_the_ID();
             $post = geodir_get_post_info($post->ID);
@@ -693,17 +693,17 @@ 
 //            $term_list = wp_get_post_terms($post->ID, 'gd_placecategory');
 //            $post->gd_placecategory = (string) $term_list[0]->term_id;
 
-            $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_related_listing_widget.php';
+            $template = geodir_plugin_path().'/geodirectory-widgets/geodirectory_related_listing_widget.php';
             include_once($template);
 
             ob_start();
-            the_widget( 'geodir_related_listing_postview' );
+            the_widget('geodir_related_listing_postview');
             $output = ob_get_contents();
             ob_end_clean();
             $this->assertContains('Related Listing', $output);
 
             ob_start();
-            $this->the_widget_form( 'geodir_related_listing_postview' );
+            $this->the_widget_form('geodir_related_listing_postview');
             $output = ob_get_contents();
             ob_end_clean();
             $this->assertContains('Relate to', $output);
@@ -719,7 +719,7 @@ 
                 'add_location_filter' => '1',
                 'character_count' => '20'
             );
-            $output = $this->the_widget_form_update( 'geodir_related_listing_postview', $new_instance );
+            $output = $this->the_widget_form_update('geodir_related_listing_postview', $new_instance);
             $this->assertContains('gridview_onehalf', $output['layout']);
         endwhile;
 
@@ -775,17 +775,17 @@ 
 
         $this->assertTrue(is_int($comment_id));
 
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_reviews_widget.php';
+        $template = geodir_plugin_path().'/geodirectory-widgets/geodirectory_reviews_widget.php';
         include_once($template);
 
         ob_start();
-        the_widget( 'geodir_recent_reviews_widget' );
+        the_widget('geodir_recent_reviews_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir_recent_reviews', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_recent_reviews_widget' );
+        $this->the_widget_form('geodir_recent_reviews_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Number of Reviews', $output);
@@ -798,25 +798,25 @@ 
             'img1' => '',
             'count' => ''
         );
-        $output = $this->the_widget_form_update( 'geodir_recent_reviews_widget', $new_instance );
+        $output = $this->the_widget_form_update('geodir_recent_reviews_widget', $new_instance);
         $this->assertTrue(empty($output['count']));
     }
 
     public function testHomeMapWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/home_map_widget.php';
+        $template = geodir_plugin_path().'/geodirectory-widgets/home_map_widget.php';
         include_once($template);
 
         ob_start();
         $instance = array();
         $args = array();
         $args["widget_id"] = "geodir_map_v3_home_map-2";
-        the_widget( 'geodir_homepage_map', $instance, $args );
+        the_widget('geodir_homepage_map', $instance, $args);
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir-map-home-page', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_homepage_map' );
+        $this->the_widget_form('geodir_homepage_map');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Map Zoom level', $output);
@@ -830,7 +830,7 @@ 
             'child_collapse' => '0',
             'scrollwheel' => '0'
         );
-        $output = $this->the_widget_form_update( 'geodir_homepage_map', $new_instance );
+        $output = $this->the_widget_form_update('geodir_homepage_map', $new_instance);
         $this->assertContains('0', $output['scrollwheel']);
 
     }
@@ -840,13 +840,13 @@ 
         register_geodir_widgets();
 
         ob_start();
-        the_widget( 'geodir_loginwidget' );
+        the_widget('geodir_loginwidget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir_loginbox', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_loginwidget' );
+        $this->the_widget_form('geodir_loginwidget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Widget Title', $output);
@@ -859,7 +859,7 @@ 
             'img1' => '',
             'desc1' => ''
         );
-        $output = $this->the_widget_form_update( 'geodir_loginwidget', $new_instance );
+        $output = $this->the_widget_form_update('geodir_loginwidget', $new_instance);
         $this->assertContains('Login', $output['title']);
 
     }
@@ -867,13 +867,13 @@ 
     public function testSocialWidget() {
 
         ob_start();
-        the_widget( 'geodir_social_like_widget' );
+        the_widget('geodir_social_like_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('twitter.com', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_social_like_widget' );
+        $this->the_widget_form('geodir_social_like_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('No settings for this widget', $output);
@@ -881,7 +881,7 @@ 
         $new_instance = array(
             'title' => 'Social',
         );
-        $output = $this->the_widget_form_update( 'geodir_social_like_widget', $new_instance );
+        $output = $this->the_widget_form_update('geodir_social_like_widget', $new_instance);
         $this->assertContains('Social', $output['title']);
 
     }
@@ -889,13 +889,13 @@ 
     public function testSubscribeWidget() {
 
         ob_start();
-        the_widget( 'geodirsubscribeWidget' );
+        the_widget('geodirsubscribeWidget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir-subscribe-form', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodirsubscribeWidget' );
+        $this->the_widget_form('geodirsubscribeWidget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Feedburner ID', $output);
@@ -910,7 +910,7 @@ 
             'digg' => '',
             'myspace' => ''
         );
-        $output = $this->the_widget_form_update( 'geodirsubscribeWidget', $new_instance );
+        $output = $this->the_widget_form_update('geodirsubscribeWidget', $new_instance);
         $this->assertContains('Subscribe', $output['title']);
 
     }
@@ -920,13 +920,13 @@ 
         ob_start();
         $instance = array();
         $instance['desc1'] = 'hello';
-        the_widget( 'geodiradvtwidget', $instance );
+        the_widget('geodiradvtwidget', $instance);
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('hello', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodiradvtwidget' );
+        $this->the_widget_form('geodiradvtwidget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Your Advt code', $output);
@@ -934,7 +934,7 @@ 
         $new_instance = array(
             'desc1' => 'Advertise'
         );
-        $output = $this->the_widget_form_update( 'geodiradvtwidget', $new_instance );
+        $output = $this->the_widget_form_update('geodiradvtwidget', $new_instance);
         $this->assertContains('Advertise', $output['desc1']);
 
     }
@@ -942,13 +942,13 @@ 
     public function testFlickrWidget() {
 
         ob_start();
-        the_widget( 'GeodirFlickrWidget' );
+        the_widget('GeodirFlickrWidget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir-flickr', $output);
 
         ob_start();
-        $this->the_widget_form( 'GeodirFlickrWidget' );
+        $this->the_widget_form('GeodirFlickrWidget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Flickr ID', $output);
@@ -957,7 +957,7 @@ 
             'id' => '',
             'number' => '34'
         );
-        $output = $this->the_widget_form_update( 'GeodirFlickrWidget', $new_instance );
+        $output = $this->the_widget_form_update('GeodirFlickrWidget', $new_instance);
         $this->assertContains('34', $output['number']);
 
     }
@@ -967,13 +967,13 @@ 
         ob_start();
         $instance = array();
         $instance['gd_tw_desc1'] = 'hello';
-        the_widget( 'geodir_twitter', $instance );
+        the_widget('geodir_twitter', $instance);
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('hello', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_twitter' );
+        $this->the_widget_form('geodir_twitter');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Your twitter code', $output);
@@ -981,7 +981,7 @@ 
         $new_instance = array(
             'gd_tw_desc1' => 'hello'
         );
-        $output = $this->the_widget_form_update( 'geodir_twitter', $new_instance );
+        $output = $this->the_widget_form_update('geodir_twitter', $new_instance);
         $this->assertContains('hello', $output['gd_tw_desc1']);
 
     }
@@ -989,13 +989,13 @@ 
     public function testAdvSearchWidget() {
 
         ob_start();
-        the_widget( 'geodir_advance_search_widget' );
+        the_widget('geodir_advance_search_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir-loc-bar', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_advance_search_widget' );
+        $this->the_widget_form('geodir_advance_search_widget');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('This is a search widget', $output);
@@ -1009,17 +1009,17 @@ 
 
     public function testListingMapWidget() {
 
-        $template = geodir_plugin_path() . '/geodirectory-widgets/listing_map_widget.php';
+        $template = geodir_plugin_path().'/geodirectory-widgets/listing_map_widget.php';
         include_once($template);
 
         //listing page
-        $this->go_to( home_url('/?post_type=gd_place') );
+        $this->go_to(home_url('/?post_type=gd_place'));
 
         ob_start();
         $instance = array();
         $args = array();
         $args["widget_id"] = "geodir_map_v3_listing_map-2";
-        the_widget( 'geodir_map_listingpage', $instance, $args );
+        the_widget('geodir_map_listingpage', $instance, $args);
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir-map-listing-page', $output);
@@ -1031,27 +1031,27 @@ 
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
         $this->assertTrue(is_int($post_id));
 
-        $this->go_to( get_permalink($post_id) );
+        $this->go_to(get_permalink($post_id));
 
         ob_start();
         $instance = array();
         $args = array();
         $args["widget_id"] = "geodir_map_v3_listing_map-2";
-        the_widget( 'geodir_map_listingpage', $instance, $args );
+        the_widget('geodir_map_listingpage', $instance, $args);
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('geodir-map-listing-page', $output);
 
         ob_start();
-        $this->the_widget_form( 'geodir_map_listingpage' );
+        $this->the_widget_form('geodir_map_listingpage');
         $output = ob_get_contents();
         ob_end_clean();
         $this->assertContains('Select Map View', $output);
@@ -1066,31 +1066,31 @@ 
             'scrollwheel' => '0',
             'showall' => '0'
         );
-        $output = $this->the_widget_form_update( 'geodir_map_listingpage', $new_instance );
+        $output = $this->the_widget_form_update('geodir_map_listingpage', $new_instance);
         $this->assertContains('0', $output['scrollwheel']);
 
 
     }
 
     private function load_template() {
-        do_action( 'template_redirect' );
+        do_action('template_redirect');
         $template = false;
-        if	 ( is_404()			&& $template = get_404_template()			) :
-        elseif ( is_search()		 && $template = get_search_template()		 ) :
-        elseif ( is_front_page()	 && $template = get_front_page_template()	 ) :
-        elseif ( is_home()		   && $template = get_home_template()		   ) :
-        elseif ( is_post_type_archive() && $template = get_post_type_archive_template() ) :
-        elseif ( is_tax()			&& $template = get_taxonomy_template()	   ) :
-        elseif ( is_attachment()	 && $template = get_attachment_template()	 ) :
+        if (is_404() && $template = get_404_template()) :
+        elseif (is_search() && $template = get_search_template()) :
+        elseif (is_front_page() && $template = get_front_page_template()) :
+        elseif (is_home() && $template = get_home_template()) :
+        elseif (is_post_type_archive() && $template = get_post_type_archive_template()) :
+        elseif (is_tax() && $template = get_taxonomy_template()) :
+        elseif (is_attachment() && $template = get_attachment_template()) :
             remove_filter('the_content', 'prepend_attachment');
-        elseif ( is_single()		 && $template = get_single_template()		 ) :
-        elseif ( is_page()		   && $template = get_page_template()		   ) :
-        elseif ( is_category()	   && $template = get_category_template()	   ) :
-        elseif ( is_tag()			&& $template = get_tag_template()			) :
-        elseif ( is_author()		 && $template = get_author_template()		 ) :
-        elseif ( is_date()		   && $template = get_date_template()		   ) :
-        elseif ( is_archive()		&& $template = get_archive_template()		) :
-        elseif ( is_paged()		  && $template = get_paged_template()		  ) :
+        elseif (is_single() && $template = get_single_template()) :
+        elseif (is_page() && $template = get_page_template()) :
+        elseif (is_category() && $template = get_category_template()) :
+        elseif (is_tag() && $template = get_tag_template()) :
+        elseif (is_author() && $template = get_author_template()) :
+        elseif (is_date() && $template = get_date_template()) :
+        elseif (is_archive() && $template = get_archive_template()) :
+        elseif (is_paged() && $template = get_paged_template()) :
         else :
             $template = get_index_template();
         endif;
@@ -1101,21 +1101,21 @@ 
          *
          * @param string $template The path of the template to include.
          */
-        if ( $template = apply_filters( 'template_include', $template ) ) {
-            $template_contents = file_get_contents( $template );
+        if ($template = apply_filters('template_include', $template)) {
+            $template_contents = file_get_contents($template);
             $included_header = $included_footer = false;
-            if ( false !== stripos( $template_contents, 'get_header();' ) ) {
-                do_action( 'get_header', null );
-                locate_template( 'header.php', true, false );
+            if (false !== stripos($template_contents, 'get_header();')) {
+                do_action('get_header', null);
+                locate_template('header.php', true, false);
                 $included_header = true;
             }
-            include( $template );
-            if ( false !== stripos( $template_contents, 'get_footer();' ) ) {
-                do_action( 'get_footer', null );
-                locate_template( 'footer.php', true, false );
+            include($template);
+            if (false !== stripos($template_contents, 'get_footer();')) {
+                do_action('get_footer', null);
+                locate_template('footer.php', true, false);
                 $included_footer = true;
             }
-            if ( $included_header && $included_footer ) {
+            if ($included_header && $included_footer) {
                 global $wp_scripts;
                 $wp_scripts->done = array();
             }
@@ -1123,19 +1123,19 @@ 
         return;
     }
 
-    public static function setPermalinkStructure( $struc = '/%postname%/' ) {
+    public static function setPermalinkStructure($struc = '/%postname%/') {
         global $wp_rewrite;
-        $wp_rewrite->set_permalink_structure( $struc );
+        $wp_rewrite->set_permalink_structure($struc);
         $wp_rewrite->flush_rules();
-        update_option( 'permalink_structure', $struc );
-        flush_rewrite_rules( true );
+        update_option('permalink_structure', $struc);
+        flush_rewrite_rules(true);
     }
 
-    function the_widget_form( $widget, $instance = array() ) {
+    function the_widget_form($widget, $instance = array()) {
         global $wp_widget_factory;
 
         $widget_obj = $wp_widget_factory->widgets[$widget];
-        if ( ! ( $widget_obj instanceof WP_Widget ) ) {
+        if (!($widget_obj instanceof WP_Widget)) {
             return;
         }
 
@@ -1143,11 +1143,11 @@ 
         $widget_obj->form($instance);
     }
 
-    function the_widget_form_update( $widget, $new_instance = array(), $old_instance = array() ) {
+    function the_widget_form_update($widget, $new_instance = array(), $old_instance = array()) {
         global $wp_widget_factory;
 
         $widget_obj = $wp_widget_factory->widgets[$widget];
-        if ( ! ( $widget_obj instanceof WP_Widget ) ) {
+        if (!($widget_obj instanceof WP_Widget)) {
             return;
         }
 

Indentation +1142 added lines, -1142 removed lines

@@ -1,1164 +1,1164 @@
 <?php
 class GeoDirectoryTests extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        wp_set_current_user(1);
-
-        geodir_register_sidebar();
-    }
-
-    public function testBreadcrumbs() {
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $this->go_to( get_permalink($post_id) );
-
-        ob_start();
-        geodir_breadcrumb();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Places', $output);
-    }
-
-    public function testAdminSettingForms() {
-        $_REQUEST['listing_type'] = 'gd_place';
-        ob_start();
-        geodir_admin_option_form('general_settings');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('General Options', $output);
-
-        ob_start();
-        geodir_admin_option_form('design_settings');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Home Top Section Settings', $output);
-
-        ob_start();
-        geodir_admin_option_form('permalink_settings');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Listing Detail Permalink Settings', $output);
-
-        ob_start();
-        geodir_admin_option_form('title_meta_settings');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Homepage Meta Settings', $output);
-
-        ob_start();
-        geodir_admin_option_form('notifications_settings');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Notification Options', $output);
-
-        ob_start();
-        geodir_admin_option_form('default_location_settings');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Set Default Location', $output);
-
-        ob_start();
-        geodir_admin_option_form('tools_settings');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('GD Diagnostic Tools', $output);
-
-        ob_start();
-        geodir_admin_option_form('compatibility_settings');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Theme Compatibility Settings', $output);
-
-        ob_start();
-        geodir_admin_option_form('import_export');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('GD Import & Export CSV', $output);
-
-        $_REQUEST['subtab'] = 'custom_fields';
-        ob_start();
-        geodir_admin_option_form('gd_place_fields_settings');
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('general-form-builder-frame', $output);
-
-    }
-
-    public function testPopPostWidget() {
-        $args = array(
-            'before_widget' => '<ul>',
-            'after_widget' => '<ul>',
-            'before_title' => '<ul>',
-            'after_title' => '<ul>'
-        );
-        ob_start();
-        geodir_popular_post_category_output($args);
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Popular Categories', $output);
-    }
-
-    public function texstBestOfWidget() {
+	public function setUp()
+	{
+		parent::setUp();
+		wp_set_current_user(1);
+
+		geodir_register_sidebar();
+	}
+
+	public function testBreadcrumbs() {
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$this->go_to( get_permalink($post_id) );
+
+		ob_start();
+		geodir_breadcrumb();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Places', $output);
+	}
+
+	public function testAdminSettingForms() {
+		$_REQUEST['listing_type'] = 'gd_place';
+		ob_start();
+		geodir_admin_option_form('general_settings');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('General Options', $output);
+
+		ob_start();
+		geodir_admin_option_form('design_settings');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Home Top Section Settings', $output);
+
+		ob_start();
+		geodir_admin_option_form('permalink_settings');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Listing Detail Permalink Settings', $output);
+
+		ob_start();
+		geodir_admin_option_form('title_meta_settings');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Homepage Meta Settings', $output);
+
+		ob_start();
+		geodir_admin_option_form('notifications_settings');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Notification Options', $output);
+
+		ob_start();
+		geodir_admin_option_form('default_location_settings');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Set Default Location', $output);
+
+		ob_start();
+		geodir_admin_option_form('tools_settings');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('GD Diagnostic Tools', $output);
+
+		ob_start();
+		geodir_admin_option_form('compatibility_settings');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Theme Compatibility Settings', $output);
+
+		ob_start();
+		geodir_admin_option_form('import_export');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('GD Import & Export CSV', $output);
+
+		$_REQUEST['subtab'] = 'custom_fields';
+		ob_start();
+		geodir_admin_option_form('gd_place_fields_settings');
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('general-form-builder-frame', $output);
+
+	}
+
+	public function testPopPostWidget() {
+		$args = array(
+			'before_widget' => '<ul>',
+			'after_widget' => '<ul>',
+			'before_title' => '<ul>',
+			'after_title' => '<ul>'
+		);
+		ob_start();
+		geodir_popular_post_category_output($args);
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Popular Categories', $output);
+	}
+
+	public function texstBestOfWidget() {
 //        $args = array(
 //            'before_widget' => '<ul>',
 //            'after_widget' => '<ul>',
 //            'before_title' => '<ul>',
 //            'after_title' => '<ul>'
 //        );
-        include_once geodir_plugin_path() . "/geodirectory-widgets/geodirectory_cpt_categories_widget.php";
-        $params = array(
-            'title' => '',
-            'post_type' => array(), // NULL for all
-            'hide_empty' => '',
-            'show_count' => '',
-            'hide_icon' => '',
-            'cpt_left' => '',
-            'sort_by' => 'count',
-            'max_count' => 'all',
-            'max_level' => '1'
-        );
-        ob_start();
-        geodir_cpt_categories_output($params);
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('gd-cptcat-title', $output);
-    }
-
-    public function testGDWidgetListView() {
-        global $gridview_columns_widget, $geodir_is_widget_listing;
-
-        $_REQUEST['sgeo_lat'] = '40.7127837';
-        $_REQUEST['sgeo_lon'] = '-74.00594130000002';
-        $query_args = array(
-            'posts_per_page' => 1,
-            'is_geodir_loop' => true,
-            'gd_location' => false,
-            'post_type' => 'gd_place',
-        );
-        $widget_listings = geodir_get_widget_listings($query_args);
-        $template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
-        global $post, $map_jason, $map_canvas_arr;
-
-        $current_post = $post;
-        $current_map_jason = $map_jason;
-        $current_map_canvas_arr = $map_canvas_arr;
-        $geodir_is_widget_listing = true;
-
-        ob_start();
-        include($template);
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir-entry-content', $output);
-
-        $geodir_is_widget_listing = false;
-
-        $GLOBALS['post'] = $current_post;
-        if (!empty($current_post))
-            setup_postdata($current_post);
-        $map_jason = $current_map_jason;
-        $map_canvas_arr = $current_map_canvas_arr;
-
-    }
-
-    public function testRegTemplate() {
+		include_once geodir_plugin_path() . "/geodirectory-widgets/geodirectory_cpt_categories_widget.php";
+		$params = array(
+			'title' => '',
+			'post_type' => array(), // NULL for all
+			'hide_empty' => '',
+			'show_count' => '',
+			'hide_icon' => '',
+			'cpt_left' => '',
+			'sort_by' => 'count',
+			'max_count' => 'all',
+			'max_level' => '1'
+		);
+		ob_start();
+		geodir_cpt_categories_output($params);
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('gd-cptcat-title', $output);
+	}
+
+	public function testGDWidgetListView() {
+		global $gridview_columns_widget, $geodir_is_widget_listing;
+
+		$_REQUEST['sgeo_lat'] = '40.7127837';
+		$_REQUEST['sgeo_lon'] = '-74.00594130000002';
+		$query_args = array(
+			'posts_per_page' => 1,
+			'is_geodir_loop' => true,
+			'gd_location' => false,
+			'post_type' => 'gd_place',
+		);
+		$widget_listings = geodir_get_widget_listings($query_args);
+		$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
+		global $post, $map_jason, $map_canvas_arr;
+
+		$current_post = $post;
+		$current_map_jason = $map_jason;
+		$current_map_canvas_arr = $map_canvas_arr;
+		$geodir_is_widget_listing = true;
+
+		ob_start();
+		include($template);
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir-entry-content', $output);
+
+		$geodir_is_widget_listing = false;
+
+		$GLOBALS['post'] = $current_post;
+		if (!empty($current_post))
+			setup_postdata($current_post);
+		$map_jason = $current_map_jason;
+		$map_canvas_arr = $current_map_canvas_arr;
+
+	}
+
+	public function testRegTemplate() {
 //        var_dump(geodir_login_page_id());
-        wp_set_current_user(0);
-        $template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';
-
-        ob_start();
-        include($template);
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Sign In', $output);
-    }
-
-    public function testInfoTemplate() {
-        wp_set_current_user(1);
-        global $information;
-        $information = "hello world";
-
-        $template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';
-
-        ob_start();
-        include($template);
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('hello world', $output);
-    }
-
-    public function testSuccessPage() {
-        wp_set_current_user(1);
-
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $_REQUEST['listing_type'] = 'gd_place';
-        $_REQUEST['pid'] = $post_id;
-        ob_start();
-        $this->go_to( get_permalink(geodir_success_page_id()) );
-        $this->load_template();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('View your submitted information', $output);
-    }
-
-    public function testPreviewPage() {
-        wp_set_current_user(1);
-
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $_REQUEST = array(
-            'pid' => $post_id,
-            'listing_type' => 'gd_place',
-            'post_title' => 'Test Listing Title Modified',
-            'post_desc' => 'Test Desc',
-            'post_tags' => 'test1,test2',
-            'post_address' => 'New York City Hall',
-            'post_zip' => '10007',
-            'post_latitude' => '40.7127837',
-            'post_longitude' => '-74.00594130000002',
-            'post_mapview' => 'ROADMAP',
-            'post_mapzoom' => '10',
-            'geodir_timing' => '10.00 am to 6 pm every day',
-            'geodir_contact' => '1234567890',
-            'geodir_email' => 'test@test.com',
-            'geodir_website' => 'http://test.com',
-            'geodir_twitter' => 'http://twitter.com/test',
-            'geodir_facebook' => 'http://facebook.com/test',
-            'geodir_special_offers' => 'Test offer',
-            'preview' => true,
-            'post_category' => array(
-                'gd_placecategory' => ''
-            )
-        );
-
-        ob_start();
-        $this->go_to( get_permalink(geodir_preview_page_id()) );
-        $this->load_template();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('This is a preview of your listing', $output);
-    }
-
-    public function testAddListingPage() {
-        wp_set_current_user(1);
-
-        ob_start();
-        $this->go_to( get_permalink(geodir_add_listing_page_id()) );
-        $this->load_template();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Enter Listing Details', $output);
-    }
-
-    public function testLocationPage() {
-        wp_set_current_user(1);
-
-        ob_start();
-        $this->go_to( get_permalink(geodir_location_page_id()) );
-        $this->load_template();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Location', $output);
-    }
-
-    public function testTemplates() {
-
-        global $current_user;
-
-        $user_id = $current_user->ID;
-
-        $this->setPermalinkStructure();
-
-        $homepage = get_page_by_title( 'GD Home page' );
-        if ( $homepage )
-        {
-            update_option( 'page_on_front', $homepage->ID );
-            update_option( 'show_on_front', 'page' );
-        }
-
-        ob_start();
-        $this->go_to( home_url('/') );
-        $this->load_template();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('body class="home', $output);
-
-
-        ob_start();
-        $this->go_to( home_url('/?post_type=gd_place') );
-        $this->load_template();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('All Places', $output);
-
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        global $preview;
-        $preview = false;
-        ob_start();
-        $this->go_to( get_permalink($post_id) );
-        $this->load_template();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('post_profileTab', $output);
-
-        ob_start();
-        $_REQUEST['stype'] = 'gd_place';
-        $_REQUEST['geodir_dashbord'] = true;
-        $this->go_to( get_author_posts_url($user_id) );
-        $this->load_template();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('gd_list_view', $output);
-
-    }
-
-    public function testSearchPage() {
-        ob_start();
-        $_REQUEST['geodir_search'] = "1";
-        $_REQUEST['stype'] = 'gd_place';
-        $this->go_to( home_url('/?geodir_search=1&stype=gd_place&s=test&snear=&sgeo_lat=&sgeo_lon=') );
-        $this->load_template();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Search Results for', $output);
-
-    }
-
-    public function testPopupSendEnquiryTemplate() {
-
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $_REQUEST['popuptype'] = 'b_send_inquiry';
-        $_REQUEST['post_id'] = $post_id;
-        add_filter('wp_redirect', '__return_false');
-        ob_start();
-        geodir_ajax_handler();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('send_inqury', $output);
-        remove_filter('wp_redirect', '__return_false');
-
-    }
-
-    public function texstPopupSendToFrndTemplate() {
-
-        //include template problem. its already loaded. find a way to fix this
-
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $_REQUEST['popuptype'] = 'b_sendtofriend';
-        $_REQUEST['post_id'] = $post_id;
-        add_filter('wp_redirect', '__return_false');
-        ob_start();
-        geodir_ajax_handler();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('send_inqury', $output);
-        remove_filter('wp_redirect', '__return_false');
-    }
-
-    public function testNavMenus() {
-        $menuname = 'Primary Menu';
-        $menulocation = 'primary';
-        // Does the menu exist already?
-        $menu_exists = wp_get_nav_menu_object( $menuname );
-
-        // If it doesn't exist, let's create it.
-        if( !$menu_exists){
-            $menu_id = wp_create_nav_menu($menuname);
-
-            // Set up default BuddyPress links and add them to the menu.
-            wp_update_nav_menu_item($menu_id, 0, array(
-                'menu-item-title' =>  __('Home'),
-                'menu-item-classes' => 'home',
-                'menu-item-url' => home_url( '/' ),
-                'menu-item-status' => 'publish'));
-
-            if( !has_nav_menu( $menulocation ) ){
-                $locations = get_theme_mod('nav_menu_locations');
-                $locations[$menulocation] = $menu_id;
-                set_theme_mod( 'nav_menu_locations', $locations );
-            }
-
-            update_option('geodir_theme_location_nav', array('primary'));
-
-            $menu = wp_nav_menu(array(
-                'theme_location' => 'primary',
-                'echo' => false,
-            ));
-
-            $this->assertContains('Add Listing', $menu);
-
-
-        }
-    }
-
-    public function testBestOfWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_bestof_widget.php';
-        include_once($template);
-
-        ob_start();
-        $instance = array();
-        $instance['use_viewing_post_type'] = '1';
-        $instance['excerpt_type'] = 'show-reviews';
-        the_widget( 'geodir_bestof_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('bestof-widget-tab-layout', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_bestof_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Number of categories', $output);
-
-        $new_instance = array(
-            'title' => '',
-            'post_type' => '',
-            'post_limit' => '5',
-            'categ_limit' => '3',
-            'character_count' => '20',
-            'add_location_filter' => '1',
-            'tab_layout' => 'bestof-tabs-on-top',
-            'excerpt_type' => 'show-desc',
-            'use_viewing_post_type' => '1'
-        );
-        $output = $this->the_widget_form_update( 'geodir_bestof_widget', $new_instance );
-        $this->assertContains('20', $output['character_count']);
-
-        ob_start();
-        geodir_bestof_js();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('bestof-widget-tab-layout', $output);
-
-    }
-
-    public function testCptCatsWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_cpt_categories_widget.php';
-        include_once($template);
-
-        ob_start();
-        the_widget( 'geodir_cpt_categories_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir_cpt_categories_widget', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_cpt_categories_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Select CPT', $output);
-
-        $new_instance = array(
-            'title' => '',
-            'post_type' => array(), // NULL for all
-            'hide_empty' => '',
-            'show_count' => '',
-            'hide_icon' => '',
-            'cpt_left' => '',
-            'sort_by' => 'count',
-            'max_count' => 'all',
-            'max_level' => '1'
-        );
-        $output = $this->the_widget_form_update( 'geodir_cpt_categories_widget', $new_instance );
-        $this->assertContains('count', $output['sort_by']);
-
-    }
-
-    public function testFeaturesWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_features_widget.php';
-        include_once($template);
-
-        $instance = array(
-            'title' => 'Features',
-            'icon_color' => '',
-            'title1' => 'Hello World',
-            'image1' => 'fa-recycle',
-            'desc1' => 'cool',
-        );
-
-        ob_start();
-        the_widget( 'Geodir_Features_Widget', $instance);
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('widget_gd_features', $output);
-
-        ob_start();
-        $this->the_widget_form( 'Geodir_Features_Widget', $instance );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Font Awesome Icon Color', $output);
-
-        $new_instance = array(
-            'title' => 'Features',
-            'icon_color' => '',
-            'title1' => 'Hello World',
-            'image1' => 'fa-recycle',
-            'desc1' => 'cool',
-        );
-        $output = $this->the_widget_form_update( 'Geodir_Features_Widget', $new_instance );
-        $this->assertContains('Features', $output['title']);
-
-    }
-
-    public function testSliderWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_listing_slider_widget.php';
-        include_once($template);
-
-        ob_start();
-        the_widget( 'geodir_listing_slider_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir_listing_slider_view', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_listing_slider_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Slide Show Speed', $output);
-
-        $new_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' => '',
-        );
-        $output = $this->the_widget_form_update( 'geodir_listing_slider_widget', $new_instance );
-        $this->assertContains('latest', $output['list_sort']);
-
-    }
-
-    public function testPopularWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_popular_widget.php';
-        include_once($template);
-
-        ob_start();
-        the_widget( 'geodir_popular_post_category' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir_popular_post_category', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_popular_post_category' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Default post type to use', $output);
-
-        $new_instance = array(
-            'title' => '',
-            'category_limit' => 15,
-            'default_post_type' => ''
-        );
-        $output = $this->the_widget_form_update( 'geodir_popular_post_category', $new_instance );
-        $this->assertEquals(15, $output['category_limit']);
-
-        ob_start();
-        $instance = array();
-        $instance['category_title'] = '';
-        the_widget( 'geodir_popular_postview', $instance );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir_popular_post_view', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_popular_postview' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Post Category', $output);
-
-        $new_instance = array(
-            'title' => '',
-            'post_type' => '',
-            'category' => array(),
-            'category_title' => '',
-            'list_sort' => '',
-            'list_order' => '',
-            'post_number' => '5',
-            'layout' => 'gridview_onehalf',
-            'listing_width' => '',
-            'add_location_filter' => '1',
-            'character_count' => '20',
-            'show_featured_only' => '',
-            'show_special_only' => '',
-            'with_pics_only' => '',
-            'with_videos_only' => '',
-            'use_viewing_post_type' => ''
-        );
-        $output = $this->the_widget_form_update( 'geodir_popular_postview', $new_instance );
-        $this->assertContains('gridview_onehalf', $output['layout']);
-
-    }
-
-    public function testRelatedWidget() {
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            global $post;
-            $post_id = get_the_ID();
-            $post = geodir_get_post_info($post->ID);
+		wp_set_current_user(0);
+		$template = geodir_plugin_path() . '/geodirectory-templates/geodir-signup.php';
+
+		ob_start();
+		include($template);
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Sign In', $output);
+	}
+
+	public function testInfoTemplate() {
+		wp_set_current_user(1);
+		global $information;
+		$information = "hello world";
+
+		$template = geodir_plugin_path() . '/geodirectory-templates/geodir-information.php';
+
+		ob_start();
+		include($template);
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('hello world', $output);
+	}
+
+	public function testSuccessPage() {
+		wp_set_current_user(1);
+
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$_REQUEST['listing_type'] = 'gd_place';
+		$_REQUEST['pid'] = $post_id;
+		ob_start();
+		$this->go_to( get_permalink(geodir_success_page_id()) );
+		$this->load_template();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('View your submitted information', $output);
+	}
+
+	public function testPreviewPage() {
+		wp_set_current_user(1);
+
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$_REQUEST = array(
+			'pid' => $post_id,
+			'listing_type' => 'gd_place',
+			'post_title' => 'Test Listing Title Modified',
+			'post_desc' => 'Test Desc',
+			'post_tags' => 'test1,test2',
+			'post_address' => 'New York City Hall',
+			'post_zip' => '10007',
+			'post_latitude' => '40.7127837',
+			'post_longitude' => '-74.00594130000002',
+			'post_mapview' => 'ROADMAP',
+			'post_mapzoom' => '10',
+			'geodir_timing' => '10.00 am to 6 pm every day',
+			'geodir_contact' => '1234567890',
+			'geodir_email' => 'test@test.com',
+			'geodir_website' => 'http://test.com',
+			'geodir_twitter' => 'http://twitter.com/test',
+			'geodir_facebook' => 'http://facebook.com/test',
+			'geodir_special_offers' => 'Test offer',
+			'preview' => true,
+			'post_category' => array(
+				'gd_placecategory' => ''
+			)
+		);
+
+		ob_start();
+		$this->go_to( get_permalink(geodir_preview_page_id()) );
+		$this->load_template();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('This is a preview of your listing', $output);
+	}
+
+	public function testAddListingPage() {
+		wp_set_current_user(1);
+
+		ob_start();
+		$this->go_to( get_permalink(geodir_add_listing_page_id()) );
+		$this->load_template();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Enter Listing Details', $output);
+	}
+
+	public function testLocationPage() {
+		wp_set_current_user(1);
+
+		ob_start();
+		$this->go_to( get_permalink(geodir_location_page_id()) );
+		$this->load_template();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Location', $output);
+	}
+
+	public function testTemplates() {
+
+		global $current_user;
+
+		$user_id = $current_user->ID;
+
+		$this->setPermalinkStructure();
+
+		$homepage = get_page_by_title( 'GD Home page' );
+		if ( $homepage )
+		{
+			update_option( 'page_on_front', $homepage->ID );
+			update_option( 'show_on_front', 'page' );
+		}
+
+		ob_start();
+		$this->go_to( home_url('/') );
+		$this->load_template();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('body class="home', $output);
+
+
+		ob_start();
+		$this->go_to( home_url('/?post_type=gd_place') );
+		$this->load_template();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('All Places', $output);
+
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		global $preview;
+		$preview = false;
+		ob_start();
+		$this->go_to( get_permalink($post_id) );
+		$this->load_template();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('post_profileTab', $output);
+
+		ob_start();
+		$_REQUEST['stype'] = 'gd_place';
+		$_REQUEST['geodir_dashbord'] = true;
+		$this->go_to( get_author_posts_url($user_id) );
+		$this->load_template();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('gd_list_view', $output);
+
+	}
+
+	public function testSearchPage() {
+		ob_start();
+		$_REQUEST['geodir_search'] = "1";
+		$_REQUEST['stype'] = 'gd_place';
+		$this->go_to( home_url('/?geodir_search=1&stype=gd_place&s=test&snear=&sgeo_lat=&sgeo_lon=') );
+		$this->load_template();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Search Results for', $output);
+
+	}
+
+	public function testPopupSendEnquiryTemplate() {
+
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$_REQUEST['popuptype'] = 'b_send_inquiry';
+		$_REQUEST['post_id'] = $post_id;
+		add_filter('wp_redirect', '__return_false');
+		ob_start();
+		geodir_ajax_handler();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('send_inqury', $output);
+		remove_filter('wp_redirect', '__return_false');
+
+	}
+
+	public function texstPopupSendToFrndTemplate() {
+
+		//include template problem. its already loaded. find a way to fix this
+
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$_REQUEST['popuptype'] = 'b_sendtofriend';
+		$_REQUEST['post_id'] = $post_id;
+		add_filter('wp_redirect', '__return_false');
+		ob_start();
+		geodir_ajax_handler();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('send_inqury', $output);
+		remove_filter('wp_redirect', '__return_false');
+	}
+
+	public function testNavMenus() {
+		$menuname = 'Primary Menu';
+		$menulocation = 'primary';
+		// Does the menu exist already?
+		$menu_exists = wp_get_nav_menu_object( $menuname );
+
+		// If it doesn't exist, let's create it.
+		if( !$menu_exists){
+			$menu_id = wp_create_nav_menu($menuname);
+
+			// Set up default BuddyPress links and add them to the menu.
+			wp_update_nav_menu_item($menu_id, 0, array(
+				'menu-item-title' =>  __('Home'),
+				'menu-item-classes' => 'home',
+				'menu-item-url' => home_url( '/' ),
+				'menu-item-status' => 'publish'));
+
+			if( !has_nav_menu( $menulocation ) ){
+				$locations = get_theme_mod('nav_menu_locations');
+				$locations[$menulocation] = $menu_id;
+				set_theme_mod( 'nav_menu_locations', $locations );
+			}
+
+			update_option('geodir_theme_location_nav', array('primary'));
+
+			$menu = wp_nav_menu(array(
+				'theme_location' => 'primary',
+				'echo' => false,
+			));
+
+			$this->assertContains('Add Listing', $menu);
+
+
+		}
+	}
+
+	public function testBestOfWidget() {
+		$template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_bestof_widget.php';
+		include_once($template);
+
+		ob_start();
+		$instance = array();
+		$instance['use_viewing_post_type'] = '1';
+		$instance['excerpt_type'] = 'show-reviews';
+		the_widget( 'geodir_bestof_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('bestof-widget-tab-layout', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_bestof_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Number of categories', $output);
+
+		$new_instance = array(
+			'title' => '',
+			'post_type' => '',
+			'post_limit' => '5',
+			'categ_limit' => '3',
+			'character_count' => '20',
+			'add_location_filter' => '1',
+			'tab_layout' => 'bestof-tabs-on-top',
+			'excerpt_type' => 'show-desc',
+			'use_viewing_post_type' => '1'
+		);
+		$output = $this->the_widget_form_update( 'geodir_bestof_widget', $new_instance );
+		$this->assertContains('20', $output['character_count']);
+
+		ob_start();
+		geodir_bestof_js();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('bestof-widget-tab-layout', $output);
+
+	}
+
+	public function testCptCatsWidget() {
+		$template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_cpt_categories_widget.php';
+		include_once($template);
+
+		ob_start();
+		the_widget( 'geodir_cpt_categories_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir_cpt_categories_widget', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_cpt_categories_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Select CPT', $output);
+
+		$new_instance = array(
+			'title' => '',
+			'post_type' => array(), // NULL for all
+			'hide_empty' => '',
+			'show_count' => '',
+			'hide_icon' => '',
+			'cpt_left' => '',
+			'sort_by' => 'count',
+			'max_count' => 'all',
+			'max_level' => '1'
+		);
+		$output = $this->the_widget_form_update( 'geodir_cpt_categories_widget', $new_instance );
+		$this->assertContains('count', $output['sort_by']);
+
+	}
+
+	public function testFeaturesWidget() {
+		$template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_features_widget.php';
+		include_once($template);
+
+		$instance = array(
+			'title' => 'Features',
+			'icon_color' => '',
+			'title1' => 'Hello World',
+			'image1' => 'fa-recycle',
+			'desc1' => 'cool',
+		);
+
+		ob_start();
+		the_widget( 'Geodir_Features_Widget', $instance);
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('widget_gd_features', $output);
+
+		ob_start();
+		$this->the_widget_form( 'Geodir_Features_Widget', $instance );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Font Awesome Icon Color', $output);
+
+		$new_instance = array(
+			'title' => 'Features',
+			'icon_color' => '',
+			'title1' => 'Hello World',
+			'image1' => 'fa-recycle',
+			'desc1' => 'cool',
+		);
+		$output = $this->the_widget_form_update( 'Geodir_Features_Widget', $new_instance );
+		$this->assertContains('Features', $output['title']);
+
+	}
+
+	public function testSliderWidget() {
+		$template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_listing_slider_widget.php';
+		include_once($template);
+
+		ob_start();
+		the_widget( 'geodir_listing_slider_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir_listing_slider_view', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_listing_slider_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Slide Show Speed', $output);
+
+		$new_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' => '',
+		);
+		$output = $this->the_widget_form_update( 'geodir_listing_slider_widget', $new_instance );
+		$this->assertContains('latest', $output['list_sort']);
+
+	}
+
+	public function testPopularWidget() {
+		$template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_popular_widget.php';
+		include_once($template);
+
+		ob_start();
+		the_widget( 'geodir_popular_post_category' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir_popular_post_category', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_popular_post_category' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Default post type to use', $output);
+
+		$new_instance = array(
+			'title' => '',
+			'category_limit' => 15,
+			'default_post_type' => ''
+		);
+		$output = $this->the_widget_form_update( 'geodir_popular_post_category', $new_instance );
+		$this->assertEquals(15, $output['category_limit']);
+
+		ob_start();
+		$instance = array();
+		$instance['category_title'] = '';
+		the_widget( 'geodir_popular_postview', $instance );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir_popular_post_view', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_popular_postview' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Post Category', $output);
+
+		$new_instance = array(
+			'title' => '',
+			'post_type' => '',
+			'category' => array(),
+			'category_title' => '',
+			'list_sort' => '',
+			'list_order' => '',
+			'post_number' => '5',
+			'layout' => 'gridview_onehalf',
+			'listing_width' => '',
+			'add_location_filter' => '1',
+			'character_count' => '20',
+			'show_featured_only' => '',
+			'show_special_only' => '',
+			'with_pics_only' => '',
+			'with_videos_only' => '',
+			'use_viewing_post_type' => ''
+		);
+		$output = $this->the_widget_form_update( 'geodir_popular_postview', $new_instance );
+		$this->assertContains('gridview_onehalf', $output['layout']);
+
+	}
+
+	public function testRelatedWidget() {
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			global $post;
+			$post_id = get_the_ID();
+			$post = geodir_get_post_info($post->ID);
 
 //            $term_list = wp_get_post_terms($post->ID, 'gd_placecategory');
 //            $post->gd_placecategory = (string) $term_list[0]->term_id;
 
-            $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_related_listing_widget.php';
-            include_once($template);
-
-            ob_start();
-            the_widget( 'geodir_related_listing_postview' );
-            $output = ob_get_contents();
-            ob_end_clean();
-            $this->assertContains('Related Listing', $output);
-
-            ob_start();
-            $this->the_widget_form( 'geodir_related_listing_postview' );
-            $output = ob_get_contents();
-            ob_end_clean();
-            $this->assertContains('Relate to', $output);
-
-            $new_instance = array(
-                'title' => '',
-                'list_sort' => '',
-                'list_order' => '',
-                'post_number' => '5',
-                'relate_to' => '',
-                'layout' => 'gridview_onehalf',
-                'listing_width' => '',
-                'add_location_filter' => '1',
-                'character_count' => '20'
-            );
-            $output = $this->the_widget_form_update( 'geodir_related_listing_postview', $new_instance );
-            $this->assertContains('gridview_onehalf', $output['layout']);
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-
-    }
-
-    public function testReviewsWidget() {
-
-        $time = current_time('mysql');
-
-        $args = array(
-            'listing_type' => 'gd_place',
-            'post_title' => 'Test Listing Title',
-            'post_desc' => 'Test Desc',
-            'post_tags' => 'test1,test2',
-            'post_address' => 'New York City Hall',
-            'post_zip' => '10007',
-            'post_latitude' => '40.7127837',
-            'post_longitude' => '-74.00594130000002',
-            'post_mapview' => 'ROADMAP',
-            'post_mapzoom' => '10',
-            'geodir_timing' => '10.00 am to 6 pm every day',
-            'geodir_contact' => '1234567890',
-            'geodir_email' => 'test@test.com',
-            'geodir_website' => 'http://test.com',
-            'geodir_twitter' => 'http://twitter.com/test',
-            'geodir_facebook' => 'http://facebook.com/test',
-            'geodir_special_offers' => 'Test offer'
-        );
-        $post_id = geodir_save_listing($args, true);
-
-        $data = array(
-            'comment_post_ID' => $post_id,
-            'comment_author' => 'admin',
-            'comment_author_email' => 'admin@admin.com',
-            'comment_author_url' => 'http://wpgeodirectory.com',
-            'comment_content' => 'content here',
-            'comment_type' => '',
-            'comment_parent' => 0,
-            'user_id' => 1,
-            'comment_author_IP' => '127.0.0.1',
-            'comment_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)',
-            'comment_date' => $time,
-            'comment_approved' => 1,
-        );
-
-        $comment_id = wp_insert_comment($data);
-
-        $_REQUEST['geodir_overallrating'] = 5.0;
-        geodir_save_rating($comment_id);
-
-        $this->assertTrue(is_int($comment_id));
-
-        $template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_reviews_widget.php';
-        include_once($template);
-
-        ob_start();
-        the_widget( 'geodir_recent_reviews_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir_recent_reviews', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_recent_reviews_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Number of Reviews', $output);
-
-        $new_instance = array(
-            'title' => '',
-            't1' => '',
-            't2' => '',
-            't3' => '',
-            'img1' => '',
-            'count' => ''
-        );
-        $output = $this->the_widget_form_update( 'geodir_recent_reviews_widget', $new_instance );
-        $this->assertTrue(empty($output['count']));
-    }
-
-    public function testHomeMapWidget() {
-        $template = geodir_plugin_path() . '/geodirectory-widgets/home_map_widget.php';
-        include_once($template);
-
-        ob_start();
-        $instance = array();
-        $args = array();
-        $args["widget_id"] = "geodir_map_v3_home_map-2";
-        the_widget( 'geodir_homepage_map', $instance, $args );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir-map-home-page', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_homepage_map' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Map Zoom level', $output);
-
-        $new_instance = array(
-            'width' => '',
-            'heigh' => '',
-            'maptype' => '',
-            'zoom' => '',
-            'autozoom' => '',
-            'child_collapse' => '0',
-            'scrollwheel' => '0'
-        );
-        $output = $this->the_widget_form_update( 'geodir_homepage_map', $new_instance );
-        $this->assertContains('0', $output['scrollwheel']);
-
-    }
-
-    public function testLoginWidget() {
-
-        register_geodir_widgets();
-
-        ob_start();
-        the_widget( 'geodir_loginwidget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir_loginbox', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_loginwidget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Widget Title', $output);
-
-        $new_instance = array(
-            'title' => 'Login',
-            't1' => '',
-            't2' => '',
-            't3' => '',
-            'img1' => '',
-            'desc1' => ''
-        );
-        $output = $this->the_widget_form_update( 'geodir_loginwidget', $new_instance );
-        $this->assertContains('Login', $output['title']);
-
-    }
-
-    public function testSocialWidget() {
-
-        ob_start();
-        the_widget( 'geodir_social_like_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('twitter.com', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_social_like_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('No settings for this widget', $output);
-
-        $new_instance = array(
-            'title' => 'Social',
-        );
-        $output = $this->the_widget_form_update( 'geodir_social_like_widget', $new_instance );
-        $this->assertContains('Social', $output['title']);
-
-    }
-
-    public function testSubscribeWidget() {
-
-        ob_start();
-        the_widget( 'geodirsubscribeWidget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir-subscribe-form', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodirsubscribeWidget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Feedburner ID', $output);
-
-        $new_instance = array(
-            'title' => 'Subscribe',
-            'id' => '',
-            'advt1' => '',
-            'text' => '',
-            'twitter' => '',
-            'facebook' => '',
-            'digg' => '',
-            'myspace' => ''
-        );
-        $output = $this->the_widget_form_update( 'geodirsubscribeWidget', $new_instance );
-        $this->assertContains('Subscribe', $output['title']);
-
-    }
-
-    public function testAdvWidget() {
-
-        ob_start();
-        $instance = array();
-        $instance['desc1'] = 'hello';
-        the_widget( 'geodiradvtwidget', $instance );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('hello', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodiradvtwidget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Your Advt code', $output);
-
-        $new_instance = array(
-            'desc1' => 'Advertise'
-        );
-        $output = $this->the_widget_form_update( 'geodiradvtwidget', $new_instance );
-        $this->assertContains('Advertise', $output['desc1']);
-
-    }
-
-    public function testFlickrWidget() {
-
-        ob_start();
-        the_widget( 'GeodirFlickrWidget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir-flickr', $output);
-
-        ob_start();
-        $this->the_widget_form( 'GeodirFlickrWidget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Flickr ID', $output);
-
-        $new_instance = array(
-            'id' => '',
-            'number' => '34'
-        );
-        $output = $this->the_widget_form_update( 'GeodirFlickrWidget', $new_instance );
-        $this->assertContains('34', $output['number']);
-
-    }
-
-    public function testTwitterWidget() {
-
-        ob_start();
-        $instance = array();
-        $instance['gd_tw_desc1'] = 'hello';
-        the_widget( 'geodir_twitter', $instance );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('hello', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_twitter' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Your twitter code', $output);
-
-        $new_instance = array(
-            'gd_tw_desc1' => 'hello'
-        );
-        $output = $this->the_widget_form_update( 'geodir_twitter', $new_instance );
-        $this->assertContains('hello', $output['gd_tw_desc1']);
-
-    }
-
-    public function testAdvSearchWidget() {
-
-        ob_start();
-        the_widget( 'geodir_advance_search_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir-loc-bar', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_advance_search_widget' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('This is a search widget', $output);
+			$template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_related_listing_widget.php';
+			include_once($template);
+
+			ob_start();
+			the_widget( 'geodir_related_listing_postview' );
+			$output = ob_get_contents();
+			ob_end_clean();
+			$this->assertContains('Related Listing', $output);
+
+			ob_start();
+			$this->the_widget_form( 'geodir_related_listing_postview' );
+			$output = ob_get_contents();
+			ob_end_clean();
+			$this->assertContains('Relate to', $output);
+
+			$new_instance = array(
+				'title' => '',
+				'list_sort' => '',
+				'list_order' => '',
+				'post_number' => '5',
+				'relate_to' => '',
+				'layout' => 'gridview_onehalf',
+				'listing_width' => '',
+				'add_location_filter' => '1',
+				'character_count' => '20'
+			);
+			$output = $this->the_widget_form_update( 'geodir_related_listing_postview', $new_instance );
+			$this->assertContains('gridview_onehalf', $output['layout']);
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+
+	}
+
+	public function testReviewsWidget() {
+
+		$time = current_time('mysql');
+
+		$args = array(
+			'listing_type' => 'gd_place',
+			'post_title' => 'Test Listing Title',
+			'post_desc' => 'Test Desc',
+			'post_tags' => 'test1,test2',
+			'post_address' => 'New York City Hall',
+			'post_zip' => '10007',
+			'post_latitude' => '40.7127837',
+			'post_longitude' => '-74.00594130000002',
+			'post_mapview' => 'ROADMAP',
+			'post_mapzoom' => '10',
+			'geodir_timing' => '10.00 am to 6 pm every day',
+			'geodir_contact' => '1234567890',
+			'geodir_email' => 'test@test.com',
+			'geodir_website' => 'http://test.com',
+			'geodir_twitter' => 'http://twitter.com/test',
+			'geodir_facebook' => 'http://facebook.com/test',
+			'geodir_special_offers' => 'Test offer'
+		);
+		$post_id = geodir_save_listing($args, true);
+
+		$data = array(
+			'comment_post_ID' => $post_id,
+			'comment_author' => 'admin',
+			'comment_author_email' => 'admin@admin.com',
+			'comment_author_url' => 'http://wpgeodirectory.com',
+			'comment_content' => 'content here',
+			'comment_type' => '',
+			'comment_parent' => 0,
+			'user_id' => 1,
+			'comment_author_IP' => '127.0.0.1',
+			'comment_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)',
+			'comment_date' => $time,
+			'comment_approved' => 1,
+		);
+
+		$comment_id = wp_insert_comment($data);
+
+		$_REQUEST['geodir_overallrating'] = 5.0;
+		geodir_save_rating($comment_id);
+
+		$this->assertTrue(is_int($comment_id));
+
+		$template = geodir_plugin_path() . '/geodirectory-widgets/geodirectory_reviews_widget.php';
+		include_once($template);
+
+		ob_start();
+		the_widget( 'geodir_recent_reviews_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir_recent_reviews', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_recent_reviews_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Number of Reviews', $output);
+
+		$new_instance = array(
+			'title' => '',
+			't1' => '',
+			't2' => '',
+			't3' => '',
+			'img1' => '',
+			'count' => ''
+		);
+		$output = $this->the_widget_form_update( 'geodir_recent_reviews_widget', $new_instance );
+		$this->assertTrue(empty($output['count']));
+	}
+
+	public function testHomeMapWidget() {
+		$template = geodir_plugin_path() . '/geodirectory-widgets/home_map_widget.php';
+		include_once($template);
+
+		ob_start();
+		$instance = array();
+		$args = array();
+		$args["widget_id"] = "geodir_map_v3_home_map-2";
+		the_widget( 'geodir_homepage_map', $instance, $args );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir-map-home-page', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_homepage_map' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Map Zoom level', $output);
+
+		$new_instance = array(
+			'width' => '',
+			'heigh' => '',
+			'maptype' => '',
+			'zoom' => '',
+			'autozoom' => '',
+			'child_collapse' => '0',
+			'scrollwheel' => '0'
+		);
+		$output = $this->the_widget_form_update( 'geodir_homepage_map', $new_instance );
+		$this->assertContains('0', $output['scrollwheel']);
+
+	}
+
+	public function testLoginWidget() {
+
+		register_geodir_widgets();
+
+		ob_start();
+		the_widget( 'geodir_loginwidget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir_loginbox', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_loginwidget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Widget Title', $output);
+
+		$new_instance = array(
+			'title' => 'Login',
+			't1' => '',
+			't2' => '',
+			't3' => '',
+			'img1' => '',
+			'desc1' => ''
+		);
+		$output = $this->the_widget_form_update( 'geodir_loginwidget', $new_instance );
+		$this->assertContains('Login', $output['title']);
+
+	}
+
+	public function testSocialWidget() {
+
+		ob_start();
+		the_widget( 'geodir_social_like_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('twitter.com', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_social_like_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('No settings for this widget', $output);
+
+		$new_instance = array(
+			'title' => 'Social',
+		);
+		$output = $this->the_widget_form_update( 'geodir_social_like_widget', $new_instance );
+		$this->assertContains('Social', $output['title']);
+
+	}
+
+	public function testSubscribeWidget() {
+
+		ob_start();
+		the_widget( 'geodirsubscribeWidget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir-subscribe-form', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodirsubscribeWidget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Feedburner ID', $output);
+
+		$new_instance = array(
+			'title' => 'Subscribe',
+			'id' => '',
+			'advt1' => '',
+			'text' => '',
+			'twitter' => '',
+			'facebook' => '',
+			'digg' => '',
+			'myspace' => ''
+		);
+		$output = $this->the_widget_form_update( 'geodirsubscribeWidget', $new_instance );
+		$this->assertContains('Subscribe', $output['title']);
+
+	}
+
+	public function testAdvWidget() {
+
+		ob_start();
+		$instance = array();
+		$instance['desc1'] = 'hello';
+		the_widget( 'geodiradvtwidget', $instance );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('hello', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodiradvtwidget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Your Advt code', $output);
+
+		$new_instance = array(
+			'desc1' => 'Advertise'
+		);
+		$output = $this->the_widget_form_update( 'geodiradvtwidget', $new_instance );
+		$this->assertContains('Advertise', $output['desc1']);
+
+	}
+
+	public function testFlickrWidget() {
+
+		ob_start();
+		the_widget( 'GeodirFlickrWidget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir-flickr', $output);
+
+		ob_start();
+		$this->the_widget_form( 'GeodirFlickrWidget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Flickr ID', $output);
+
+		$new_instance = array(
+			'id' => '',
+			'number' => '34'
+		);
+		$output = $this->the_widget_form_update( 'GeodirFlickrWidget', $new_instance );
+		$this->assertContains('34', $output['number']);
+
+	}
+
+	public function testTwitterWidget() {
+
+		ob_start();
+		$instance = array();
+		$instance['gd_tw_desc1'] = 'hello';
+		the_widget( 'geodir_twitter', $instance );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('hello', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_twitter' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Your twitter code', $output);
+
+		$new_instance = array(
+			'gd_tw_desc1' => 'hello'
+		);
+		$output = $this->the_widget_form_update( 'geodir_twitter', $new_instance );
+		$this->assertContains('hello', $output['gd_tw_desc1']);
+
+	}
+
+	public function testAdvSearchWidget() {
+
+		ob_start();
+		the_widget( 'geodir_advance_search_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir-loc-bar', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_advance_search_widget' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('This is a search widget', $output);
 
 //        $new_instance = array(
 //        );
 //        $output = $this->the_widget_form_update( 'geodir_advance_search_widget', $new_instance );
 //        $this->assertContains('Subscribe', $output['title']);
 
-    }
-
-    public function testListingMapWidget() {
-
-        $template = geodir_plugin_path() . '/geodirectory-widgets/listing_map_widget.php';
-        include_once($template);
-
-        //listing page
-        $this->go_to( home_url('/?post_type=gd_place') );
-
-        ob_start();
-        $instance = array();
-        $args = array();
-        $args["widget_id"] = "geodir_map_v3_listing_map-2";
-        the_widget( 'geodir_map_listingpage', $instance, $args );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir-map-listing-page', $output);
-
-        // detail page
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $this->go_to( get_permalink($post_id) );
-
-        ob_start();
-        $instance = array();
-        $args = array();
-        $args["widget_id"] = "geodir_map_v3_listing_map-2";
-        the_widget( 'geodir_map_listingpage', $instance, $args );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('geodir-map-listing-page', $output);
-
-        ob_start();
-        $this->the_widget_form( 'geodir_map_listingpage' );
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Select Map View', $output);
-
-        $new_instance = array(
-            'width' => '',
-            'heigh' => '',
-            'maptype' => '',
-            'zoom' => '',
-            'autozoom' => '',
-            'sticky' => '',
-            'scrollwheel' => '0',
-            'showall' => '0'
-        );
-        $output = $this->the_widget_form_update( 'geodir_map_listingpage', $new_instance );
-        $this->assertContains('0', $output['scrollwheel']);
-
-
-    }
-
-    private function load_template() {
-        do_action( 'template_redirect' );
-        $template = false;
-        if	 ( is_404()			&& $template = get_404_template()			) :
-        elseif ( is_search()		 && $template = get_search_template()		 ) :
-        elseif ( is_front_page()	 && $template = get_front_page_template()	 ) :
-        elseif ( is_home()		   && $template = get_home_template()		   ) :
-        elseif ( is_post_type_archive() && $template = get_post_type_archive_template() ) :
-        elseif ( is_tax()			&& $template = get_taxonomy_template()	   ) :
-        elseif ( is_attachment()	 && $template = get_attachment_template()	 ) :
-            remove_filter('the_content', 'prepend_attachment');
-        elseif ( is_single()		 && $template = get_single_template()		 ) :
-        elseif ( is_page()		   && $template = get_page_template()		   ) :
-        elseif ( is_category()	   && $template = get_category_template()	   ) :
-        elseif ( is_tag()			&& $template = get_tag_template()			) :
-        elseif ( is_author()		 && $template = get_author_template()		 ) :
-        elseif ( is_date()		   && $template = get_date_template()		   ) :
-        elseif ( is_archive()		&& $template = get_archive_template()		) :
-        elseif ( is_paged()		  && $template = get_paged_template()		  ) :
-        else :
-            $template = get_index_template();
-        endif;
-        /**
-         * Filter the path of the current template before including it.
-         *
-         * @since 3.0.0
-         *
-         * @param string $template The path of the template to include.
-         */
-        if ( $template = apply_filters( 'template_include', $template ) ) {
-            $template_contents = file_get_contents( $template );
-            $included_header = $included_footer = false;
-            if ( false !== stripos( $template_contents, 'get_header();' ) ) {
-                do_action( 'get_header', null );
-                locate_template( 'header.php', true, false );
-                $included_header = true;
-            }
-            include( $template );
-            if ( false !== stripos( $template_contents, 'get_footer();' ) ) {
-                do_action( 'get_footer', null );
-                locate_template( 'footer.php', true, false );
-                $included_footer = true;
-            }
-            if ( $included_header && $included_footer ) {
-                global $wp_scripts;
-                $wp_scripts->done = array();
-            }
-        }
-        return;
-    }
-
-    public static function setPermalinkStructure( $struc = '/%postname%/' ) {
-        global $wp_rewrite;
-        $wp_rewrite->set_permalink_structure( $struc );
-        $wp_rewrite->flush_rules();
-        update_option( 'permalink_structure', $struc );
-        flush_rewrite_rules( true );
-    }
-
-    function the_widget_form( $widget, $instance = array() ) {
-        global $wp_widget_factory;
-
-        $widget_obj = $wp_widget_factory->widgets[$widget];
-        if ( ! ( $widget_obj instanceof WP_Widget ) ) {
-            return;
-        }
-
-        $widget_obj->_set(-1);
-        $widget_obj->form($instance);
-    }
-
-    function the_widget_form_update( $widget, $new_instance = array(), $old_instance = array() ) {
-        global $wp_widget_factory;
-
-        $widget_obj = $wp_widget_factory->widgets[$widget];
-        if ( ! ( $widget_obj instanceof WP_Widget ) ) {
-            return;
-        }
-
-        $widget_obj->_set(-1);
-        return $widget_obj->update($new_instance, $old_instance);
-    }
-
-
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	}
+
+	public function testListingMapWidget() {
+
+		$template = geodir_plugin_path() . '/geodirectory-widgets/listing_map_widget.php';
+		include_once($template);
+
+		//listing page
+		$this->go_to( home_url('/?post_type=gd_place') );
+
+		ob_start();
+		$instance = array();
+		$args = array();
+		$args["widget_id"] = "geodir_map_v3_listing_map-2";
+		the_widget( 'geodir_map_listingpage', $instance, $args );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir-map-listing-page', $output);
+
+		// detail page
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$this->go_to( get_permalink($post_id) );
+
+		ob_start();
+		$instance = array();
+		$args = array();
+		$args["widget_id"] = "geodir_map_v3_listing_map-2";
+		the_widget( 'geodir_map_listingpage', $instance, $args );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('geodir-map-listing-page', $output);
+
+		ob_start();
+		$this->the_widget_form( 'geodir_map_listingpage' );
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Select Map View', $output);
+
+		$new_instance = array(
+			'width' => '',
+			'heigh' => '',
+			'maptype' => '',
+			'zoom' => '',
+			'autozoom' => '',
+			'sticky' => '',
+			'scrollwheel' => '0',
+			'showall' => '0'
+		);
+		$output = $this->the_widget_form_update( 'geodir_map_listingpage', $new_instance );
+		$this->assertContains('0', $output['scrollwheel']);
+
+
+	}
+
+	private function load_template() {
+		do_action( 'template_redirect' );
+		$template = false;
+		if	 ( is_404()			&& $template = get_404_template()			) :
+		elseif ( is_search()		 && $template = get_search_template()		 ) :
+		elseif ( is_front_page()	 && $template = get_front_page_template()	 ) :
+		elseif ( is_home()		   && $template = get_home_template()		   ) :
+		elseif ( is_post_type_archive() && $template = get_post_type_archive_template() ) :
+		elseif ( is_tax()			&& $template = get_taxonomy_template()	   ) :
+		elseif ( is_attachment()	 && $template = get_attachment_template()	 ) :
+			remove_filter('the_content', 'prepend_attachment');
+		elseif ( is_single()		 && $template = get_single_template()		 ) :
+		elseif ( is_page()		   && $template = get_page_template()		   ) :
+		elseif ( is_category()	   && $template = get_category_template()	   ) :
+		elseif ( is_tag()			&& $template = get_tag_template()			) :
+		elseif ( is_author()		 && $template = get_author_template()		 ) :
+		elseif ( is_date()		   && $template = get_date_template()		   ) :
+		elseif ( is_archive()		&& $template = get_archive_template()		) :
+		elseif ( is_paged()		  && $template = get_paged_template()		  ) :
+		else :
+			$template = get_index_template();
+		endif;
+		/**
+		 * Filter the path of the current template before including it.
+		 *
+		 * @since 3.0.0
+		 *
+		 * @param string $template The path of the template to include.
+		 */
+		if ( $template = apply_filters( 'template_include', $template ) ) {
+			$template_contents = file_get_contents( $template );
+			$included_header = $included_footer = false;
+			if ( false !== stripos( $template_contents, 'get_header();' ) ) {
+				do_action( 'get_header', null );
+				locate_template( 'header.php', true, false );
+				$included_header = true;
+			}
+			include( $template );
+			if ( false !== stripos( $template_contents, 'get_footer();' ) ) {
+				do_action( 'get_footer', null );
+				locate_template( 'footer.php', true, false );
+				$included_footer = true;
+			}
+			if ( $included_header && $included_footer ) {
+				global $wp_scripts;
+				$wp_scripts->done = array();
+			}
+		}
+		return;
+	}
+
+	public static function setPermalinkStructure( $struc = '/%postname%/' ) {
+		global $wp_rewrite;
+		$wp_rewrite->set_permalink_structure( $struc );
+		$wp_rewrite->flush_rules();
+		update_option( 'permalink_structure', $struc );
+		flush_rewrite_rules( true );
+	}
+
+	function the_widget_form( $widget, $instance = array() ) {
+		global $wp_widget_factory;
+
+		$widget_obj = $wp_widget_factory->widgets[$widget];
+		if ( ! ( $widget_obj instanceof WP_Widget ) ) {
+			return;
+		}
+
+		$widget_obj->_set(-1);
+		$widget_obj->form($instance);
+	}
+
+	function the_widget_form_update( $widget, $new_instance = array(), $old_instance = array() ) {
+		global $wp_widget_factory;
+
+		$widget_obj = $wp_widget_factory->widgets[$widget];
+		if ( ! ( $widget_obj instanceof WP_Widget ) ) {
+			return;
+		}
+
+		$widget_obj->_set(-1);
+		return $widget_obj->update($new_instance, $old_instance);
+	}
+
+
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

tests/test-Add_Custom_Fields.php

Indentation +280 added lines, -280 removed lines

@@ -1,309 +1,309 @@
 <?php
 class AddCustomFields extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        wp_set_current_user(1);
-    }
+	public function setUp()
+	{
+		parent::setUp();
+		wp_set_current_user(1);
+	}
 
-    public function testAddCustomFields()
-    {
-        $field = array(
-            'listing_type'  => 'gd_place',
-            'data_type'     => '',
-            'field_type'    => 'select',
-            'admin_title'   => __( 'Place Type', 'test' ),
-            'admin_desc'    => __( 'Select the place type.', 'test' ),
-            'site_title'    => __( 'Place Type', 'test' ),
-            'htmlvar_name'  => 'test_place_type',
-            'default_value' => '',
-            'option_values' => 'Hotel,Bar,Restaurant,Pub',
-            'is_default'    => '1',
-            'is_admin'      => '1',
-            'clabels'       => __( 'Place Type', 'test' )
-        );
+	public function testAddCustomFields()
+	{
+		$field = array(
+			'listing_type'  => 'gd_place',
+			'data_type'     => '',
+			'field_type'    => 'select',
+			'admin_title'   => __( 'Place Type', 'test' ),
+			'admin_desc'    => __( 'Select the place type.', 'test' ),
+			'site_title'    => __( 'Place Type', 'test' ),
+			'htmlvar_name'  => 'test_place_type',
+			'default_value' => '',
+			'option_values' => 'Hotel,Bar,Restaurant,Pub',
+			'is_default'    => '1',
+			'is_admin'      => '1',
+			'clabels'       => __( 'Place Type', 'test' )
+		);
 
-        $lastid = geodir_custom_field_save( $field );
+		$lastid = geodir_custom_field_save( $field );
 
-        $this->assertTrue(is_int($lastid));
+		$this->assertTrue(is_int($lastid));
 
 
-        $field2 = array(
-            'listing_type'  => 'gd_place',
-            'data_type'     => 'VARCHAR',
-            'field_type'    => 'url',
-            'admin_title'   => __( 'Website Link', 'test' ),
-            'admin_desc'    => __( 'Enter the website link.', 'test' ),
-            'site_title'    => __( 'Website Link', 'test' ),
-            'htmlvar_name'  => 'test_ws_link',
-            'default_value' => '',
-            'option_values' => '',
-            'is_default'    => '1',
-            'is_admin'      => '1',
-            'clabels'       => __( 'Website Link', 'test' )
-        );
+		$field2 = array(
+			'listing_type'  => 'gd_place',
+			'data_type'     => 'VARCHAR',
+			'field_type'    => 'url',
+			'admin_title'   => __( 'Website Link', 'test' ),
+			'admin_desc'    => __( 'Enter the website link.', 'test' ),
+			'site_title'    => __( 'Website Link', 'test' ),
+			'htmlvar_name'  => 'test_ws_link',
+			'default_value' => '',
+			'option_values' => '',
+			'is_default'    => '1',
+			'is_admin'      => '1',
+			'clabels'       => __( 'Website Link', 'test' )
+		);
 
-        $lastid2 = geodir_custom_field_save( $field2 );
+		$lastid2 = geodir_custom_field_save( $field2 );
 
-        $this->assertTrue(is_int($lastid2));
+		$this->assertTrue(is_int($lastid2));
 
-        //test error
-        $field3 = array(
-            'listing_type'  => 'gd_place',
-            'data_type'     => '',
-            'field_type'    => 'select',
-            'admin_title'   => __( 'Place Type', 'test' ),
-            'admin_desc'    => __( 'Select the place type.', 'test' ),
-            'site_title'    => __( 'Place Type', 'test' ),
-            'htmlvar_name'  => 'test_place_type',
-            'default_value' => '',
-            'option_values' => 'Hotel,Bar,Restaurant,Pub',
-            'is_default'    => '1',
-            'is_admin'      => '1',
-            'clabels'       => __( 'Place Type', 'test' )
-        );
+		//test error
+		$field3 = array(
+			'listing_type'  => 'gd_place',
+			'data_type'     => '',
+			'field_type'    => 'select',
+			'admin_title'   => __( 'Place Type', 'test' ),
+			'admin_desc'    => __( 'Select the place type.', 'test' ),
+			'site_title'    => __( 'Place Type', 'test' ),
+			'htmlvar_name'  => 'test_place_type',
+			'default_value' => '',
+			'option_values' => 'Hotel,Bar,Restaurant,Pub',
+			'is_default'    => '1',
+			'is_admin'      => '1',
+			'clabels'       => __( 'Place Type', 'test' )
+		);
 
-        $error = geodir_custom_field_save( $field3 );
+		$error = geodir_custom_field_save( $field3 );
 
-        $this->assertContains( 'HTML Variable Name should be a unique name', $error );
-    }
+		$this->assertContains( 'HTML Variable Name should be a unique name', $error );
+	}
 
-    public function testAddMoreCustomFields() {
-        $fieldsets  = array();
-        $fields  = array();
-        $filters = array();
+	public function testAddMoreCustomFields() {
+		$fieldsets  = array();
+		$fields  = array();
+		$filters = array();
 
-        // Place Details
-        $fieldsets[] = array(
-            'listing_type'  => 'gd_place',
-            'data_type'     => '',
-            'field_type'    => 'fieldset',
-            'admin_title'   => __( 'Place Details', 'directory_starter' ),
-            'admin_desc'    => __( 'Place Details.', 'directory_starter' ),
-            'site_title'    => __( 'Place Details', 'directory_starter' ),
-            'default_value' => '',
-            'option_values' => '',
-            'is_default'    => '1',
-            'is_admin'      => '1',
-            'clabels'       => __( 'Place Details', 'directory_starter' )
-        );
+		// Place Details
+		$fieldsets[] = array(
+			'listing_type'  => 'gd_place',
+			'data_type'     => '',
+			'field_type'    => 'fieldset',
+			'admin_title'   => __( 'Place Details', 'directory_starter' ),
+			'admin_desc'    => __( 'Place Details.', 'directory_starter' ),
+			'site_title'    => __( 'Place Details', 'directory_starter' ),
+			'default_value' => '',
+			'option_values' => '',
+			'is_default'    => '1',
+			'is_admin'      => '1',
+			'clabels'       => __( 'Place Details', 'directory_starter' )
+		);
 
-        // Salary
-        $fields[] = array(
-            'listing_type' => 'gd_place',
-            'data_type' => 'INT',
-            'field_type' => 'text',
-            'admin_title' => __('Salary', 'directory_starter'),
-            'admin_desc' => __('Enter salary.', 'directory_starter'),
-            'site_title' => __('Salary', 'directory_starter'),
-            'htmlvar_name' => 'job_salary',
-            'default_value' => '',
-            'option_values' => '',
-            'is_default' => '1',
-            'is_admin' => '1',
-            'clabels' => __('Salary', 'directory_starter')
-        );
+		// Salary
+		$fields[] = array(
+			'listing_type' => 'gd_place',
+			'data_type' => 'INT',
+			'field_type' => 'text',
+			'admin_title' => __('Salary', 'directory_starter'),
+			'admin_desc' => __('Enter salary.', 'directory_starter'),
+			'site_title' => __('Salary', 'directory_starter'),
+			'htmlvar_name' => 'job_salary',
+			'default_value' => '',
+			'option_values' => '',
+			'is_default' => '1',
+			'is_admin' => '1',
+			'clabels' => __('Salary', 'directory_starter')
+		);
 
-        // Salary Filter
-        $filters[] = array(
-            'create_field' => 'true',
-            'listing_type' => 'gd_place',
-            'field_id' => '',
-            'field_type' => 'text',
-            'data_type' => 'RANGE',
-            'is_active' => '1',
-            'site_field_title' => 'Salary',
-            'field_data_type' => 'INT',
-            'data_type_change' => 'TEXT',
-            'search_condition_select' => 'FROM',
-            'search_min_value' => '',
-            'search_max_value' => '',
-            'search_diff_value' => '',
-            'first_search_value' => '',
-            'first_search_text' => '',
-            'last_search_text' => '',
-            'search_condition' => 'FROM',
-            'site_htmlvar_name' => 'geodir_job_salary',
-            'field_title' => 'geodir_job_salary',
-            'expand_custom_value' => '',
-            'front_search_title' => 'Salary',
-            'field_desc' => ''
-        );
+		// Salary Filter
+		$filters[] = array(
+			'create_field' => 'true',
+			'listing_type' => 'gd_place',
+			'field_id' => '',
+			'field_type' => 'text',
+			'data_type' => 'RANGE',
+			'is_active' => '1',
+			'site_field_title' => 'Salary',
+			'field_data_type' => 'INT',
+			'data_type_change' => 'TEXT',
+			'search_condition_select' => 'FROM',
+			'search_min_value' => '',
+			'search_max_value' => '',
+			'search_diff_value' => '',
+			'first_search_value' => '',
+			'first_search_text' => '',
+			'last_search_text' => '',
+			'search_condition' => 'FROM',
+			'site_htmlvar_name' => 'geodir_job_salary',
+			'field_title' => 'geodir_job_salary',
+			'expand_custom_value' => '',
+			'front_search_title' => 'Salary',
+			'field_desc' => ''
+		);
 
-        // Field Set
-        if (!empty($fieldsets)) {
-            foreach ($fieldsets as $fieldset_index => $fieldset) {
-                geodir_custom_field_save($fieldset);
-            }
-        }
+		// Field Set
+		if (!empty($fieldsets)) {
+			foreach ($fieldsets as $fieldset_index => $fieldset) {
+				geodir_custom_field_save($fieldset);
+			}
+		}
 
-        // Custom Fields
-        if (!empty($fields)) {
-            foreach ($fields as $field_index => $field) {
-                $lastid = geodir_custom_field_save( $field );
-                $this->assertTrue(is_int($lastid));
-            }
-        }
+		// Custom Fields
+		if (!empty($fields)) {
+			foreach ($fields as $field_index => $field) {
+				$lastid = geodir_custom_field_save( $field );
+				$this->assertTrue(is_int($lastid));
+			}
+		}
 
-    }
+	}
 
-    public function testTextCusField() {
-        $_REQUEST = array (
-            'action' =>  'geodir_ajax_action',
-            'create_field' =>  'true',
-            'field_ins_upd' =>  'submit',
-            '_wpnonce' =>  wp_create_nonce('custom_fields_text_field_99'),
-            'listing_type' =>  'gd_place',
-            'field_type' =>  'text',
-            'field_id' =>  'text_field_99',
-            'data_type' =>  'XVARCHAR',
-            'is_active' =>  '1',
-            'site_title' => "Text Field",
-            'admin_title' => "Text Field",
-            'admin_desc' => "Text Field",
-            'site_field_title' =>  'Category',
-            'field_data_type' =>  'VARCHAR',
-            'search_condition' =>  'SINGLE',
-            'htmlvar_name' =>  'text_field_99',
-            'for_admin_use' => '0',
-            'is_required' => '0',
-            'required_msg'=> '',
-            'validation_pattern' => '',
-            'validation_msg' => '',
-            'decimal_point' => '',
-            'clabels' => 'Text Field',
-            'is_default' => '1',
-            'field_title' =>  'Text Field',
-            'expand_custom_value' =>  '',
-            'search_operator' =>  'AND',
-            'front_search_title' =>  'Category',
-            'field_desc' =>  'Cat',
-            'geodir_ajax' => 'admin_ajax',
-            'manage_field_type' => 'custom_fields',
-            'default_value' =>  '' ,
-            'sort_order' =>  '11' ,
-            'show_on_listing' =>  '1' ,
-            'show_on_detail' =>  '1' ,
-            'show_as_tab' =>  '0' ,
-            'field_icon' =>  '' ,
-            'css_class' =>  '' ,
-        );
-        add_filter('wp_redirect', '__return_false');
-        ob_start();
-        geodir_ajax_handler();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Double Click to toggle', $output);
-        remove_filter('wp_redirect', '__return_false');
+	public function testTextCusField() {
+		$_REQUEST = array (
+			'action' =>  'geodir_ajax_action',
+			'create_field' =>  'true',
+			'field_ins_upd' =>  'submit',
+			'_wpnonce' =>  wp_create_nonce('custom_fields_text_field_99'),
+			'listing_type' =>  'gd_place',
+			'field_type' =>  'text',
+			'field_id' =>  'text_field_99',
+			'data_type' =>  'XVARCHAR',
+			'is_active' =>  '1',
+			'site_title' => "Text Field",
+			'admin_title' => "Text Field",
+			'admin_desc' => "Text Field",
+			'site_field_title' =>  'Category',
+			'field_data_type' =>  'VARCHAR',
+			'search_condition' =>  'SINGLE',
+			'htmlvar_name' =>  'text_field_99',
+			'for_admin_use' => '0',
+			'is_required' => '0',
+			'required_msg'=> '',
+			'validation_pattern' => '',
+			'validation_msg' => '',
+			'decimal_point' => '',
+			'clabels' => 'Text Field',
+			'is_default' => '1',
+			'field_title' =>  'Text Field',
+			'expand_custom_value' =>  '',
+			'search_operator' =>  'AND',
+			'front_search_title' =>  'Category',
+			'field_desc' =>  'Cat',
+			'geodir_ajax' => 'admin_ajax',
+			'manage_field_type' => 'custom_fields',
+			'default_value' =>  '' ,
+			'sort_order' =>  '11' ,
+			'show_on_listing' =>  '1' ,
+			'show_on_detail' =>  '1' ,
+			'show_as_tab' =>  '0' ,
+			'field_icon' =>  '' ,
+			'css_class' =>  '' ,
+		);
+		add_filter('wp_redirect', '__return_false');
+		ob_start();
+		geodir_ajax_handler();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Double Click to toggle', $output);
+		remove_filter('wp_redirect', '__return_false');
 
-    }
+	}
 
-    public function texstDateCusField() {
-        $_REQUEST = array (
-            'action' =>  'geodir_ajax_action',
-            'create_field' =>  'true',
-            'field_ins_upd' =>  'submit',
-            '_wpnonce' =>  wp_create_nonce('custom_fields_date_field'),
-            'listing_type' =>  'gd_place',
-            'field_type' =>  'datepicker',
-            'field_id' =>  'date_field',
-            'data_type' =>  '',
-            'is_active' =>  '1',
-            'site_title' => "Text Field",
-            'admin_title' => "Text Field",
-            'admin_desc' => "Text Field",
-            'site_field_title' =>  'Category',
-            'field_data_type' =>  'VARCHAR',
-            'search_condition' =>  'SINGLE',
-            'htmlvar_name' =>  'date_field',
-            'for_admin_use' => '0',
-            'is_required' => '0',
-            'required_msg'=> '',
-            'validation_pattern' => '',
-            'validation_msg' => '',
-            'decimal_point' => '',
-            'clabels' => 'Text Field',
-            'is_default' => '0',
-            'field_title' =>  'Text Field',
-            'expand_custom_value' =>  '',
-            'search_operator' =>  'AND',
-            'front_search_title' =>  'Category',
-            'field_desc' =>  'Cat',
-            'geodir_ajax' => 'admin_ajax',
-            'manage_field_type' => 'custom_fields',
-            'default_value' =>  '' ,
-            'sort_order' =>  '12' ,
-            'show_on_listing' =>  '1' ,
-            'show_on_detail' =>  '1' ,
-            'show_as_tab' =>  '0' ,
-            'field_icon' =>  '' ,
-            'css_class' =>  '' ,
-            'extra' => array(
-                'date_format' => 'mm/dd/yy'
-            )
-        );
-        add_filter('wp_redirect', '__return_false');
-        ob_start();
-        geodir_ajax_handler();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Double Click to toggle', $output);
-        remove_filter('wp_redirect', '__return_false');
+	public function texstDateCusField() {
+		$_REQUEST = array (
+			'action' =>  'geodir_ajax_action',
+			'create_field' =>  'true',
+			'field_ins_upd' =>  'submit',
+			'_wpnonce' =>  wp_create_nonce('custom_fields_date_field'),
+			'listing_type' =>  'gd_place',
+			'field_type' =>  'datepicker',
+			'field_id' =>  'date_field',
+			'data_type' =>  '',
+			'is_active' =>  '1',
+			'site_title' => "Text Field",
+			'admin_title' => "Text Field",
+			'admin_desc' => "Text Field",
+			'site_field_title' =>  'Category',
+			'field_data_type' =>  'VARCHAR',
+			'search_condition' =>  'SINGLE',
+			'htmlvar_name' =>  'date_field',
+			'for_admin_use' => '0',
+			'is_required' => '0',
+			'required_msg'=> '',
+			'validation_pattern' => '',
+			'validation_msg' => '',
+			'decimal_point' => '',
+			'clabels' => 'Text Field',
+			'is_default' => '0',
+			'field_title' =>  'Text Field',
+			'expand_custom_value' =>  '',
+			'search_operator' =>  'AND',
+			'front_search_title' =>  'Category',
+			'field_desc' =>  'Cat',
+			'geodir_ajax' => 'admin_ajax',
+			'manage_field_type' => 'custom_fields',
+			'default_value' =>  '' ,
+			'sort_order' =>  '12' ,
+			'show_on_listing' =>  '1' ,
+			'show_on_detail' =>  '1' ,
+			'show_as_tab' =>  '0' ,
+			'field_icon' =>  '' ,
+			'css_class' =>  '' ,
+			'extra' => array(
+				'date_format' => 'mm/dd/yy'
+			)
+		);
+		add_filter('wp_redirect', '__return_false');
+		ob_start();
+		geodir_ajax_handler();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Double Click to toggle', $output);
+		remove_filter('wp_redirect', '__return_false');
 
-    }
+	}
 
-    public function texstTextAreaCusField() {
-        $_REQUEST = array (
-            'action' =>  'geodir_ajax_action',
-            'create_field' =>  'true',
-            'field_ins_upd' =>  'submit',
-            '_wpnonce' =>  wp_create_nonce('custom_fields_textarea_field'),
-            'listing_type' =>  'gd_place',
-            'field_type' =>  'textarea',
-            'field_id' =>  'textarea_field',
-            'data_type' =>  '',
-            'is_active' =>  '1',
-            'site_title' => "Text Field",
-            'admin_title' => "Text Field",
-            'admin_desc' => "Text Field",
-            'htmlvar_name' =>  'textarea_field',
-            'for_admin_use' => '0',
-            'is_required' => '0',
-            'required_msg'=> '',
-            'validation_pattern' => '',
-            'validation_msg' => '',
-            'decimal_point' => '',
-            'clabels' => 'Text Field',
-            'is_default' => '1',
-            'field_title' =>  'Text Field',
-            'expand_custom_value' =>  '',
-            'search_operator' =>  'AND',
-            'front_search_title' =>  'Category',
-            'field_desc' =>  'Cat',
-            'geodir_ajax' => 'admin_ajax',
-            'manage_field_type' => 'custom_fields',
-            'default_value' =>  '' ,
-            'sort_order' =>  '12' ,
-            'show_on_listing' =>  '1' ,
-            'show_on_detail' =>  '1' ,
-            'show_as_tab' =>  '0' ,
-            'field_icon' =>  '' ,
-            'css_class' =>  '' ,
-        );
-        add_filter('wp_redirect', '__return_false');
-        ob_start();
-        geodir_ajax_handler();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertContains('Double Click to toggle', $output);
-        remove_filter('wp_redirect', '__return_false');
+	public function texstTextAreaCusField() {
+		$_REQUEST = array (
+			'action' =>  'geodir_ajax_action',
+			'create_field' =>  'true',
+			'field_ins_upd' =>  'submit',
+			'_wpnonce' =>  wp_create_nonce('custom_fields_textarea_field'),
+			'listing_type' =>  'gd_place',
+			'field_type' =>  'textarea',
+			'field_id' =>  'textarea_field',
+			'data_type' =>  '',
+			'is_active' =>  '1',
+			'site_title' => "Text Field",
+			'admin_title' => "Text Field",
+			'admin_desc' => "Text Field",
+			'htmlvar_name' =>  'textarea_field',
+			'for_admin_use' => '0',
+			'is_required' => '0',
+			'required_msg'=> '',
+			'validation_pattern' => '',
+			'validation_msg' => '',
+			'decimal_point' => '',
+			'clabels' => 'Text Field',
+			'is_default' => '1',
+			'field_title' =>  'Text Field',
+			'expand_custom_value' =>  '',
+			'search_operator' =>  'AND',
+			'front_search_title' =>  'Category',
+			'field_desc' =>  'Cat',
+			'geodir_ajax' => 'admin_ajax',
+			'manage_field_type' => 'custom_fields',
+			'default_value' =>  '' ,
+			'sort_order' =>  '12' ,
+			'show_on_listing' =>  '1' ,
+			'show_on_detail' =>  '1' ,
+			'show_as_tab' =>  '0' ,
+			'field_icon' =>  '' ,
+			'css_class' =>  '' ,
+		);
+		add_filter('wp_redirect', '__return_false');
+		ob_start();
+		geodir_ajax_handler();
+		$output = ob_get_contents();
+		ob_end_clean();
+		$this->assertContains('Double Click to toggle', $output);
+		remove_filter('wp_redirect', '__return_false');
 
-    }
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Spacing +46 added lines, -46 removed lines

@@ -13,18 +13,18 @@ 
             'listing_type'  => 'gd_place',
             'data_type'     => '',
             'field_type'    => 'select',
-            'admin_title'   => __( 'Place Type', 'test' ),
-            'admin_desc'    => __( 'Select the place type.', 'test' ),
-            'site_title'    => __( 'Place Type', 'test' ),
+            'admin_title'   => __('Place Type', 'test'),
+            'admin_desc'    => __('Select the place type.', 'test'),
+            'site_title'    => __('Place Type', 'test'),
             'htmlvar_name'  => 'test_place_type',
             'default_value' => '',
             'option_values' => 'Hotel,Bar,Restaurant,Pub',
             'is_default'    => '1',
             'is_admin'      => '1',
-            'clabels'       => __( 'Place Type', 'test' )
+            'clabels'       => __('Place Type', 'test')
         );
 
-        $lastid = geodir_custom_field_save( $field );
+        $lastid = geodir_custom_field_save($field);
 
         $this->assertTrue(is_int($lastid));
 
@@ -33,18 +33,18 @@ 
             'listing_type'  => 'gd_place',
             'data_type'     => 'VARCHAR',
             'field_type'    => 'url',
-            'admin_title'   => __( 'Website Link', 'test' ),
-            'admin_desc'    => __( 'Enter the website link.', 'test' ),
-            'site_title'    => __( 'Website Link', 'test' ),
+            'admin_title'   => __('Website Link', 'test'),
+            'admin_desc'    => __('Enter the website link.', 'test'),
+            'site_title'    => __('Website Link', 'test'),
             'htmlvar_name'  => 'test_ws_link',
             'default_value' => '',
             'option_values' => '',
             'is_default'    => '1',
             'is_admin'      => '1',
-            'clabels'       => __( 'Website Link', 'test' )
+            'clabels'       => __('Website Link', 'test')
         );
 
-        $lastid2 = geodir_custom_field_save( $field2 );
+        $lastid2 = geodir_custom_field_save($field2);
 
         $this->assertTrue(is_int($lastid2));
 
@@ -53,24 +53,24 @@ 
             'listing_type'  => 'gd_place',
             'data_type'     => '',
             'field_type'    => 'select',
-            'admin_title'   => __( 'Place Type', 'test' ),
-            'admin_desc'    => __( 'Select the place type.', 'test' ),
-            'site_title'    => __( 'Place Type', 'test' ),
+            'admin_title'   => __('Place Type', 'test'),
+            'admin_desc'    => __('Select the place type.', 'test'),
+            'site_title'    => __('Place Type', 'test'),
             'htmlvar_name'  => 'test_place_type',
             'default_value' => '',
             'option_values' => 'Hotel,Bar,Restaurant,Pub',
             'is_default'    => '1',
             'is_admin'      => '1',
-            'clabels'       => __( 'Place Type', 'test' )
+            'clabels'       => __('Place Type', 'test')
         );
 
-        $error = geodir_custom_field_save( $field3 );
+        $error = geodir_custom_field_save($field3);
 
-        $this->assertContains( 'HTML Variable Name should be a unique name', $error );
+        $this->assertContains('HTML Variable Name should be a unique name', $error);
     }
 
     public function testAddMoreCustomFields() {
-        $fieldsets  = array();
+        $fieldsets = array();
         $fields  = array();
         $filters = array();
 
@@ -79,14 +79,14 @@ 
             'listing_type'  => 'gd_place',
             'data_type'     => '',
             'field_type'    => 'fieldset',
-            'admin_title'   => __( 'Place Details', 'directory_starter' ),
-            'admin_desc'    => __( 'Place Details.', 'directory_starter' ),
-            'site_title'    => __( 'Place Details', 'directory_starter' ),
+            'admin_title'   => __('Place Details', 'directory_starter'),
+            'admin_desc'    => __('Place Details.', 'directory_starter'),
+            'site_title'    => __('Place Details', 'directory_starter'),
             'default_value' => '',
             'option_values' => '',
             'is_default'    => '1',
             'is_admin'      => '1',
-            'clabels'       => __( 'Place Details', 'directory_starter' )
+            'clabels'       => __('Place Details', 'directory_starter')
         );
 
         // Salary
@@ -141,7 +141,7 @@ 
         // Custom Fields
         if (!empty($fields)) {
             foreach ($fields as $field_index => $field) {
-                $lastid = geodir_custom_field_save( $field );
+                $lastid = geodir_custom_field_save($field);
                 $this->assertTrue(is_int($lastid));
             }
         }
@@ -149,7 +149,7 @@ 
     }
 
     public function testTextCusField() {
-        $_REQUEST = array (
+        $_REQUEST = array(
             'action' =>  'geodir_ajax_action',
             'create_field' =>  'true',
             'field_ins_upd' =>  'submit',
@@ -181,13 +181,13 @@ 
             'field_desc' =>  'Cat',
             'geodir_ajax' => 'admin_ajax',
             'manage_field_type' => 'custom_fields',
-            'default_value' =>  '' ,
-            'sort_order' =>  '11' ,
-            'show_on_listing' =>  '1' ,
-            'show_on_detail' =>  '1' ,
-            'show_as_tab' =>  '0' ,
-            'field_icon' =>  '' ,
-            'css_class' =>  '' ,
+            'default_value' =>  '',
+            'sort_order' =>  '11',
+            'show_on_listing' =>  '1',
+            'show_on_detail' =>  '1',
+            'show_as_tab' =>  '0',
+            'field_icon' =>  '',
+            'css_class' =>  '',
         );
         add_filter('wp_redirect', '__return_false');
         ob_start();
@@ -200,7 +200,7 @@ 
     }
 
     public function texstDateCusField() {
-        $_REQUEST = array (
+        $_REQUEST = array(
             'action' =>  'geodir_ajax_action',
             'create_field' =>  'true',
             'field_ins_upd' =>  'submit',
@@ -232,13 +232,13 @@ 
             'field_desc' =>  'Cat',
             'geodir_ajax' => 'admin_ajax',
             'manage_field_type' => 'custom_fields',
-            'default_value' =>  '' ,
-            'sort_order' =>  '12' ,
-            'show_on_listing' =>  '1' ,
-            'show_on_detail' =>  '1' ,
-            'show_as_tab' =>  '0' ,
-            'field_icon' =>  '' ,
-            'css_class' =>  '' ,
+            'default_value' =>  '',
+            'sort_order' =>  '12',
+            'show_on_listing' =>  '1',
+            'show_on_detail' =>  '1',
+            'show_as_tab' =>  '0',
+            'field_icon' =>  '',
+            'css_class' =>  '',
             'extra' => array(
                 'date_format' => 'mm/dd/yy'
             )
@@ -254,7 +254,7 @@ 
     }
 
     public function texstTextAreaCusField() {
-        $_REQUEST = array (
+        $_REQUEST = array(
             'action' =>  'geodir_ajax_action',
             'create_field' =>  'true',
             'field_ins_upd' =>  'submit',
@@ -283,13 +283,13 @@ 
             'field_desc' =>  'Cat',
             'geodir_ajax' => 'admin_ajax',
             'manage_field_type' => 'custom_fields',
-            'default_value' =>  '' ,
-            'sort_order' =>  '12' ,
-            'show_on_listing' =>  '1' ,
-            'show_on_detail' =>  '1' ,
-            'show_as_tab' =>  '0' ,
-            'field_icon' =>  '' ,
-            'css_class' =>  '' ,
+            'default_value' =>  '',
+            'sort_order' =>  '12',
+            'show_on_listing' =>  '1',
+            'show_on_detail' =>  '1',
+            'show_as_tab' =>  '0',
+            'field_icon' =>  '',
+            'css_class' =>  '',
         );
         add_filter('wp_redirect', '__return_false');
         ob_start();