GeoDirectory / geodirectory

geodirectory-templates/preview-success.php

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
     $username = $user_info->user_login;

     $user_email = $user_info->user_email;

 

-    $message = wpautop(__(stripslashes_deep(get_option('geodir_post_added_success_msg_content')),'geodirectory'));

+    $message = wpautop(__(stripslashes_deep(get_option('geodir_post_added_success_msg_content')), 'geodirectory'));

 

     /*

      * Filter the success page message before variable replacements.

@@ -45,7 +45,7 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    $message = apply_filters('geodir_success_page_msg_before_var_replace', $message,$post_info, $user_info);

+    $message = apply_filters('geodir_success_page_msg_before_var_replace', $message, $post_info, $user_info);

 

     $search_array = array('[#submited_information_link#]', '[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#user_email#]', '[#username#]', '[#login_url#]', '[#posted_date#]');

     $replace_array = array($productlink, $productlink, $siteurl_link, $post_id, $siteName, $user_email, $username, $loginurl_link, $posted_date);

@@ -59,7 +59,7 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    $message = apply_filters('geodir_success_page_msg_after_var_replace', $message,$post_info, $user_info);

+    $message = apply_filters('geodir_success_page_msg_after_var_replace', $message, $post_info, $user_info);

 

 

 

@@ -75,7 +75,7 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    do_action('geodir_before_success_page_msg_wrapper', $message,$post_info, $user_info);

+    do_action('geodir_before_success_page_msg_wrapper', $message, $post_info, $user_info);

     echo '<h5 class="geodir_information">';

     echo $message;

     echo '</h5>';

@@ -87,7 +87,7 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    do_action('geodir_after_success_page_msg_wrapper', $message,$post_info, $user_info);

+    do_action('geodir_after_success_page_msg_wrapper', $message, $post_info, $user_info);

 

     ?>

 

Indentation +31 added lines, -31 removed lines

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

 

 

-    global $wpdb;

+	global $wpdb;

 

-    $post_id = $_REQUEST['pid'];

-    $post_info = get_post($post_id);

+	$post_id = $_REQUEST['pid'];

+	$post_info = get_post($post_id);

 

-    $posted_date = $post_info->post_date;

-    $productlink = get_permalink($post_id);

-    $siteName = get_bloginfo('name');

-    $siteurl = home_url();

-    $siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>';

+	$posted_date = $post_info->post_date;

+	$productlink = get_permalink($post_id);

+	$siteName = get_bloginfo('name');

+	$siteurl = home_url();

+	$siteurl_link = '<a href="' . $siteurl . '">' . $siteurl . '</a>';

 

-    $loginurl = geodir_login_url();

-    $loginurl_link = '<a href="' . $loginurl . '">login</a>';

+	$loginurl = geodir_login_url();

+	$loginurl_link = '<a href="' . $loginurl . '">login</a>';

 

-    $post_author = $post_info->post_author;

+	$post_author = $post_info->post_author;

 

-    $user_info = get_userdata($post_author);

-    $username = $user_info->user_login;

-    $user_email = $user_info->user_email;

+	$user_info = get_userdata($post_author);

+	$username = $user_info->user_login;

+	$user_email = $user_info->user_email;

 

-    $message = wpautop(__(stripslashes_deep(get_option('geodir_post_added_success_msg_content')),'geodirectory'));

+	$message = wpautop(__(stripslashes_deep(get_option('geodir_post_added_success_msg_content')),'geodirectory'));

 

-    /*

+	/*

      * Filter the success page message before variable replacements.

      *

      * @since 1.5.7

@@ -45,13 +45,13 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    $message = apply_filters('geodir_success_page_msg_before_var_replace', $message,$post_info, $user_info);

+	$message = apply_filters('geodir_success_page_msg_before_var_replace', $message,$post_info, $user_info);

 

-    $search_array = array('[#submited_information_link#]', '[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#user_email#]', '[#username#]', '[#login_url#]', '[#posted_date#]');

-    $replace_array = array($productlink, $productlink, $siteurl_link, $post_id, $siteName, $user_email, $username, $loginurl_link, $posted_date);

-    $message = str_replace($search_array, $replace_array, $message);

+	$search_array = array('[#submited_information_link#]', '[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#user_email#]', '[#username#]', '[#login_url#]', '[#posted_date#]');

+	$replace_array = array($productlink, $productlink, $siteurl_link, $post_id, $siteName, $user_email, $username, $loginurl_link, $posted_date);

+	$message = str_replace($search_array, $replace_array, $message);

 

-    /*

+	/*

      * Filter the success page message after variable replacements.

      *

      * @since 1.5.7

@@ -59,15 +59,15 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    $message = apply_filters('geodir_success_page_msg_after_var_replace', $message,$post_info, $user_info);

+	$message = apply_filters('geodir_success_page_msg_after_var_replace', $message,$post_info, $user_info);

 

 

 

-    ?>

+	?>

 

     <?php

 

-    /*

+	/*

      * Action called before the success page message wrapper.

      *

      * @since 1.5.7

@@ -75,11 +75,11 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    do_action('geodir_before_success_page_msg_wrapper', $message,$post_info, $user_info);

-    echo '<h5 class="geodir_information">';

-    echo $message;

-    echo '</h5>';

-    /*

+	do_action('geodir_before_success_page_msg_wrapper', $message,$post_info, $user_info);

+	echo '<h5 class="geodir_information">';

+	echo $message;

+	echo '</h5>';

+	/*

      * Action called after the success page message wrapper.

      *

      * @since 1.5.7

@@ -87,8 +87,8 @@ 
      * @param object $post_info Post object.

      * @param object $user_info User object.

      */

-    do_action('geodir_after_success_page_msg_wrapper', $message,$post_info, $user_info);

+	do_action('geodir_after_success_page_msg_wrapper', $message,$post_info, $user_info);

 

-    ?>

+	?>

 

 </div>
\ No newline at end of file

geodirectory-templates/widget-listing-listview.php

Spacing +9 added lines, -9 removed lines

@@ -30,7 +30,7 @@ 
             /** This action is documented in geodirectory-templates/listing-listview.php */

             do_action('geodir_before_listing_post_listview');

             $all_postypes = geodir_get_posttypes();

-            $geodir_days_new = (int)get_option('geodir_listing_new_days');

+            $geodir_days_new = (int) get_option('geodir_listing_new_days');

             foreach ($widget_listings as $widget_listing) {

                 global $gd_widget_listing_type;

                 $post = $widget_listing;

@@ -145,12 +145,12 @@ 
                                      */

                                     $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'widget', $post);

                                     if ($show_listing_excerpt) {

-                                        if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {

-                                            $content_out = geodir_max_excerpt( $character_count );

+                                        if (isset($character_count) && ($character_count || $character_count == '0')) {

+                                            $content_out = geodir_max_excerpt($character_count);

                                         } else {

                                             $content_out = get_the_excerpt();

                                         }

-                                        if ( ! empty( $content_out ) ) {

+                                        if (!empty($content_out)) {

                                             echo "<p>" . $content_out . "</p>";

                                         }

                                     }

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

                          * @param string $view The view type, default 'widget'.

                          */

-                        do_action( 'geodir_after_listing_content', $post, 'widget' ); ?>

+                        do_action('geodir_after_listing_content', $post, 'widget'); ?>

                         <footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'widget'); ?>">

                             <div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'widget'); ?>">

                                 <?php

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

                                  * @param string $view The view type, default 'widget'.

                                  */

-                                do_action( 'geodir_before_review_html', $post, 'widget' );

+                                do_action('geodir_before_review_html', $post, 'widget');

                                 $review_show = geodir_is_reviews_show('listview');

                                 if ($review_show) {

 

@@ -206,7 +206,7 @@ 
                                  *

                                  * @since 1.0.0

                                  */

-                                do_action( 'geodir_after_favorite_html', $post->ID, 'widget' );

+                                do_action('geodir_after_favorite_html', $post->ID, 'widget');

 

                                 if ($post->post_author == get_current_user_id()) {

                                     $addplacelink = get_permalink(geodir_add_listing_page_id());

@@ -227,7 +227,7 @@ 
                        title="<?php _e('Edit Listing', 'geodirectory'); ?>">

                         <?php

                         $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa fa-edit');

-                        echo '<i class="'. $geodir_listing_edit_icon .'"></i>';

+                        echo '<i class="' . $geodir_listing_edit_icon . '"></i>';

                         ?>

                         <?php _e('Edit', 'geodirectory'); ?>

                     </a>

@@ -235,7 +235,7 @@ 
                        title="<?php _e('Delete Listing', 'geodirectory'); ?>">

                         <?php

                         $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');

-                        echo '<i class="'. $geodir_listing_delete_icon .'"></i>';

+                        echo '<i class="' . $geodir_listing_delete_icon . '"></i>';

                         ?>

                         <?php _e('Delete', 'geodirectory'); ?>

                     </a>

Indentation +165 added lines, -165 removed lines

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

 /**

- * Template for the list of places

- *

- * This is used mostly by widgets that produce a list of listings and outputs the actual grid or list of listings.

- * See the link below for info on how to replace the template in your theme.

- *

- * @link http://docs.wpgeodirectory.com/customizing-geodirectory-templates/

- * @since 1.0.0

- * @package GeoDirectory

- * @global string $gridview_columns_widget The girdview style of the listings for widget.

- * @global object $gd_session GeoDirectory Session object.

- */

+			 * Template for the list of places

+			 *

+			 * This is used mostly by widgets that produce a list of listings and outputs the actual grid or list of listings.

+			 * See the link below for info on how to replace the template in your theme.

+			 *

+			 * @link http://docs.wpgeodirectory.com/customizing-geodirectory-templates/

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @global string $gridview_columns_widget The girdview style of the listings for widget.

+			 * @global object $gd_session GeoDirectory Session object.

+			 */

 

 /** This action is documented in geodirectory-templates/listing-listview.php */

 do_action('geodir_before_listing_listview');

@@ -20,67 +20,67 @@ 
 /** This action is documented in geodirectory-templates/listing-listview.php */

 $grid_view_class = apply_filters('geodir_grid_view_widget_columns', $gridview_columns_widget);

 if ($gd_session->get('gd_listing_view') && !isset($before_widget)) {

-    $grid_view_class = geodir_convert_listing_view_class($gd_session->get('gd_listing_view'));

+	$grid_view_class = geodir_convert_listing_view_class($gd_session->get('gd_listing_view'));

 }

 ?>

     <ul class="geodir_category_list_view clearfix <?php echo apply_filters('geodir_listing_listview_ul_extra_class', '', 'widget'); ?>">

         <?php

-        if (!empty($widget_listings)) {

-            /** This action is documented in geodirectory-templates/listing-listview.php */

-            do_action('geodir_before_listing_post_listview');

-            $all_postypes = geodir_get_posttypes();

-            $geodir_days_new = (int)get_option('geodir_listing_new_days');

-            foreach ($widget_listings as $widget_listing) {

-                global $gd_widget_listing_type;

-                $post = $widget_listing;

+		if (!empty($widget_listings)) {

+			/** This action is documented in geodirectory-templates/listing-listview.php */

+			do_action('geodir_before_listing_post_listview');

+			$all_postypes = geodir_get_posttypes();

+			$geodir_days_new = (int)get_option('geodir_listing_new_days');

+			foreach ($widget_listings as $widget_listing) {

+				global $gd_widget_listing_type;

+				$post = $widget_listing;

 

-                $GLOBALS['post'] = $post;

-                setup_postdata($post);

+				$GLOBALS['post'] = $post;

+				setup_postdata($post);

 

-                $gd_widget_listing_type = $post->post_type;

+				$gd_widget_listing_type = $post->post_type;

 

-                /** This action is documented in geodirectory-templates/listing-listview.php */

-                $post_view_class = apply_filters('geodir_post_view_extra_class', '', $all_postypes);

+				/** This action is documented in geodirectory-templates/listing-listview.php */

+				$post_view_class = apply_filters('geodir_post_view_extra_class', '', $all_postypes);

 

-                /** This action is documented in geodirectory-templates/listing-listview.php */

-                $post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');

-                ?>

+				/** This action is documented in geodirectory-templates/listing-listview.php */

+				$post_view_article_class = apply_filters('geodir_post_view_article_extra_class', '');

+				?>

                 <li class="clearfix <?php if ($grid_view_class) {

-                    echo 'geodir-gridview ' . $grid_view_class;

-                } else {

-                    echo ' geodir-listview ';

-                } ?> <?php if ($post_view_class) {

-                    echo $post_view_class;

-                } ?>" <?php if (isset($listing_width) && $listing_width) {

-                    echo "style='width:{$listing_width}%;'";

-                } ?>>

+					echo 'geodir-gridview ' . $grid_view_class;

+				} else {

+					echo ' geodir-listview ';

+				} ?> <?php if ($post_view_class) {

+					echo $post_view_class;

+				} ?>" <?php if (isset($listing_width) && $listing_width) {

+					echo "style='width:{$listing_width}%;'";

+				} ?>>

                     <article class="geodir-category-listing <?php if ($post_view_article_class) {

-                        echo $post_view_article_class;

-                    } ?>">

+						echo $post_view_article_class;

+					} ?>">

                         <div class="geodir-post-img <?php echo apply_filters('geodir_listing_listview_thumb_extra_class', '', 'widget'); ?>">

                             <?php if ($fimage = geodir_show_featured_image($post->ID, 'list-thumb', true, false, $post->featured_image)) { ?>

                                 <a href="<?php the_permalink(); ?>"><?php echo $fimage; ?></a>

                                 <?php

-                                /** This action is documented in geodirectory-templates/listing-listview.php */

-                                do_action('geodir_before_badge_on_image', $post);

-                                if ($post->is_featured) {

-                                    echo geodir_show_badges_on_image('featured', $post, get_permalink());

-                                }

+								/** This action is documented in geodirectory-templates/listing-listview.php */

+								do_action('geodir_before_badge_on_image', $post);

+								if ($post->is_featured) {

+									echo geodir_show_badges_on_image('featured', $post, get_permalink());

+								}

 

 

-                                if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {

-                                    echo geodir_show_badges_on_image('new', $post, get_permalink());

-                                }

+								if (round(abs(strtotime($post->post_date) - strtotime(date('Y-m-d'))) / 86400) < $geodir_days_new) {

+									echo geodir_show_badges_on_image('new', $post, get_permalink());

+								}

 

-                                /** This action is documented in geodirectory-templates/listing-listview.php */

-                                do_action('geodir_after_badge_on_image', $post);

-                            }

-                            ?>

+								/** This action is documented in geodirectory-templates/listing-listview.php */

+								do_action('geodir_after_badge_on_image', $post);

+							}

+							?>

                         </div>

                         <div class="geodir-content <?php echo apply_filters('geodir_listing_listview_content_extra_class', '', 'widget'); ?>">

                             <?php

-                            /** This action is documented in geodirectory-templates/listing-listview.php */

-                            do_action('geodir_before_listing_post_title', 'listview', $post); ?>

+							/** This action is documented in geodirectory-templates/listing-listview.php */

+							do_action('geodir_before_listing_post_title', 'listview', $post); ?>

                             <header class="geodir-entry-header">

                                 <h3 class="geodir-entry-title">

                                     <a href="<?php the_permalink(); ?>"

@@ -89,158 +89,158 @@ 
                             </header>

                             <!-- .entry-header -->

                             <?php

-                            /** This action is documented in geodirectory-templates/listing-listview.php */

-                            do_action('geodir_after_listing_post_title', 'listview', $post); ?>

+							/** This action is documented in geodirectory-templates/listing-listview.php */

+							do_action('geodir_after_listing_post_title', 'listview', $post); ?>

                             <?php /// Print Distance

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

-                                $startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);

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

+								$startPoint = array('latitude' => $_REQUEST['sgeo_lat'], 'longitude' => $_REQUEST['sgeo_lon']);

 

-                                $endLat = $post->post_latitude;

-                                $endLon = $post->post_longitude;

-                                $endPoint = array('latitude' => $endLat, 'longitude' => $endLon);

-                                $uom = get_option('geodir_search_dist_1');

-                                $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);

-                                ?>

+								$endLat = $post->post_latitude;

+								$endLon = $post->post_longitude;

+								$endPoint = array('latitude' => $endLat, 'longitude' => $endLon);

+								$uom = get_option('geodir_search_dist_1');

+								$distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);

+								?>

                                 <h3>

                                     <?php

-                                    if (round($distance, 2) == 0) {

-                                        $uom = get_option('geodir_search_dist_2');

-                                        $distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);

-                                        if ($uom == 'feet') {

-                                            $uom = __('feet', 'geodirectory');

-                                        } else {

-                                            $uom = __('meters', 'geodirectory');

-                                        }

-                                        echo round($distance) . ' ' . __($uom, 'geodirectory') . '

+									if (round($distance, 2) == 0) {

+										$uom = get_option('geodir_search_dist_2');

+										$distance = geodir_calculateDistanceFromLatLong($startPoint, $endPoint, $uom);

+										if ($uom == 'feet') {

+											$uom = __('feet', 'geodirectory');

+										} else {

+											$uom = __('meters', 'geodirectory');

+										}

+										echo round($distance) . ' ' . __($uom, 'geodirectory') . '

 			<br />

 			';

-                                    } else {

-                                        if ($uom == 'miles') {

-                                            $uom = __('miles', 'geodirectory');

-                                        } else {

-                                            $uom = __('km', 'geodirectory');

-                                        }

-                                        echo round($distance, 2) . ' ' . __($uom, 'geodirectory') . '

+									} else {

+										if ($uom == 'miles') {

+											$uom = __('miles', 'geodirectory');

+										} else {

+											$uom = __('km', 'geodirectory');

+										}

+										echo round($distance, 2) . ' ' . __($uom, 'geodirectory') . '

 			<br />

 			';

-                                    }

-                                    ?>

+									}

+									?>

                                 </h3>

                             <?php } ?>

                             <?php

-                            /** This action is documented in geodirectory-templates/listing-listview.php */

-                            do_action('geodir_before_listing_post_excerpt', $post); ?>

+							/** This action is documented in geodirectory-templates/listing-listview.php */

+							do_action('geodir_before_listing_post_excerpt', $post); ?>

                             <?php echo geodir_show_listing_info('listing'); ?>

                             <?php if (isset($character_count) && $character_count == '0') {

-                            } else { ?>

+							} else { ?>

                                 <div class="geodir-entry-content">

                                     <?php

-                                    /**

-                                     * Filter to hide the listing excerpt

-                                     *

-                                     * @since 1.5.3

-                                     * @param bool $display Display the excerpt or not. Default true.

-                                     * @param object $post The post object.

-                                     */

-                                    $show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'widget', $post);

-                                    if ($show_listing_excerpt) {

-                                        if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {

-                                            $content_out = geodir_max_excerpt( $character_count );

-                                        } else {

-                                            $content_out = get_the_excerpt();

-                                        }

-                                        if ( ! empty( $content_out ) ) {

-                                            echo "<p>" . $content_out . "</p>";

-                                        }

-                                    }

-                                    ?>

+									/**

+									 * Filter to hide the listing excerpt

+									 *

+									 * @since 1.5.3

+									 * @param bool $display Display the excerpt or not. Default true.

+									 * @param object $post The post object.

+									 */

+									$show_listing_excerpt = apply_filters('geodir_show_listing_post_excerpt', true, 'widget', $post);

+									if ($show_listing_excerpt) {

+										if ( isset( $character_count ) && ( $character_count || $character_count == '0' ) ) {

+											$content_out = geodir_max_excerpt( $character_count );

+										} else {

+											$content_out = get_the_excerpt();

+										}

+										if ( ! empty( $content_out ) ) {

+											echo "<p>" . $content_out . "</p>";

+										}

+									}

+									?>

                                 </div>

                             <?php } ?>

                             <?php

-                            /** This action is documented in geodirectory-templates/listing-listview.php */

-                            do_action('geodir_after_listing_post_excerpt', $post); ?>

+							/** This action is documented in geodirectory-templates/listing-listview.php */

+							do_action('geodir_after_listing_post_excerpt', $post); ?>

                         </div>

                         <!-- gd-content ends here-->

                         <?php

-                        /**

-                         * Called after printing listing content.

-                         *

-                         * @since 1.5.3

-                         * @param object $post The post object.

-                         * @param string $view The view type, default 'widget'.

-                         */

-                        do_action( 'geodir_after_listing_content', $post, 'widget' ); ?>

+						/**

+						 * Called after printing listing content.

+						 *

+						 * @since 1.5.3

+						 * @param object $post The post object.

+						 * @param string $view The view type, default 'widget'.

+						 */

+						do_action( 'geodir_after_listing_content', $post, 'widget' ); ?>

                         <footer class="geodir-entry-meta <?php echo apply_filters('geodir_listing_listview_meta_extra_class', '', 'widget'); ?>">

                             <div class="geodir-addinfo clearfix <?php echo apply_filters('geodir_listing_listview_addinfo_extra_class', '', 'widget'); ?>">

                                 <?php

-                                /**

-                                 * Called before printing review stars html.

-                                 *

-                                 * @since 1.5.3

-                                 * @param object $post The post object.

-                                 * @param string $view The view type, default 'widget'.

-                                 */

-                                do_action( 'geodir_before_review_html', $post, 'widget' );

-                                $review_show = geodir_is_reviews_show('listview');

-                                if ($review_show) {

+								/**

+								 * Called before printing review stars html.

+								 *

+								 * @since 1.5.3

+								 * @param object $post The post object.

+								 * @param string $view The view type, default 'widget'.

+								 */

+								do_action( 'geodir_before_review_html', $post, 'widget' );

+								$review_show = geodir_is_reviews_show('listview');

+								if ($review_show) {

 

-                                    $post_avgratings = geodir_get_post_rating($post->ID);

+									$post_avgratings = geodir_get_post_rating($post->ID);

 

-                                    /** This action is documented in geodirectory-templates/listing-listview.php */

-                                    do_action('geodir_before_review_rating_stars_on_listview', $post_avgratings, $post->ID);

+									/** This action is documented in geodirectory-templates/listing-listview.php */

+									do_action('geodir_before_review_rating_stars_on_listview', $post_avgratings, $post->ID);

 

-                                    echo geodir_get_rating_stars($post_avgratings, $post->ID);

+									echo geodir_get_rating_stars($post_avgratings, $post->ID);

 

-                                    /** This action is documented in geodirectory-templates/listing-listview.php */

-                                    do_action('geodir_after_review_rating_stars_on_listview', $post_avgratings, $post->ID);

-                                    ?><a href="<?php comments_link(); ?>" class="geodir-pcomments"><i

+									/** This action is documented in geodirectory-templates/listing-listview.php */

+									do_action('geodir_after_review_rating_stars_on_listview', $post_avgratings, $post->ID);

+									?><a href="<?php comments_link(); ?>" class="geodir-pcomments"><i

                                         class="fa fa-comments"></i> <?php geodir_comments_number($post->rating_count); ?>

                                     </a>

                                 <?php

-                                }

-                                geodir_favourite_html($post->post_author, $post->ID);

+								}

+								geodir_favourite_html($post->post_author, $post->ID);

 

-                                /**

-                                 * Called after printing favorite html.

-                                 *

-                                 * @since 1.0.0

-                                 */

-                                do_action( 'geodir_after_favorite_html', $post->ID, 'widget' );

+								/**

+								 * Called after printing favorite html.

+								 *

+								 * @since 1.0.0

+								 */

+								do_action( 'geodir_after_favorite_html', $post->ID, 'widget' );

 

-                                if ($post->post_author == get_current_user_id()) {

-                                    $addplacelink = get_permalink(geodir_add_listing_page_id());

-                                    $editlink = geodir_getlink($addplacelink, array('pid' => $post->ID), false);

-                                    $upgradelink = geodir_getlink($editlink, array('upgrade' => '1'), false);

+								if ($post->post_author == get_current_user_id()) {

+									$addplacelink = get_permalink(geodir_add_listing_page_id());

+									$editlink = geodir_getlink($addplacelink, array('pid' => $post->ID), false);

+									$upgradelink = geodir_getlink($editlink, array('upgrade' => '1'), false);

 

-                                    $ajaxlink = geodir_get_ajax_url();

-                                    $deletelink = geodir_getlink($ajaxlink, array('geodir_ajax' => 'add_listing', 'ajax_action' => 'delete', 'pid' => $post->ID), false);

-                                    ?>

+									$ajaxlink = geodir_get_ajax_url();

+									$deletelink = geodir_getlink($ajaxlink, array('geodir_ajax' => 'add_listing', 'ajax_action' => 'delete', 'pid' => $post->ID), false);

+									?>

                                     <span class="geodir-authorlink clearfix">

                                 <?php

-                if (isset($_REQUEST['geodir_dashbord']) && $_REQUEST['geodir_dashbord']) {

-                    /** This action is documented in geodirectory-templates/listing-listview.php */

-                    do_action('geodir_before_edit_post_link_on_listing');

-                    ?>

+				if (isset($_REQUEST['geodir_dashbord']) && $_REQUEST['geodir_dashbord']) {

+					/** This action is documented in geodirectory-templates/listing-listview.php */

+					do_action('geodir_before_edit_post_link_on_listing');

+					?>

                     <a href="<?php echo esc_url($editlink); ?>" class="geodir-edit"

                        title="<?php _e('Edit Listing', 'geodirectory'); ?>">

                         <?php

-                        $geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa fa-edit');

-                        echo '<i class="'. $geodir_listing_edit_icon .'"></i>';

-                        ?>

+						$geodir_listing_edit_icon = apply_filters('geodir_listing_edit_icon', 'fa fa-edit');

+						echo '<i class="'. $geodir_listing_edit_icon .'"></i>';

+						?>

                         <?php _e('Edit', 'geodirectory'); ?>

                     </a>

                     <a href="<?php echo esc_url($deletelink); ?>" class="geodir-delete"

                        title="<?php _e('Delete Listing', 'geodirectory'); ?>">

                         <?php

-                        $geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');

-                        echo '<i class="'. $geodir_listing_delete_icon .'"></i>';

-                        ?>

+						$geodir_listing_delete_icon = apply_filters('geodir_listing_delete_icon', 'fa fa-close');

+						echo '<i class="'. $geodir_listing_delete_icon .'"></i>';

+						?>

                         <?php _e('Delete', 'geodirectory'); ?>

                     </a>

                     <?php

-                    /** This action is documented in geodirectory-templates/listing-listview.php */

-                    do_action('geodir_after_edit_post_link_on_listing');

-                } ?>

+					/** This action is documented in geodirectory-templates/listing-listview.php */

+					do_action('geodir_after_edit_post_link_on_listing');

+				} ?>

 					</span>

                                 <?php } ?>

                             </div>

@@ -250,17 +250,17 @@ 
                     </article>

                 </li>

                 <?php

-                unset($gd_widget_listing_type);

-            }

-            /** This action is documented in geodirectory-templates/listing-listview.php */

-            do_action('geodir_after_listing_post_listview');

-        } else {

+				unset($gd_widget_listing_type);

+			}

+			/** This action is documented in geodirectory-templates/listing-listview.php */

+			do_action('geodir_after_listing_post_listview');

+		} else {

 			$favorite = isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' ? true : false;

             

 			/** This action is documented in geodirectory-templates/listing-listview.php */

-            do_action('geodir_message_not_found_on_listing', 'widget-listing-listview', $favorite);

-        }

-        ?>

+			do_action('geodir_message_not_found_on_listing', 'widget-listing-listview', $favorite);

+		}

+		?>

     </ul>  <!-- geodir_category_list_view ends here-->

     <div class="clear"></div>

 <?php

geodirectory-widgets/geodirectory_bestof_widget.php

Spacing +17 added lines, -17 removed lines

@@ -75,7 +75,7 @@ 
 		 *
 		 * @param string $instance['title'] The widget title.
 		 */
-		$title = empty($instance['title']) ? wp_sprintf( __( 'Best of %s', 'geodirectory' ), get_bloginfo('name') . $cur_location ) : apply_filters('bestof_widget_title', __($instance['title'], 'geodirectory'));
+		$title = empty($instance['title']) ? wp_sprintf(__('Best of %s', 'geodirectory'), get_bloginfo('name') . $cur_location) : apply_filters('bestof_widget_title', __($instance['title'], 'geodirectory'));
         
 		/**
 		 * Filter the post type.
@@ -212,7 +212,7 @@ 
             $is_dropdown = ($tab_layout == 'bestof-tabs-as-dropdown') ? true : false;
 
             if ($is_dropdown) {
-                $nav_html .= '<select id="geodir_bestof_tab_dd" class="chosen_select" name="geodir_bestof_tab_dd" data-placeholder="' . esc_attr( __( 'Select Category', 'geodirectory' ) ).'">';
+                $nav_html .= '<select id="geodir_bestof_tab_dd" class="chosen_select" name="geodir_bestof_tab_dd" data-placeholder="' . esc_attr(__('Select Category', 'geodirectory')) . '">';
             } else {
                 $nav_html .= '<dl class="geodir-tab-head geodir-bestof-cat-list">';
                 $nav_html .= '<dt></dt>';
@@ -317,7 +317,7 @@ 
 				 */
 				$view_all_link = apply_filters('geodir_bestof_widget_view_all_link', $view_all_link, $post_type, $first_term);
 				
-				echo '<h3 class="bestof-cat-title">' . wp_sprintf( __( 'Best of %s', 'geodirectory' ), $first_term->name ) . '<a href="' . esc_url($view_all_link) . '">' . __("View all", 'geodirectory') . '</a></h3>';
+				echo '<h3 class="bestof-cat-title">' . wp_sprintf(__('Best of %s', 'geodirectory'), $first_term->name) . '<a href="' . esc_url($view_all_link) . '">' . __("View all", 'geodirectory') . '</a></h3>';
             }
             if ($excerpt_type == 'show-reviews') {
                 add_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
@@ -374,7 +374,7 @@ 
 	 */
 	public function form($instance)
     {
-        $instance = wp_parse_args((array)$instance,
+        $instance = wp_parse_args((array) $instance,
             array(
                 'title' => '',
                 'post_type' => '',
@@ -399,7 +399,7 @@ 
 
         ?>
         <p>
-            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>
+            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory'); ?>
 
                 <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"
                        name="<?php echo $this->get_field_name('title'); ?>" type="text"
@@ -409,7 +409,7 @@ 
 
         <p>
             <label
-                for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory'); ?>
 
                 <?php $postypes = geodir_get_posttypes();
 				/**
@@ -441,7 +441,7 @@ 
         <p>
 
             <label
-                for="<?php echo $this->get_field_id('post_limit'); ?>"><?php _e('Number of posts:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('post_limit'); ?>"><?php _e('Number of posts:', 'geodirectory'); ?>
 
                 <input class="widefat" id="<?php echo $this->get_field_id('post_limit'); ?>"
                        name="<?php echo $this->get_field_name('post_limit'); ?>" type="text"
@@ -452,7 +452,7 @@ 
         <p>
 
             <label
-                for="<?php echo $this->get_field_id('categ_limit'); ?>"><?php _e('Number of categories:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('categ_limit'); ?>"><?php _e('Number of categories:', 'geodirectory'); ?>
 
                 <input class="widefat" id="<?php echo $this->get_field_id('categ_limit'); ?>"
                        name="<?php echo $this->get_field_name('categ_limit'); ?>" type="text"
@@ -462,7 +462,7 @@ 
 
         <p>
             <label
-                for="<?php echo $this->get_field_id('character_count'); ?>"><?php _e('Post Content excerpt character count :', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('character_count'); ?>"><?php _e('Post Content excerpt character count :', 'geodirectory'); ?>
                 <input class="widefat" id="<?php echo $this->get_field_id('character_count'); ?>"
                        name="<?php echo $this->get_field_name('character_count'); ?>" type="text"
                        value="<?php echo esc_attr($character_count); ?>"/>
@@ -470,7 +470,7 @@ 
         </p>
         <p>
             <label
-                for="<?php echo $this->get_field_id('tab_layout'); ?>"><?php _e('Tab Layout:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('tab_layout'); ?>"><?php _e('Tab Layout:', 'geodirectory'); ?>
 
                 <select class="widefat" id="<?php echo $this->get_field_id('tab_layout'); ?>"
                         name="<?php echo $this->get_field_name('tab_layout'); ?>">
@@ -491,7 +491,7 @@ 
 
         <p>
             <label
-                for="<?php echo $this->get_field_id('excerpt_type'); ?>"><?php _e('Excerpt Type:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('excerpt_type'); ?>"><?php _e('Excerpt Type:', 'geodirectory'); ?>
 
                 <select class="widefat" id="<?php echo $this->get_field_id('excerpt_type'); ?>"
                         name="<?php echo $this->get_field_name('excerpt_type'); ?>">
@@ -508,9 +508,9 @@ 
 
         <p>
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">
-                <?php _e('Enable Location Filter:', 'geodirectory');?>
+                <?php _e('Enable Location Filter:', 'geodirectory'); ?>
                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"
-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>
+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"'; ?>
                        value="1"/>
             </label>
         </p>
@@ -654,11 +654,11 @@ 
     $query_args['tax_query'] = array($tax_query);
     if ($term_id && $taxonomy) {
         $term = get_term_by('id', $term_id, $taxonomy);
-        $view_all_link = add_query_arg(array('sort_by' => 'rating_count_desc'), get_term_link($term)) ;
+        $view_all_link = add_query_arg(array('sort_by' => 'rating_count_desc'), get_term_link($term));
 		/** This filter is documented in geodirectory-widgets/geodirectory_bestof_widget.php */
 		$view_all_link = apply_filters('geodir_bestof_widget_view_all_link', $view_all_link, $post_type, $term);
 				
-		echo '<h3 class="bestof-cat-title">' . wp_sprintf( __( 'Best of %s', 'geodirectory' ), $term->name ) . '<a href="' . esc_url( $view_all_link ) . '">' . __("View all", 'geodirectory') . '</a></h3>';
+		echo '<h3 class="bestof-cat-title">' . wp_sprintf(__('Best of %s', 'geodirectory'), $term->name) . '<a href="' . esc_url($view_all_link) . '">' . __("View all", 'geodirectory') . '</a></h3>';
     }
     if ($excerpt_type == 'show-reviews') {
         add_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
@@ -765,11 +765,11 @@ 
     $comments = $wpdb->get_results($request);
 
     if ($comments) {
-        foreach($comments as $comment) {
+        foreach ($comments as $comment) {
             // Set the extra comment info needed.
             $comment_extra = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID");
             $comment_content = $comment_extra->comment_content;
-            $excerpt = strip_tags( $comment_content );
+            $excerpt = strip_tags($comment_content);
         }
     }
     return $excerpt;

Indentation +356 added lines, -356 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * GeoDirectory Best of widget
- *
- * @since 1.3.9
- *
- * @package GeoDirectory
- */
+		 * GeoDirectory Best of widget
+		 *
+		 * @since 1.3.9
+		 *
+		 * @package GeoDirectory
+		 */
 
 /**
  * GeoDirectory Best of widget widget class.
@@ -14,34 +14,34 @@ 
  */
 class geodir_bestof_widget extends WP_Widget
 {
-    /**
+	/**
 	 * Register the best of widget with WordPress.
 	 *
 	 * @since 1.3.9
-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
 	 */
-    public function __construct() {
-        $widget_ops = array('classname' => 'geodir_bestof_widget', 'description' => __('GD > Best of widget', 'geodirectory'));
-        parent::__construct(
-            'bestof_widget', // Base ID
-            __('GD > Best of widget', 'geodirectory'), // Name
-            $widget_ops// Args
-        );
-    }
+	public function __construct() {
+		$widget_ops = array('classname' => 'geodir_bestof_widget', 'description' => __('GD > Best of widget', 'geodirectory'));
+		parent::__construct(
+			'bestof_widget', // Base ID
+			__('GD > Best of widget', 'geodirectory'), // Name
+			$widget_ops// Args
+		);
+	}
 
 	/**
 	 * Front-end display content for best of widget.
 	 *
 	 * @since 1.3.9
-     * @since 1.5.1 Added filter to view all link.
-     * @since 1.5.1 Declare function public.
+	 * @since 1.5.1 Added filter to view all link.
+	 * @since 1.5.1 Declare function public.
 	 *
 	 * @param array $args     Widget arguments.
 	 * @param array $instance Saved values from database.
 	 */
 	public function widget($args, $instance)
-    {
-        extract($args);
+	{
+		extract($args);
 		/**
 		 * Filter the best of widget tab layout.
 		 *
@@ -50,14 +50,14 @@ 
 		 * @param string $instance['tab_layout'] Best of widget tab layout name.
 		 */
 		$tab_layout = empty($instance['tab_layout']) ? 'bestof-tabs-on-top' : apply_filters('bestof_widget_tab_layout', $instance['tab_layout']);
-        echo '<div class="bestof-widget-tab-layout ' . $tab_layout . '">';
-        echo $before_widget;
-        $loc_terms = geodir_get_current_location_terms();
-        if ($loc_terms) {
-            $cur_location = ' : ' . geodir_ucwords(str_replace('-', ' ', end($loc_terms)));
-        } else {
-            $cur_location = '';
-        }
+		echo '<div class="bestof-widget-tab-layout ' . $tab_layout . '">';
+		echo $before_widget;
+		$loc_terms = geodir_get_current_location_terms();
+		if ($loc_terms) {
+			$cur_location = ' : ' . geodir_ucwords(str_replace('-', ' ', end($loc_terms)));
+		} else {
+			$cur_location = '';
+		}
 		
 		/**
 		 * Filter the current location name.
@@ -68,7 +68,7 @@ 
 		 */
 		$cur_location = apply_filters('bestof_widget_cur_location', $cur_location);
 
-        /**
+		/**
 		 * Filter the widget title.
 		 *
 		 * @since 1.3.9
@@ -86,17 +86,17 @@ 
 		 */
 		$post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('bestof_widget_post_type', $instance['post_type']);
 
-        /**
-         * Filter the excerpt type.
-         *
-         * @since 1.5.4
-         *
-         * @param string $instance['excerpt_type'] The excerpt type.
-         */
-        $excerpt_type = empty($instance['excerpt_type']) ? 'show-desc' : apply_filters('bestof_widget_excerpt_type', $instance['excerpt_type']);
+		/**
+		 * Filter the excerpt type.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param string $instance['excerpt_type'] The excerpt type.
+		 */
+		$excerpt_type = empty($instance['excerpt_type']) ? 'show-desc' : apply_filters('bestof_widget_excerpt_type', $instance['excerpt_type']);
 
 
-        /**
+		/**
 		 * Filter the listing limit.
 		 *
 		 * @since 1.3.9
@@ -113,7 +113,7 @@ 
 		 * @param int $instance['categ_limit'] No. of categories to display.
 		 */
 		$categ_limit = empty($instance['categ_limit']) ? '3' : apply_filters('bestof_widget_categ_limit', $instance['categ_limit']);
-        $use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false;
+		$use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false;
         
 		/**
 		 * Filter the use of location filter.
@@ -124,166 +124,166 @@ 
 		 */
 		$add_location_filter = empty($instance['add_location_filter']) ? '1' : apply_filters('bestof_widget_location_filter', $instance['add_location_filter']);
 
-        // set post type to current viewing post type
-        if ($use_viewing_post_type) {
-            $current_post_type = geodir_get_current_posttype();
-            if ($current_post_type != '' && $current_post_type != $post_type) {
-                $post_type = $current_post_type;
-            }
-        }
+		// set post type to current viewing post type
+		if ($use_viewing_post_type) {
+			$current_post_type = geodir_get_current_posttype();
+			if ($current_post_type != '' && $current_post_type != $post_type) {
+				$post_type = $current_post_type;
+			}
+		}
 
-        if (isset($instance['character_count'])) {
+		if (isset($instance['character_count'])) {
 			/**
 			 * Filter the widget's excerpt character count.
 			 *
 			 * @since 1.3.9
-             *
+			 *
 			 * @param int $instance['character_count'] Excerpt character count.
 			 */
 			$character_count = apply_filters('bestof_widget_list_character_count', $instance['character_count']);
-        } else {
-            $character_count = '';
-        }
-
-        $category_taxonomy = geodir_get_taxonomies($post_type);
-
-        $term_args = array(
-            'hide_empty' => true,
-            'parent' => 0
-        );
-
-        if (is_tax()) {
-            $taxonomy = get_query_var('taxonomy');
-            $cur_term = get_query_var('term');
-            $term_data = get_term_by('name', $cur_term, $taxonomy);
-            $term_args['parent'] = $term_data->term_id;
-        }
-
-        $terms = get_terms($category_taxonomy[0], $term_args);
-
-        $term_reviews = geodir_count_reviews_by_terms();
-        $a_terms = array();
-        foreach ($terms as $term) {
-
-
-            if ($term->count > 0) {
-                if (isset($term_reviews[$term->term_id])) {
-                    $term->review_count = $term_reviews[$term->term_id];
-                } else {
-                    $term->review_count = '0';
-                }
-
-                $a_terms[] = $term;
-            }
-
-        }
-
-
-        $terms = geodir_sort_terms($a_terms, 'review_count');
-
-        $query_args = array(
-            'posts_per_page' => $post_limit,
-            'is_geodir_loop' => true,
-            'post_type' => $post_type,
-            'gd_location' => $add_location_filter ? true : false,
-            'order_by' => 'high_review'
-        );
-        if ($character_count >= 0) {
-            $query_args['excerpt_length'] = $character_count;
-        }
-
-        $layout = array();
-        if ($tab_layout == 'bestof-tabs-as-dropdown') {
-            $layout[] = $tab_layout;
-        } else {
-            $layout[] = 'bestof-tabs-as-dropdown';
-            $layout[] = $tab_layout;
-        }
-
-
-        echo $before_title . __($title) . $after_title;
-
-        //term navigation - start
-        echo '<div class="geodir-tabs gd-bestof-tabs" id="gd-bestof-tabs" style="position:relative;">';
-
-        $final_html = '';
-        foreach ($layout as $tab_layout) {
-            $nav_html = '';
-            $is_dropdown = ($tab_layout == 'bestof-tabs-as-dropdown') ? true : false;
-
-            if ($is_dropdown) {
-                $nav_html .= '<select id="geodir_bestof_tab_dd" class="chosen_select" name="geodir_bestof_tab_dd" data-placeholder="' . esc_attr( __( 'Select Category', 'geodirectory' ) ).'">';
-            } else {
-                $nav_html .= '<dl class="geodir-tab-head geodir-bestof-cat-list">';
-                $nav_html .= '<dt></dt>';
-            }
-
-
-            $term_icon = geodir_get_term_icon();
-            $cat_count = 0;
-            foreach ($terms as $cat) {
-                $cat_count++;
-                if ($cat_count > $categ_limit) {
-                    break;
-                }
-                if ($is_dropdown) {
-                    $selected = ($cat_count == 1) ? 'selected="selected"' : '';
-                    $nav_html .= '<option ' . $selected . ' value="' . $cat->term_id . '">' . geodir_ucwords($cat->name) . '</option>';
-                } else {
-                    if ($cat_count == 1) {
-                        $nav_html .= '<dd class="geodir-tab-active">';
-                    } else {
-                        $nav_html .= '<dd class="">';
-                    }
-                    $term_icon_url = !empty($term_icon) && isset($term_icon[$cat->term_id]) ? $term_icon[$cat->term_id] : '';
-                    $nav_html .= '<a data-termid="' . $cat->term_id . '" href="' . get_term_link($cat, $cat->taxonomy) . '">';
-                    $nav_html .= '<img alt="' . $cat->name . ' icon" class="bestof-cat-icon" src="' . $term_icon_url . '"/>';
-                    $nav_html .= '<span>';
-                    $nav_html .= geodir_ucwords($cat->name);
-                    $nav_html .= '<small>';
-                    if (isset($cat->review_count)) {
-                        $num_reviews = $cat->review_count;
-                        if ($num_reviews == 0) {
-                            $reviews = __('No Reviews', 'geodirectory');
-                        } elseif ($num_reviews > 1) {
-                            $reviews = $num_reviews . __(' Reviews', 'geodirectory');
-                        } else {
-                            $reviews = __('1 Review', 'geodirectory');
-                        }
-                        $nav_html .= $reviews;
-                    }
-                    $nav_html .= '</small>';
-                    $nav_html .= '</span>';
-                    $nav_html .= '</a>';
-                    $nav_html .= '</dd>';
-                }
-            }
-            if ($is_dropdown) {
-                $nav_html .= '</select>';
-            } else {
-                $nav_html .= '</dl>';
-            }
-            $final_html .= $nav_html;
-        }
-        if ($terms) {
-            echo $final_html;
-        }
-        echo '</div>';
-        //term navigation - end
-
-        //first term listings by default - start
-        $first_term = '';
-        if ($terms) {
-            $first_term = $terms[0];
-            $tax_query = array(
-                'taxonomy' => $category_taxonomy[0],
-                'field' => 'id',
-                'terms' => $first_term->term_id
-            );
-            $query_args['tax_query'] = array($tax_query);
-        }
-
-        ?>
+		} else {
+			$character_count = '';
+		}
+
+		$category_taxonomy = geodir_get_taxonomies($post_type);
+
+		$term_args = array(
+			'hide_empty' => true,
+			'parent' => 0
+		);
+
+		if (is_tax()) {
+			$taxonomy = get_query_var('taxonomy');
+			$cur_term = get_query_var('term');
+			$term_data = get_term_by('name', $cur_term, $taxonomy);
+			$term_args['parent'] = $term_data->term_id;
+		}
+
+		$terms = get_terms($category_taxonomy[0], $term_args);
+
+		$term_reviews = geodir_count_reviews_by_terms();
+		$a_terms = array();
+		foreach ($terms as $term) {
+
+
+			if ($term->count > 0) {
+				if (isset($term_reviews[$term->term_id])) {
+					$term->review_count = $term_reviews[$term->term_id];
+				} else {
+					$term->review_count = '0';
+				}
+
+				$a_terms[] = $term;
+			}
+
+		}
+
+
+		$terms = geodir_sort_terms($a_terms, 'review_count');
+
+		$query_args = array(
+			'posts_per_page' => $post_limit,
+			'is_geodir_loop' => true,
+			'post_type' => $post_type,
+			'gd_location' => $add_location_filter ? true : false,
+			'order_by' => 'high_review'
+		);
+		if ($character_count >= 0) {
+			$query_args['excerpt_length'] = $character_count;
+		}
+
+		$layout = array();
+		if ($tab_layout == 'bestof-tabs-as-dropdown') {
+			$layout[] = $tab_layout;
+		} else {
+			$layout[] = 'bestof-tabs-as-dropdown';
+			$layout[] = $tab_layout;
+		}
+
+
+		echo $before_title . __($title) . $after_title;
+
+		//term navigation - start
+		echo '<div class="geodir-tabs gd-bestof-tabs" id="gd-bestof-tabs" style="position:relative;">';
+
+		$final_html = '';
+		foreach ($layout as $tab_layout) {
+			$nav_html = '';
+			$is_dropdown = ($tab_layout == 'bestof-tabs-as-dropdown') ? true : false;
+
+			if ($is_dropdown) {
+				$nav_html .= '<select id="geodir_bestof_tab_dd" class="chosen_select" name="geodir_bestof_tab_dd" data-placeholder="' . esc_attr( __( 'Select Category', 'geodirectory' ) ).'">';
+			} else {
+				$nav_html .= '<dl class="geodir-tab-head geodir-bestof-cat-list">';
+				$nav_html .= '<dt></dt>';
+			}
+
+
+			$term_icon = geodir_get_term_icon();
+			$cat_count = 0;
+			foreach ($terms as $cat) {
+				$cat_count++;
+				if ($cat_count > $categ_limit) {
+					break;
+				}
+				if ($is_dropdown) {
+					$selected = ($cat_count == 1) ? 'selected="selected"' : '';
+					$nav_html .= '<option ' . $selected . ' value="' . $cat->term_id . '">' . geodir_ucwords($cat->name) . '</option>';
+				} else {
+					if ($cat_count == 1) {
+						$nav_html .= '<dd class="geodir-tab-active">';
+					} else {
+						$nav_html .= '<dd class="">';
+					}
+					$term_icon_url = !empty($term_icon) && isset($term_icon[$cat->term_id]) ? $term_icon[$cat->term_id] : '';
+					$nav_html .= '<a data-termid="' . $cat->term_id . '" href="' . get_term_link($cat, $cat->taxonomy) . '">';
+					$nav_html .= '<img alt="' . $cat->name . ' icon" class="bestof-cat-icon" src="' . $term_icon_url . '"/>';
+					$nav_html .= '<span>';
+					$nav_html .= geodir_ucwords($cat->name);
+					$nav_html .= '<small>';
+					if (isset($cat->review_count)) {
+						$num_reviews = $cat->review_count;
+						if ($num_reviews == 0) {
+							$reviews = __('No Reviews', 'geodirectory');
+						} elseif ($num_reviews > 1) {
+							$reviews = $num_reviews . __(' Reviews', 'geodirectory');
+						} else {
+							$reviews = __('1 Review', 'geodirectory');
+						}
+						$nav_html .= $reviews;
+					}
+					$nav_html .= '</small>';
+					$nav_html .= '</span>';
+					$nav_html .= '</a>';
+					$nav_html .= '</dd>';
+				}
+			}
+			if ($is_dropdown) {
+				$nav_html .= '</select>';
+			} else {
+				$nav_html .= '</dl>';
+			}
+			$final_html .= $nav_html;
+		}
+		if ($terms) {
+			echo $final_html;
+		}
+		echo '</div>';
+		//term navigation - end
+
+		//first term listings by default - start
+		$first_term = '';
+		if ($terms) {
+			$first_term = $terms[0];
+			$tax_query = array(
+				'taxonomy' => $category_taxonomy[0],
+				'field' => 'id',
+				'terms' => $first_term->term_id
+			);
+			$query_args['tax_query'] = array($tax_query);
+		}
+
+		?>
         <input type="hidden" id="bestof_widget_post_type" name="bestof_widget_post_type"
                value="<?php echo $post_type; ?>">
         <input type="hidden" id="bestof_widget_excerpt_type" name="bestof_widget_excerpt_type"
@@ -294,18 +294,18 @@ 
                value="<?php echo $category_taxonomy[0]; ?>">
         <input type="hidden" id="bestof_widget_location_filter" name="bestof_widget_location_filter"
                value="<?php if ($add_location_filter) {
-                   echo 1;
-               } else {
-                   echo 0;
-               } ?>">
+				   echo 1;
+			   } else {
+				   echo 0;
+			   } ?>">
         <input type="hidden" id="bestof_widget_char_count" name="bestof_widget_char_count"
                value="<?php echo $character_count; ?>">
         <div class="geo-bestof-contentwrap geodir-tabs-content" style="position: relative; z-index: 0;">
             <p id="geodir-bestof-loading" class="geodir-bestof-loading"><i class="fa fa-cog fa-spin"></i></p>
             <?php
-            echo '<div id="geodir-bestof-places">';
-            if ($terms) {
-                $view_all_link = add_query_arg(array('sort_by' => 'rating_count_desc'), get_term_link($first_term, $first_term->taxonomy));
+			echo '<div id="geodir-bestof-places">';
+			if ($terms) {
+				$view_all_link = add_query_arg(array('sort_by' => 'rating_count_desc'), get_term_link($first_term, $first_term->taxonomy));
 				/**
 				 * Filter the page link to view all lisitngs.
 				 *
@@ -318,28 +318,28 @@ 
 				$view_all_link = apply_filters('geodir_bestof_widget_view_all_link', $view_all_link, $post_type, $first_term);
 				
 				echo '<h3 class="bestof-cat-title">' . wp_sprintf( __( 'Best of %s', 'geodirectory' ), $first_term->name ) . '<a href="' . esc_url($view_all_link) . '">' . __("View all", 'geodirectory') . '</a></h3>';
-            }
-            if ($excerpt_type == 'show-reviews') {
-                add_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
-            }
-            geodir_bestof_places_by_term($query_args);
-            if ($excerpt_type == 'show-reviews') {
-                remove_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
-            }
-            echo "</div>";
-            ?>
+			}
+			if ($excerpt_type == 'show-reviews') {
+				add_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
+			}
+			geodir_bestof_places_by_term($query_args);
+			if ($excerpt_type == 'show-reviews') {
+				remove_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
+			}
+			echo "</div>";
+			?>
         </div>
         <?php //first term listings by default - end
-        ?>
+		?>
         <?php echo $after_widget;
-        echo "</div>";
-    }
+		echo "</div>";
+	}
 
 	/**
 	 * Sanitize best of widget form values as they are saved.
 	 *
 	 * @since 1.3.9
-     * @since 1.5.1 Declare function public.
+	 * @since 1.5.1 Declare function public.
 	 *
 	 * @param array $new_instance Values just sent to be saved.
 	 * @param array $old_instance Previously saved values from database.
@@ -347,57 +347,57 @@ 
 	 * @return array Updated safe values to be saved.
 	 */
 	public function update($new_instance, $old_instance)
-    {
-        $instance = $old_instance;
-        $instance['title'] = strip_tags($new_instance['title']);
-        $instance['post_type'] = strip_tags($new_instance['post_type']);
-        $instance['post_limit'] = strip_tags($new_instance['post_limit']);
-        $instance['categ_limit'] = strip_tags($new_instance['categ_limit']);
-        $instance['character_count'] = $new_instance['character_count'];
-        $instance['tab_layout'] = $new_instance['tab_layout'];
-        $instance['excerpt_type'] = $new_instance['excerpt_type'];
-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
-        else
-            $instance['add_location_filter'] = '0';
-        $instance['use_viewing_post_type'] = isset($new_instance['use_viewing_post_type']) && $new_instance['use_viewing_post_type'] ? 1 : 0;
-        return $instance;
-    }
+	{
+		$instance = $old_instance;
+		$instance['title'] = strip_tags($new_instance['title']);
+		$instance['post_type'] = strip_tags($new_instance['post_type']);
+		$instance['post_limit'] = strip_tags($new_instance['post_limit']);
+		$instance['categ_limit'] = strip_tags($new_instance['categ_limit']);
+		$instance['character_count'] = $new_instance['character_count'];
+		$instance['tab_layout'] = $new_instance['tab_layout'];
+		$instance['excerpt_type'] = $new_instance['excerpt_type'];
+		if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
+			$instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
+		else
+			$instance['add_location_filter'] = '0';
+		$instance['use_viewing_post_type'] = isset($new_instance['use_viewing_post_type']) && $new_instance['use_viewing_post_type'] ? 1 : 0;
+		return $instance;
+	}
 
 	/**
 	 * Back-end best of widget settings form.
 	 *
 	 * @since 1.3.9
-     * @since 1.5.1 Declare function public.
+	 * @since 1.5.1 Declare function public.
 	 *
 	 * @param array $instance Previously saved values from database.
 	 */
 	public function form($instance)
-    {
-        $instance = wp_parse_args((array)$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' => ''
-            )
-        );
-        $title = strip_tags($instance['title']);
-        $post_type = strip_tags($instance['post_type']);
-        $post_limit = strip_tags($instance['post_limit']);
-        $categ_limit = strip_tags($instance['categ_limit']);
-        $character_count = strip_tags($instance['character_count']);
-        $tab_layout = strip_tags($instance['tab_layout']);
-        $excerpt_type = strip_tags($instance['excerpt_type']);
-        $add_location_filter = strip_tags($instance['add_location_filter']);
-        $use_viewing_post_type = isset($instance['use_viewing_post_type']) && $instance['use_viewing_post_type'] ? true : false;
-
-        ?>
+	{
+		$instance = wp_parse_args((array)$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' => ''
+			)
+		);
+		$title = strip_tags($instance['title']);
+		$post_type = strip_tags($instance['post_type']);
+		$post_limit = strip_tags($instance['post_limit']);
+		$categ_limit = strip_tags($instance['categ_limit']);
+		$character_count = strip_tags($instance['character_count']);
+		$tab_layout = strip_tags($instance['tab_layout']);
+		$excerpt_type = strip_tags($instance['excerpt_type']);
+		$add_location_filter = strip_tags($instance['add_location_filter']);
+		$use_viewing_post_type = isset($instance['use_viewing_post_type']) && $instance['use_viewing_post_type'] ? true : false;
+
+		?>
         <p>
             <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>
 
@@ -428,9 +428,9 @@ 
                     <?php foreach ($postypes as $postypes_obj) { ?>
 
                         <option <?php if ($post_type == $postypes_obj) {
-                            echo 'selected="selected"';
-                        } ?> value="<?php echo $postypes_obj; ?>"><?php $extvalue = explode('_', $postypes_obj);
-                            echo ucfirst($extvalue[1]); ?></option>
+							echo 'selected="selected"';
+						} ?> value="<?php echo $postypes_obj; ?>"><?php $extvalue = explode('_', $postypes_obj);
+							echo ucfirst($extvalue[1]); ?></option>
 
                     <?php } ?>
 
@@ -476,14 +476,14 @@ 
                         name="<?php echo $this->get_field_name('tab_layout'); ?>">
 
                     <option <?php if ($tab_layout == 'bestof-tabs-on-top') {
-                        echo 'selected="selected"';
-                    } ?> value="bestof-tabs-on-top"><?php _e('Tabs on Top', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="bestof-tabs-on-top"><?php _e('Tabs on Top', 'geodirectory'); ?></option>
                     <option <?php if ($tab_layout == 'bestof-tabs-on-left') {
-                        echo 'selected="selected"';
-                    } ?> value="bestof-tabs-on-left"><?php _e('Tabs on Left', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="bestof-tabs-on-left"><?php _e('Tabs on Left', 'geodirectory'); ?></option>
                     <option <?php if ($tab_layout == 'bestof-tabs-as-dropdown') {
-                        echo 'selected="selected"';
-                    } ?>
+						echo 'selected="selected"';
+					} ?>
                         value="bestof-tabs-as-dropdown"><?php _e('Tabs as Dropdown', 'geodirectory'); ?></option>
                 </select>
             </label>
@@ -497,11 +497,11 @@ 
                         name="<?php echo $this->get_field_name('excerpt_type'); ?>">
 
                     <option <?php if ($excerpt_type == 'show-desc') {
-                        echo 'selected="selected"';
-                    } ?> value="show-desc"><?php _e('Show Description', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="show-desc"><?php _e('Show Description', 'geodirectory'); ?></option>
                     <option <?php if ($excerpt_type == 'show-reviews') {
-                        echo 'selected="selected"';
-                    } ?> value="show-reviews"><?php _e('Show Reviews if Available', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="show-reviews"><?php _e('Show Reviews if Available', 'geodirectory'); ?></option>
                 </select>
             </label>
         </p>
@@ -520,12 +520,12 @@ 
                 for="<?php echo $this->get_field_id('use_viewing_post_type'); ?>"><?php _e('Use current viewing post type:', 'geodirectory'); ?>
                 <input type="checkbox" id="<?php echo $this->get_field_id('use_viewing_post_type'); ?>"
                        name="<?php echo $this->get_field_name('use_viewing_post_type'); ?>" <?php if ($use_viewing_post_type) {
-                    echo 'checked="checked"';
-                } ?>  value="1"/>
+					echo 'checked="checked"';
+				} ?>  value="1"/>
             </label>
         </p>
     <?php
-    }
+	}
 } // class geodir_bestof_widget
 
 register_widget('geodir_bestof_widget');
@@ -544,46 +544,46 @@ 
  * @param array $query_args The query array.
  */
 function geodir_bestof_places_by_term($query_args) {
-    global $gd_session;
+	global $gd_session;
 	
 	/**
-     * This action called before querying widget listings.
-     *
-     * @since 1.0.0
-     */
-    do_action('geodir_bestof_get_widget_listings_before');
+	 * This action called before querying widget listings.
+	 *
+	 * @since 1.0.0
+	 */
+	do_action('geodir_bestof_get_widget_listings_before');
 
-    $widget_listings = geodir_get_widget_listings($query_args);
+	$widget_listings = geodir_get_widget_listings($query_args);
 
-    /**
-     * This action called after querying widget listings.
-     *
-     * @since 1.0.0
-     */
-    do_action('geodir_bestof_get_widget_listings_after');
+	/**
+	 * This action called after querying widget listings.
+	 *
+	 * @since 1.0.0
+	 */
+	do_action('geodir_bestof_get_widget_listings_after');
 
-    $character_count = isset($query_args['excerpt_length']) ? $query_args['excerpt_length'] : '';
+	$character_count = isset($query_args['excerpt_length']) ? $query_args['excerpt_length'] : '';
 
-    if (!isset($character_count)) {
+	if (!isset($character_count)) {
 		/** This filter is documented in geodirectory-widgets/geodirectory_bestof_widget.php */
 		$character_count = $character_count == '' ? 50 : apply_filters('bestof_widget_character_count', $character_count);
-    }
+	}
 	
 	/** This filter is documented in geodirectory-functions/general_functions.php */
 	$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
 
-    global $post, $map_jason, $map_canvas_arr, $gridview_columns_widget, $geodir_is_widget_listing;
-    $current_post = $post;
-    $current_map_jason = $map_jason;
-    $current_map_canvas_arr = $map_canvas_arr;
-    $current_grid_view = $gridview_columns_widget;
-    $gridview_columns_widget = null;
+	global $post, $map_jason, $map_canvas_arr, $gridview_columns_widget, $geodir_is_widget_listing;
+	$current_post = $post;
+	$current_map_jason = $map_jason;
+	$current_map_canvas_arr = $map_canvas_arr;
+	$current_grid_view = $gridview_columns_widget;
+	$gridview_columns_widget = null;
     
 	$gd_listing_view_set = $gd_session->get('gd_listing_view') ? true : false;
 	$gd_listing_view_old = $gd_listing_view_set ? $gd_session->get('gd_listing_view') : '';
 	
-    $gd_session->set('gd_listing_view', '1');
-    $geodir_is_widget_listing = true;
+	$gd_session->set('gd_listing_view', '1');
+	$geodir_is_widget_listing = true;
 
 	/**
 	 * Includes the template for the listing listview.
@@ -592,20 +592,20 @@ 
 	 */
 	include($template);
 
-    $geodir_is_widget_listing = false;
+	$geodir_is_widget_listing = false;
 
-    $GLOBALS['post'] = $current_post;
+	$GLOBALS['post'] = $current_post;
 	if (!empty($current_post)) {
-    	setup_postdata($current_post);
+		setup_postdata($current_post);
 	}
 	if ($gd_listing_view_set) { // Set back previous value
 		$gd_session->set('gd_listing_view', $gd_listing_view_old);
 	} else {
 		$gd_session->un_set('gd_listing_view');
 	}
-    $map_jason = $current_map_jason;
-    $map_canvas_arr = $current_map_canvas_arr;
-    $gridview_columns_widget = $current_grid_view;
+	$map_jason = $current_map_jason;
+	$map_canvas_arr = $current_map_canvas_arr;
+	$gridview_columns_widget = $current_grid_view;
 }
 
 //Ajax functions
@@ -622,52 +622,52 @@ 
  */
 function geodir_bestof_callback()
 {
-    check_ajax_referer('geodir-bestof-nonce', 'geodir_bestof_nonce');
-    //set variables
-    $post_type = strip_tags(esc_sql($_POST['post_type']));
-    $post_limit = strip_tags(esc_sql($_POST['post_limit']));
-    $character_count = strip_tags(esc_sql($_POST['char_count']));
-    $taxonomy = strip_tags(esc_sql($_POST['taxonomy']));
-    $add_location_filter = strip_tags(esc_sql($_POST['add_location_filter']));
-    $term_id = strip_tags(esc_sql($_POST['term_id']));
-    $excerpt_type = '';
-    $excerpt_type = strip_tags(esc_sql($_POST['excerpt_type']));
-
-    $query_args = array(
-        'posts_per_page' => $post_limit,
-        'is_geodir_loop' => true,
-        'post_type' => $post_type,
-        'gd_location' => $add_location_filter ? true : false,
-        'order_by' => 'high_review'
-    );
-
-    if ($character_count >= 0) {
-        $query_args['excerpt_length'] = $character_count;
-    }
-
-    $tax_query = array(
-        'taxonomy' => $taxonomy,
-        'field' => 'id',
-        'terms' => $term_id
-    );
-
-    $query_args['tax_query'] = array($tax_query);
-    if ($term_id && $taxonomy) {
-        $term = get_term_by('id', $term_id, $taxonomy);
-        $view_all_link = add_query_arg(array('sort_by' => 'rating_count_desc'), get_term_link($term)) ;
+	check_ajax_referer('geodir-bestof-nonce', 'geodir_bestof_nonce');
+	//set variables
+	$post_type = strip_tags(esc_sql($_POST['post_type']));
+	$post_limit = strip_tags(esc_sql($_POST['post_limit']));
+	$character_count = strip_tags(esc_sql($_POST['char_count']));
+	$taxonomy = strip_tags(esc_sql($_POST['taxonomy']));
+	$add_location_filter = strip_tags(esc_sql($_POST['add_location_filter']));
+	$term_id = strip_tags(esc_sql($_POST['term_id']));
+	$excerpt_type = '';
+	$excerpt_type = strip_tags(esc_sql($_POST['excerpt_type']));
+
+	$query_args = array(
+		'posts_per_page' => $post_limit,
+		'is_geodir_loop' => true,
+		'post_type' => $post_type,
+		'gd_location' => $add_location_filter ? true : false,
+		'order_by' => 'high_review'
+	);
+
+	if ($character_count >= 0) {
+		$query_args['excerpt_length'] = $character_count;
+	}
+
+	$tax_query = array(
+		'taxonomy' => $taxonomy,
+		'field' => 'id',
+		'terms' => $term_id
+	);
+
+	$query_args['tax_query'] = array($tax_query);
+	if ($term_id && $taxonomy) {
+		$term = get_term_by('id', $term_id, $taxonomy);
+		$view_all_link = add_query_arg(array('sort_by' => 'rating_count_desc'), get_term_link($term)) ;
 		/** This filter is documented in geodirectory-widgets/geodirectory_bestof_widget.php */
 		$view_all_link = apply_filters('geodir_bestof_widget_view_all_link', $view_all_link, $post_type, $term);
 				
 		echo '<h3 class="bestof-cat-title">' . wp_sprintf( __( 'Best of %s', 'geodirectory' ), $term->name ) . '<a href="' . esc_url( $view_all_link ) . '">' . __("View all", 'geodirectory') . '</a></h3>';
-    }
-    if ($excerpt_type == 'show-reviews') {
-        add_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
-    }
-    geodir_bestof_places_by_term($query_args);
-    if ($excerpt_type == 'show-reviews') {
-        remove_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
-    }
-    wp_die();
+	}
+	if ($excerpt_type == 'show-reviews') {
+		add_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
+	}
+	geodir_bestof_places_by_term($query_args);
+	if ($excerpt_type == 'show-reviews') {
+		remove_filter('get_the_excerpt', 'best_of_show_review_in_excerpt');
+	}
+	wp_die();
 }
 
 //Javascript
@@ -752,7 +752,7 @@ 
 }
 
 function best_of_show_review_in_excerpt($excerpt) {
-    global $wpdb, $post;
+	global $wpdb, $post;
 //    $args = array(
 //                'status' => 'approve',
 //                'number' => 10,
@@ -760,17 +760,17 @@ 
 //                'post_id' => $post->ID
 //            );
 
-    $review_table = GEODIR_REVIEW_TABLE;
-    $request = "SELECT comment_ID FROM $review_table WHERE post_id = $post->ID ORDER BY post_date DESC, id DESC LIMIT 1";
-    $comments = $wpdb->get_results($request);
-
-    if ($comments) {
-        foreach($comments as $comment) {
-            // Set the extra comment info needed.
-            $comment_extra = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID");
-            $comment_content = $comment_extra->comment_content;
-            $excerpt = strip_tags( $comment_content );
-        }
-    }
-    return $excerpt;
+	$review_table = GEODIR_REVIEW_TABLE;
+	$request = "SELECT comment_ID FROM $review_table WHERE post_id = $post->ID ORDER BY post_date DESC, id DESC LIMIT 1";
+	$comments = $wpdb->get_results($request);
+
+	if ($comments) {
+		foreach($comments as $comment) {
+			// Set the extra comment info needed.
+			$comment_extra = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID");
+			$comment_content = $comment_extra->comment_content;
+			$excerpt = strip_tags( $comment_content );
+		}
+	}
+	return $excerpt;
 }
\ No newline at end of file

Braces +9 added lines, -5 removed lines

@@ -356,10 +356,11 @@ 
         $instance['character_count'] = $new_instance['character_count'];
         $instance['tab_layout'] = $new_instance['tab_layout'];
         $instance['excerpt_type'] = $new_instance['excerpt_type'];
-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
-        else
-            $instance['add_location_filter'] = '0';
+        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '') {
+                    $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
+        } else {
+                    $instance['add_location_filter'] = '0';
+        }
         $instance['use_viewing_post_type'] = isset($new_instance['use_viewing_post_type']) && $new_instance['use_viewing_post_type'] ? 1 : 0;
         return $instance;
     }
@@ -510,7 +511,10 @@ 
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">
                 <?php _e('Enable Location Filter:', 'geodirectory');?>
                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"
-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>
+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) {
+	echo 'checked="checked"';
+}
+?>
                        value="1"/>
             </label>
         </p>

geodirectory-widgets/geodirectory_cpt_categories_widget.php

Spacing +31 added lines, -31 removed lines

@@ -146,7 +146,7 @@ 
         $output = geodir_cpt_categories_output($params);
 
         echo $args['before_widget'];
-        if ( $params['title'] ) {
+        if ($params['title']) {
             echo '<div class="geodir_list_heading clearfix">';
             echo $args['before_title'] . $params['title'] . $args['after_title'];
             echo '</div>';
@@ -191,7 +191,7 @@ 
      * @param array $instance Previously saved values from database.
      */
     public function form($instance) {
-        $instance = wp_parse_args( (array)$instance,
+        $instance = wp_parse_args((array) $instance,
             array(
                 'title' => '',
                 'post_type' => array(), // NULL for all
@@ -221,42 +221,42 @@ 
         <p>
             <label for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Select CPT:', 'geodirectory'); ?></label>
             <select name="<?php echo $this->get_field_name('post_type'); ?>[]" id="<?php echo $this->get_field_id('post_type'); ?>" class="widefat" multiple="multiple">
-                <option value="0" <?php selected( (empty($post_type) || (is_array($post_type) && in_array('0', $post_type))), true ); ?>><?php _e('All', 'geodirectory'); ?></option>
+                <option value="0" <?php selected((empty($post_type) || (is_array($post_type) && in_array('0', $post_type))), true); ?>><?php _e('All', 'geodirectory'); ?></option>
                 <?php foreach ($post_type_options as $name => $title) { ?>
-                    <option value="<?php echo $name;?>" <?php selected( is_array($post_type) && in_array($name, $post_type), true ); ?>><?php echo $title; ?></option>
+                    <option value="<?php echo $name; ?>" <?php selected(is_array($post_type) && in_array($name, $post_type), true); ?>><?php echo $title; ?></option>
                 <?php } ?>
             </select>
         </p>
-        <p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_empty'); ?>" name="<?php echo $this->get_field_name('hide_empty'); ?>"<?php checked( $hide_empty ); ?> value="1" />
-            <label for="<?php echo $this->get_field_id('hide_empty'); ?>"><?php _e( 'Hide empty categories', 'geodirectory' ); ?></label><br />
-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('show_count'); ?>" name="<?php echo $this->get_field_name('show_count'); ?>"<?php checked( $show_count ); ?> value="1" />
-            <label for="<?php echo $this->get_field_id('show_count'); ?>"><?php _e( 'Show category count' ); ?></label> <small><?php _e( '( Enabling will slow down page loading for big directories. )', 'geodirectory' ); ?></small><br />
-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_icon'); ?>" name="<?php echo $this->get_field_name('hide_icon'); ?>"<?php checked( $hide_icon ); ?> value="1" />
-            <label for="<?php echo $this->get_field_id('hide_icon'); ?>"><?php _e( 'Hide category icon', 'geodirectory' ); ?></label><br />
-            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('cpt_left'); ?>" name="<?php echo $this->get_field_name('cpt_left'); ?>"<?php checked( $cpt_left ); ?> value="1" />
-            <label for="<?php echo $this->get_field_id('cpt_left'); ?>"><?php _e( 'Show CPT on same line', 'geodirectory' ); ?></label>
+        <p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_empty'); ?>" name="<?php echo $this->get_field_name('hide_empty'); ?>"<?php checked($hide_empty); ?> value="1" />
+            <label for="<?php echo $this->get_field_id('hide_empty'); ?>"><?php _e('Hide empty categories', 'geodirectory'); ?></label><br />
+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('show_count'); ?>" name="<?php echo $this->get_field_name('show_count'); ?>"<?php checked($show_count); ?> value="1" />
+            <label for="<?php echo $this->get_field_id('show_count'); ?>"><?php _e('Show category count'); ?></label> <small><?php _e('( Enabling will slow down page loading for big directories. )', 'geodirectory'); ?></small><br />
+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hide_icon'); ?>" name="<?php echo $this->get_field_name('hide_icon'); ?>"<?php checked($hide_icon); ?> value="1" />
+            <label for="<?php echo $this->get_field_id('hide_icon'); ?>"><?php _e('Hide category icon', 'geodirectory'); ?></label><br />
+            <input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('cpt_left'); ?>" name="<?php echo $this->get_field_name('cpt_left'); ?>"<?php checked($cpt_left); ?> value="1" />
+            <label for="<?php echo $this->get_field_id('cpt_left'); ?>"><?php _e('Show CPT on same line', 'geodirectory'); ?></label>
         <p>
             <label for="<?php echo $this->get_field_id('sort_by'); ?>"><?php _e('Sort by:', 'geodirectory'); ?></label>
             <select name="<?php echo $this->get_field_name('sort_by'); ?>" id="<?php echo $this->get_field_id('sort_by'); ?>" class="widefat">
-                <option value="az" <?php selected( $sort_by, 'az' ); ?>><?php _e('A-Z', 'geodirectory'); ?></option>
-                <option value="count" <?php selected( $sort_by, 'count' ); ?>><?php _e('Count', 'geodirectory'); ?></option>
+                <option value="az" <?php selected($sort_by, 'az'); ?>><?php _e('A-Z', 'geodirectory'); ?></option>
+                <option value="count" <?php selected($sort_by, 'count'); ?>><?php _e('Count', 'geodirectory'); ?></option>
             </select>
         </p>
         <p>
             <label for="<?php echo $this->get_field_id('max_count'); ?>"><?php _e('Max no of sub-categories:', 'geodirectory'); ?></label>
             <select name="<?php echo $this->get_field_name('max_count'); ?>" id="<?php echo $this->get_field_id('max_count'); ?>" class="widefat">
-                <option value="all" <?php selected( $max_count, 'all' ); ?>><?php _e('All', 'geodirectory'); ?></option>
+                <option value="all" <?php selected($max_count, 'all'); ?>><?php _e('All', 'geodirectory'); ?></option>
                 <?php for ($n = 10; $n >= 0; $n--) { ?>
-                    <option value="<?php echo $n;?>" <?php selected( $max_count, $n ); ?>><?php echo $n; ?></option>
+                    <option value="<?php echo $n; ?>" <?php selected($max_count, $n); ?>><?php echo $n; ?></option>
                 <?php } ?>
             </select>
         </p>
         <p>
             <label for="<?php echo $this->get_field_id('max_level'); ?>"><?php _e('Show max sub-categories depth:', 'geodirectory'); ?></label>
             <select name="<?php echo $this->get_field_name('max_level'); ?>" id="<?php echo $this->get_field_id('max_level'); ?>" class="widefat">
-                <option value="all" <?php selected( $max_level, 'all' ); ?>><?php _e('All', 'geodirectory'); ?></option>
+                <option value="all" <?php selected($max_level, 'all'); ?>><?php _e('All', 'geodirectory'); ?></option>
                 <?php for ($n = 0; $n <= 10; $n++) { ?>
-                    <option value="<?php echo $n;?>" <?php selected( $max_level, $n ); ?>><?php echo $n; ?></option>
+                    <option value="<?php echo $n; ?>" <?php selected($max_level, $n); ?>><?php echo $n; ?></option>
                 <?php } ?>
             </select>
         </p>
@@ -275,7 +275,7 @@ 
  * @return string CPT categories content.
  */
 function geodir_cpt_categories_output($params) {
-    $args = wp_parse_args((array)$params,
+    $args = wp_parse_args((array) $params,
         array(
             'title' => '',
             'post_type' => array(), // NULL for all
@@ -345,15 +345,15 @@ 
     $hide_empty = !empty($args['hide_empty']) ? true : false;
     $max_count = strip_tags($args['max_count']);
     $all_childs = $max_count == 'all' ? true : false;
-    $max_count = $max_count > 0 ? (int)$max_count : 0;
+    $max_count = $max_count > 0 ? (int) $max_count : 0;
     $max_level = strip_tags($args['max_level']);
     $show_count = !empty($args['show_count']) ? true : false;
     $hide_icon = !empty($args['hide_icon']) ? true : false;
     $cpt_left = !empty($args['cpt_left']) ? true : false;
 
-    if(!$cpt_left){
+    if (!$cpt_left) {
         $cpt_left = "gd-cpt-flat";
-    }else{
+    } else {
         $cpt_left = '';
     }
 
@@ -383,7 +383,7 @@ 
                 if ($is_listing) {
                     $row_class = $is_category ? ' gd-cptcat-categ' : ' gd-cptcat-listing';
                 }
-                $cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' '.$cpt_left.'">';
+                $cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' ' . $cpt_left . '">';
 
                 if ($is_category) {
                     $term_info = get_term($current_term_id, $cat_taxonomy);
@@ -400,15 +400,15 @@ 
                     $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
                     $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
 
-                    $term_link = get_term_link( $category, $category->taxonomy );
+                    $term_link = get_term_link($category, $category->taxonomy);
                     /** Filter documented in geodirectory-functions/general_functions.php **/
-                    $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
+                    $term_link = apply_filters('geodir_category_term_link', $term_link, $category->term_id, $cpt);
 
-                    $cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent  '.$cpt_left.'">';
+                    $cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent  ' . $cpt_left . '">';
                     $cpt_row .= '<li class="gd-cptcat-li gd-cptcat-li-main">';
                     $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
-                    $cpt_row .= '<h3 class="gd-cptcat-cat"><a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">'  .$term_icon_url . $category->name . $count . '</a></h3>';
-                    if (($all_childs || $max_count > 0) && ($max_level == 'all' || (int)$max_level > 0)) {
+                    $cpt_row .= '<h3 class="gd-cptcat-cat"><a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' . $term_icon_url . $category->name . $count . '</a></h3>';
+                    if (($all_childs || $max_count > 0) && ($max_level == 'all' || (int) $max_level > 0)) {
                         $cpt_row .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons);
                     }
                     $cpt_row .= '</li>';
@@ -449,7 +449,7 @@ 
         $order = 'ASC';
     }
 
-    if ($max_level != 'all' && $depth > (int)$max_level ) {
+    if ($max_level != 'all' && $depth > (int) $max_level) {
         return '';
     }
 
@@ -471,9 +471,9 @@ 
     foreach ($child_cats as $category) {
         $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
         $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
-        $term_link = get_term_link( $category, $category->taxonomy );
+        $term_link = get_term_link($category, $category->taxonomy);
         /** Filter documented in geodirectory-functions/general_functions.php **/
-        $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
+        $term_link = apply_filters('geodir_category_term_link', $term_link, $category->term_id, $cpt);
         $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
 
         $content .= '<li class="gd-cptcat-li gd-cptcat-li-sub">';

Braces +1 added lines, -1 removed lines

@@ -353,7 +353,7 @@
 
     if(!$cpt_left){
         $cpt_left = "gd-cpt-flat";
-    }else{
+    } else{
         $cpt_left = '';
     }
 

Indentation +410 added lines, -410 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * GeoDirectory cpt categories widget.
- *
- * @package GeoDirectory
- * @since 1.5.4
- */
+	 * GeoDirectory cpt categories widget.
+	 *
+	 * @package GeoDirectory
+	 * @since 1.5.4
+	 */
 
 /**
  * GeoDirectory CPT categories widget class.
@@ -13,210 +13,210 @@ 
  */
 class geodir_cpt_categories_widget extends WP_Widget {
 
-    /**
-     * Register the cpt categories with WordPress.
-     *
-     * @since 1.5.4
-     */
-    public function __construct() {
-        $widget_ops = array('classname' => 'geodir_cpt_categories_widget', 'description' => __('A list of GeoDirectory CPT categories.', 'geodirectory'));
-        parent::__construct('geodir_cpt_categories_widget', __('GD > CPT Categories', 'geodirectory'), $widget_ops);
-    }
-
-    /**
-     * Front-end display content for cpt categories widget.
-     *
-     * @since 1.5.4
-     *
-     * @param array $args Widget arguments.
-     * @param array $instance Saved values from database.
-     */
-    public function widget($args, $instance) {
-        $params = array();
-        /**
-         * Filter the widget title.
-         *
-         * @since 1.5.4
-         *
-         * @param string $title The widget title. Default empty.
-         * @param array  $instance An array of the widget's settings.
-         * @param mixed  $id_base The widget ID.
-         */
-        $params['title'] = apply_filters('geodir_cpt_categories_widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base);
-
-        /**
-         * Filter the widget setting post type.
-         *
-         * @since 1.5.4
-         *
-         * @param array $post_type The post types to display categories.
-         * @param array $instance An array of the widget's settings.
-         * @param mixed $id_base The widget ID.
-         */
-        $params['post_type'] = apply_filters('geodir_cpt_categories_widget_post_type', empty($instance['post_type']) ? array() : $instance['post_type'], $instance, $this->id_base);
-
-        /**
-         * Filter the widget setting to hide empty categories.
-         *
-         * @since 1.5.4
-         *
-         * @param bool  $hide_empty If true then empty category will be not displayed.
-         * @param array $instance An array of the widget's settings.
-         * @param mixed $id_base The widget ID.
-         */
-        $params['hide_empty'] = apply_filters('geodir_cpt_categories_widget_hide_empty', empty($instance['hide_empty']) ? 0 : 1, $instance, $this->id_base);
-
-        /**
-         * Filter the widget setting to show/hide category count.
-         *
-         * @since 1.5.4
-         *
-         * @param bool  $show_count If true then category count will be displayed.
-         * @param array $instance An array of the widget's settings.
-         * @param mixed $id_base The widget ID.
-         */
-        $params['show_count'] = apply_filters('geodir_cpt_categories_widget_show_count', empty($instance['show_count']) ? 0 : 1, $instance, $this->id_base);
-
-        /**
-         * Filter the widget setting to show/hide category icon.
-         *
-         * @since 1.5.4
-         *
-         * @param bool  $hide_icon If true then category icon will be not displayed.
-         * @param array $instance An array of the widget's settings.
-         * @param mixed $id_base The widget ID.
-         */
-        $params['hide_icon'] = apply_filters('geodir_cpt_categories_widget_hide_icon', empty($instance['hide_icon']) ? 0 : 1, $instance, $this->id_base);
-
-        /**
-         * Filter the widget setting to show CPT inline or not.
-         *
-         * @since 1.5.4
-         *
-         * @param bool  $cpt_left If true then CPT will be displayed inline.
-         * @param array $instance An array of the widget's settings.
-         * @param mixed $id_base The widget ID.
-         */
-        $params['cpt_left'] = apply_filters('geodir_cpt_categories_widget_cpt_left', empty($instance['cpt_left']) ? 0 : 1, $instance, $this->id_base);
-
-        /**
-         * Filter the widget categories sorting order settings.
-         *
-         * @since 1.5.4
-         *
-         * @param string $max_count Widget max no of sub-categories count. Default 'count'.
-         * @param array       $instance An array of the widget's settings.
-         * @param mixed       $id_base The widget ID.
-         */
-        $params['sort_by'] = apply_filters('geodir_cpt_categories_widget_sort_by', isset($instance['sort_by']) && in_array($instance['sort_by'], array('az', 'count')) ? $instance['sort_by'] : 'count', $instance, $this->id_base);
-
-        /**
-         * Filter the widget max no of sub-categories count.
-         *
-         * @since 1.5.4
-         *
-         * @param bool|string $max_count Widget max no of sub-categories count.
-         * @param array       $instance An array of the widget's settings.
-         * @param mixed       $id_base The widget ID.
-         */
-        $params['max_count'] = apply_filters('geodir_cpt_categories_widget_max_count', !isset($instance['max_count']) ? 'all' : strip_tags($instance['max_count']), $instance, $this->id_base);
-
-        /**
-         * Filter the widget max sub-categories depth.
-         *
-         * @since 1.5.4
-         *
-         * @param bool|string $max_level Widget max sub-categories depth.
-         * @param array       $instance An array of the widget's settings.
-         * @param mixed       $id_base The widget ID.
-         */
-        $params['max_level'] = apply_filters('geodir_cpt_categories_widget_max_level', !isset($instance['max_level']) ? 'all' : strip_tags($instance['max_level']), $instance, $this->id_base);
-
-        /**
-         * Filter the widget parameters.
-         *
-         * @since 1.5.4
-         *
-         * @param array $params The widget parameters.
-         * @param array $instance An array of the widget's settings.
-         * @param mixed $id_base The widget ID.
-         */
-        $params = apply_filters('geodir_cpt_categories_widget_params', $params, $instance, $this->id_base);
-
-        $output = geodir_cpt_categories_output($params);
-
-        echo $args['before_widget'];
-        if ( $params['title'] ) {
-            echo '<div class="geodir_list_heading clearfix">';
-            echo $args['before_title'] . $params['title'] . $args['after_title'];
-            echo '</div>';
-        }
-        echo '<div class="gd-cptcats-widget">';
-        echo $output;
-        echo '</div>';
-        echo $args['after_widget'];
-    }
-
-    /**
-     * Sanitize cpt categories widget values as they are saved.
-     *
-     * @since 1.5.4
-     *
-     * @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) {
-        $new_instance['post_type'] = is_array($new_instance['post_type']) && in_array('0', $new_instance['post_type']) ? array('0') : $new_instance['post_type'];
-        $instance = $old_instance;
-        $instance['title'] = strip_tags($new_instance['title']);
-        $instance['post_type'] = isset($new_instance['post_type']) ? $new_instance['post_type'] : array('0');
-        $instance['hide_empty'] = !empty($new_instance['hide_empty']) ? 1 : 0;
-        $instance['show_count'] = !empty($new_instance['show_count']) ? 1 : 0;
-        $instance['hide_icon'] = !empty($new_instance['hide_icon']) ? 1 : 0;
-        $instance['cpt_left'] = !empty($new_instance['cpt_left']) ? 1 : 0;
-        $instance['sort_by'] = isset($new_instance['sort_by']) && in_array($new_instance['sort_by'], array('az', 'count')) ? $new_instance['sort_by'] : 'count';
-        $instance['max_count'] = strip_tags($new_instance['max_count']);
-        $instance['max_level'] = strip_tags($new_instance['max_level']);
-
-        return $instance;
-    }
-
-    /**
-     * Back-end cpt categories settings form.
-     *
-     * @since 1.5.4
-     *
-     * @param array $instance Previously saved values from database.
-     */
-    public function form($instance) {
-        $instance = wp_parse_args( (array)$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'
-            )
-        );
-
-        $title = strip_tags($instance['title']);
-        $post_type = $instance['post_type'];
-        $hide_empty = !empty($instance['hide_empty']) ? true : false;
-        $show_count = !empty($instance['show_count']) ? true : false;
-        $hide_icon = !empty($instance['hide_icon']) ? true : false;
-        $cpt_left = !empty($instance['cpt_left']) ? true : false;
-        $max_count = strip_tags($instance['max_count']);
-        $max_level = strip_tags($instance['max_level']);
-        $sort_by = isset($instance['sort_by']) && in_array($instance['sort_by'], array('az', 'count')) ? $instance['sort_by'] : 'count';
-
-        $post_type_options = geodir_get_posttypes('options');
-        ?>
+	/**
+	 * Register the cpt categories with WordPress.
+	 *
+	 * @since 1.5.4
+	 */
+	public function __construct() {
+		$widget_ops = array('classname' => 'geodir_cpt_categories_widget', 'description' => __('A list of GeoDirectory CPT categories.', 'geodirectory'));
+		parent::__construct('geodir_cpt_categories_widget', __('GD > CPT Categories', 'geodirectory'), $widget_ops);
+	}
+
+	/**
+	 * Front-end display content for cpt categories widget.
+	 *
+	 * @since 1.5.4
+	 *
+	 * @param array $args Widget arguments.
+	 * @param array $instance Saved values from database.
+	 */
+	public function widget($args, $instance) {
+		$params = array();
+		/**
+		 * Filter the widget title.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param string $title The widget title. Default empty.
+		 * @param array  $instance An array of the widget's settings.
+		 * @param mixed  $id_base The widget ID.
+		 */
+		$params['title'] = apply_filters('geodir_cpt_categories_widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base);
+
+		/**
+		 * Filter the widget setting post type.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param array $post_type The post types to display categories.
+		 * @param array $instance An array of the widget's settings.
+		 * @param mixed $id_base The widget ID.
+		 */
+		$params['post_type'] = apply_filters('geodir_cpt_categories_widget_post_type', empty($instance['post_type']) ? array() : $instance['post_type'], $instance, $this->id_base);
+
+		/**
+		 * Filter the widget setting to hide empty categories.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param bool  $hide_empty If true then empty category will be not displayed.
+		 * @param array $instance An array of the widget's settings.
+		 * @param mixed $id_base The widget ID.
+		 */
+		$params['hide_empty'] = apply_filters('geodir_cpt_categories_widget_hide_empty', empty($instance['hide_empty']) ? 0 : 1, $instance, $this->id_base);
+
+		/**
+		 * Filter the widget setting to show/hide category count.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param bool  $show_count If true then category count will be displayed.
+		 * @param array $instance An array of the widget's settings.
+		 * @param mixed $id_base The widget ID.
+		 */
+		$params['show_count'] = apply_filters('geodir_cpt_categories_widget_show_count', empty($instance['show_count']) ? 0 : 1, $instance, $this->id_base);
+
+		/**
+		 * Filter the widget setting to show/hide category icon.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param bool  $hide_icon If true then category icon will be not displayed.
+		 * @param array $instance An array of the widget's settings.
+		 * @param mixed $id_base The widget ID.
+		 */
+		$params['hide_icon'] = apply_filters('geodir_cpt_categories_widget_hide_icon', empty($instance['hide_icon']) ? 0 : 1, $instance, $this->id_base);
+
+		/**
+		 * Filter the widget setting to show CPT inline or not.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param bool  $cpt_left If true then CPT will be displayed inline.
+		 * @param array $instance An array of the widget's settings.
+		 * @param mixed $id_base The widget ID.
+		 */
+		$params['cpt_left'] = apply_filters('geodir_cpt_categories_widget_cpt_left', empty($instance['cpt_left']) ? 0 : 1, $instance, $this->id_base);
+
+		/**
+		 * Filter the widget categories sorting order settings.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param string $max_count Widget max no of sub-categories count. Default 'count'.
+		 * @param array       $instance An array of the widget's settings.
+		 * @param mixed       $id_base The widget ID.
+		 */
+		$params['sort_by'] = apply_filters('geodir_cpt_categories_widget_sort_by', isset($instance['sort_by']) && in_array($instance['sort_by'], array('az', 'count')) ? $instance['sort_by'] : 'count', $instance, $this->id_base);
+
+		/**
+		 * Filter the widget max no of sub-categories count.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param bool|string $max_count Widget max no of sub-categories count.
+		 * @param array       $instance An array of the widget's settings.
+		 * @param mixed       $id_base The widget ID.
+		 */
+		$params['max_count'] = apply_filters('geodir_cpt_categories_widget_max_count', !isset($instance['max_count']) ? 'all' : strip_tags($instance['max_count']), $instance, $this->id_base);
+
+		/**
+		 * Filter the widget max sub-categories depth.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param bool|string $max_level Widget max sub-categories depth.
+		 * @param array       $instance An array of the widget's settings.
+		 * @param mixed       $id_base The widget ID.
+		 */
+		$params['max_level'] = apply_filters('geodir_cpt_categories_widget_max_level', !isset($instance['max_level']) ? 'all' : strip_tags($instance['max_level']), $instance, $this->id_base);
+
+		/**
+		 * Filter the widget parameters.
+		 *
+		 * @since 1.5.4
+		 *
+		 * @param array $params The widget parameters.
+		 * @param array $instance An array of the widget's settings.
+		 * @param mixed $id_base The widget ID.
+		 */
+		$params = apply_filters('geodir_cpt_categories_widget_params', $params, $instance, $this->id_base);
+
+		$output = geodir_cpt_categories_output($params);
+
+		echo $args['before_widget'];
+		if ( $params['title'] ) {
+			echo '<div class="geodir_list_heading clearfix">';
+			echo $args['before_title'] . $params['title'] . $args['after_title'];
+			echo '</div>';
+		}
+		echo '<div class="gd-cptcats-widget">';
+		echo $output;
+		echo '</div>';
+		echo $args['after_widget'];
+	}
+
+	/**
+	 * Sanitize cpt categories widget values as they are saved.
+	 *
+	 * @since 1.5.4
+	 *
+	 * @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) {
+		$new_instance['post_type'] = is_array($new_instance['post_type']) && in_array('0', $new_instance['post_type']) ? array('0') : $new_instance['post_type'];
+		$instance = $old_instance;
+		$instance['title'] = strip_tags($new_instance['title']);
+		$instance['post_type'] = isset($new_instance['post_type']) ? $new_instance['post_type'] : array('0');
+		$instance['hide_empty'] = !empty($new_instance['hide_empty']) ? 1 : 0;
+		$instance['show_count'] = !empty($new_instance['show_count']) ? 1 : 0;
+		$instance['hide_icon'] = !empty($new_instance['hide_icon']) ? 1 : 0;
+		$instance['cpt_left'] = !empty($new_instance['cpt_left']) ? 1 : 0;
+		$instance['sort_by'] = isset($new_instance['sort_by']) && in_array($new_instance['sort_by'], array('az', 'count')) ? $new_instance['sort_by'] : 'count';
+		$instance['max_count'] = strip_tags($new_instance['max_count']);
+		$instance['max_level'] = strip_tags($new_instance['max_level']);
+
+		return $instance;
+	}
+
+	/**
+	 * Back-end cpt categories settings form.
+	 *
+	 * @since 1.5.4
+	 *
+	 * @param array $instance Previously saved values from database.
+	 */
+	public function form($instance) {
+		$instance = wp_parse_args( (array)$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'
+			)
+		);
+
+		$title = strip_tags($instance['title']);
+		$post_type = $instance['post_type'];
+		$hide_empty = !empty($instance['hide_empty']) ? true : false;
+		$show_count = !empty($instance['show_count']) ? true : false;
+		$hide_icon = !empty($instance['hide_icon']) ? true : false;
+		$cpt_left = !empty($instance['cpt_left']) ? true : false;
+		$max_count = strip_tags($instance['max_count']);
+		$max_level = strip_tags($instance['max_level']);
+		$sort_by = isset($instance['sort_by']) && in_array($instance['sort_by'], array('az', 'count')) ? $instance['sort_by'] : 'count';
+
+		$post_type_options = geodir_get_posttypes('options');
+		?>
         <p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory'); ?></label> <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); ?>" /></p>
         <p>
             <label for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Select CPT:', 'geodirectory'); ?></label>
@@ -261,7 +261,7 @@ 
             </select>
         </p>
     <?php
-    }
+	}
 } // class geodir_cpt_categories_widget
 
 register_widget('geodir_cpt_categories_widget');
@@ -275,152 +275,152 @@ 
  * @return string CPT categories content.
  */
 function geodir_cpt_categories_output($params) {
-    $args = wp_parse_args((array)$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',
-        )
-    );
-
-    $sort_by = isset($args['sort_by']) && in_array($args['sort_by'], array('az', 'count')) ? $args['sort_by'] : 'count';
-
-    $gd_post_types = geodir_get_posttypes('array');
-
-    $post_type_arr = !is_array($args['post_type']) ? explode(',', $args['post_type']) : $args['post_type'];
-    $current_posttype = geodir_get_current_posttype();
-
-    $is_listing = false;
-    $is_category = false;
-    if (geodir_is_page('listing')) {
-        $current_posttype = geodir_get_current_posttype();
-
-        if ($current_posttype != '' && isset($gd_post_types[$current_posttype])) {
-            $is_listing = true;
-
-            if (is_tax()) { // category page
-                $current_term_id = get_queried_object_id();
-                $current_taxonomy = get_query_var('taxonomy');
-                $current_posttype = geodir_get_current_posttype();
-
-                if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype . 'category') {
-                    $is_category = true;
-                }
-            }
-        }
-    }
-
-    $parent_category = 0;
-    if ($is_listing) {
-        $post_type_arr = array($current_posttype);
-
-        if ($is_category) {
-            $parent_category = $current_term_id;
-        }
-    }
-
-    $post_types = array();
-    if (!empty($post_type_arr)) {
-        if (in_array('0', $post_type_arr)) {
-            $post_types = $gd_post_types;
-        } else {
-            foreach ($post_type_arr as $cpt) {
-                if (isset($gd_post_types[$cpt])) {
-                    $post_types[$cpt] = $gd_post_types[$cpt];
-                }
-            }
-        }
-    }
-
-    if (empty($post_type_arr)) {
-        $post_types = $gd_post_types;
-    }
-
-    $hide_empty = !empty($args['hide_empty']) ? true : false;
-    $max_count = strip_tags($args['max_count']);
-    $all_childs = $max_count == 'all' ? true : false;
-    $max_count = $max_count > 0 ? (int)$max_count : 0;
-    $max_level = strip_tags($args['max_level']);
-    $show_count = !empty($args['show_count']) ? true : false;
-    $hide_icon = !empty($args['hide_icon']) ? true : false;
-    $cpt_left = !empty($args['cpt_left']) ? true : false;
-
-    if(!$cpt_left){
-        $cpt_left = "gd-cpt-flat";
-    }else{
-        $cpt_left = '';
-    }
-
-    $orderby = 'count';
-    $order = 'DESC';
-    if ($sort_by == 'az') {
-        $orderby = 'name';
-        $order = 'ASC';
-    }
-
-    $output = '';
-    if (!empty($post_types)) {
-        foreach ($post_types as $cpt => $cpt_info) {
-            $cat_taxonomy = $cpt . 'category';
-            $categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_category));
-            if ($hide_empty) {
-                $categories = geodir_filter_empty_terms($categories);
-            }
-            if ($sort_by == 'count') {
-                $categories = geodir_sort_terms($categories, 'count');
-            }
-
-            if (!empty($categories)) {
-                $term_icons = !$hide_icon ? geodir_get_term_icon() : array();
-                $row_class = '';
-
-                if ($is_listing) {
-                    $row_class = $is_category ? ' gd-cptcat-categ' : ' gd-cptcat-listing';
-                }
-                $cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' '.$cpt_left.'">';
-
-                if ($is_category) {
-                    $term_info = get_term($current_term_id, $cat_taxonomy);
-
-                    $term_icon_url = !empty($term_icons) && isset($term_icons[$term_info->term_id]) ? $term_icons[$term_info->term_id] : '';
-                    $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($term_info->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
-
-                    $count = $show_count ? ' <span class="gd-cptcat-count">(' . $term_info->count . ')</span>' : '';
-                    $cpt_row .= '<h2 class="gd-cptcat-title">' . $term_icon_url . $term_info->name . $count . '</h2>';
-                } else {
-                    $cpt_row .= '<h2 class="gd-cptcat-title">' . __($cpt_info['labels']['name'], 'geodirectory') . '</h2>';
-                }
-                foreach ($categories as $category) {
-                    $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
-                    $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
-
-                    $term_link = get_term_link( $category, $category->taxonomy );
-                    /** Filter documented in geodirectory-functions/general_functions.php **/
-                    $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
-
-                    $cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent  '.$cpt_left.'">';
-                    $cpt_row .= '<li class="gd-cptcat-li gd-cptcat-li-main">';
-                    $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
-                    $cpt_row .= '<h3 class="gd-cptcat-cat"><a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">'  .$term_icon_url . $category->name . $count . '</a></h3>';
-                    if (($all_childs || $max_count > 0) && ($max_level == 'all' || (int)$max_level > 0)) {
-                        $cpt_row .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons);
-                    }
-                    $cpt_row .= '</li>';
-                    $cpt_row .= '</ul>';
-                }
-                $cpt_row .= '</ul></div>';
-
-                $output .= $cpt_row;
-            }
-        }
-    }
-    return $output;
+	$args = wp_parse_args((array)$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',
+		)
+	);
+
+	$sort_by = isset($args['sort_by']) && in_array($args['sort_by'], array('az', 'count')) ? $args['sort_by'] : 'count';
+
+	$gd_post_types = geodir_get_posttypes('array');
+
+	$post_type_arr = !is_array($args['post_type']) ? explode(',', $args['post_type']) : $args['post_type'];
+	$current_posttype = geodir_get_current_posttype();
+
+	$is_listing = false;
+	$is_category = false;
+	if (geodir_is_page('listing')) {
+		$current_posttype = geodir_get_current_posttype();
+
+		if ($current_posttype != '' && isset($gd_post_types[$current_posttype])) {
+			$is_listing = true;
+
+			if (is_tax()) { // category page
+				$current_term_id = get_queried_object_id();
+				$current_taxonomy = get_query_var('taxonomy');
+				$current_posttype = geodir_get_current_posttype();
+
+				if ($current_term_id && $current_posttype && get_query_var('taxonomy') == $current_posttype . 'category') {
+					$is_category = true;
+				}
+			}
+		}
+	}
+
+	$parent_category = 0;
+	if ($is_listing) {
+		$post_type_arr = array($current_posttype);
+
+		if ($is_category) {
+			$parent_category = $current_term_id;
+		}
+	}
+
+	$post_types = array();
+	if (!empty($post_type_arr)) {
+		if (in_array('0', $post_type_arr)) {
+			$post_types = $gd_post_types;
+		} else {
+			foreach ($post_type_arr as $cpt) {
+				if (isset($gd_post_types[$cpt])) {
+					$post_types[$cpt] = $gd_post_types[$cpt];
+				}
+			}
+		}
+	}
+
+	if (empty($post_type_arr)) {
+		$post_types = $gd_post_types;
+	}
+
+	$hide_empty = !empty($args['hide_empty']) ? true : false;
+	$max_count = strip_tags($args['max_count']);
+	$all_childs = $max_count == 'all' ? true : false;
+	$max_count = $max_count > 0 ? (int)$max_count : 0;
+	$max_level = strip_tags($args['max_level']);
+	$show_count = !empty($args['show_count']) ? true : false;
+	$hide_icon = !empty($args['hide_icon']) ? true : false;
+	$cpt_left = !empty($args['cpt_left']) ? true : false;
+
+	if(!$cpt_left){
+		$cpt_left = "gd-cpt-flat";
+	}else{
+		$cpt_left = '';
+	}
+
+	$orderby = 'count';
+	$order = 'DESC';
+	if ($sort_by == 'az') {
+		$orderby = 'name';
+		$order = 'ASC';
+	}
+
+	$output = '';
+	if (!empty($post_types)) {
+		foreach ($post_types as $cpt => $cpt_info) {
+			$cat_taxonomy = $cpt . 'category';
+			$categories = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_category));
+			if ($hide_empty) {
+				$categories = geodir_filter_empty_terms($categories);
+			}
+			if ($sort_by == 'count') {
+				$categories = geodir_sort_terms($categories, 'count');
+			}
+
+			if (!empty($categories)) {
+				$term_icons = !$hide_icon ? geodir_get_term_icon() : array();
+				$row_class = '';
+
+				if ($is_listing) {
+					$row_class = $is_category ? ' gd-cptcat-categ' : ' gd-cptcat-listing';
+				}
+				$cpt_row = '<div class="gd-cptcat-row gd-cptcat-' . $cpt . $row_class . ' '.$cpt_left.'">';
+
+				if ($is_category) {
+					$term_info = get_term($current_term_id, $cat_taxonomy);
+
+					$term_icon_url = !empty($term_icons) && isset($term_icons[$term_info->term_id]) ? $term_icons[$term_info->term_id] : '';
+					$term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($term_info->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
+
+					$count = $show_count ? ' <span class="gd-cptcat-count">(' . $term_info->count . ')</span>' : '';
+					$cpt_row .= '<h2 class="gd-cptcat-title">' . $term_icon_url . $term_info->name . $count . '</h2>';
+				} else {
+					$cpt_row .= '<h2 class="gd-cptcat-title">' . __($cpt_info['labels']['name'], 'geodirectory') . '</h2>';
+				}
+				foreach ($categories as $category) {
+					$term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
+					$term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
+
+					$term_link = get_term_link( $category, $category->taxonomy );
+					/** Filter documented in geodirectory-functions/general_functions.php **/
+					$term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
+
+					$cpt_row .= '<ul class="gd-cptcat-ul gd-cptcat-parent  '.$cpt_left.'">';
+					$cpt_row .= '<li class="gd-cptcat-li gd-cptcat-li-main">';
+					$count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
+					$cpt_row .= '<h3 class="gd-cptcat-cat"><a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">'  .$term_icon_url . $category->name . $count . '</a></h3>';
+					if (($all_childs || $max_count > 0) && ($max_level == 'all' || (int)$max_level > 0)) {
+						$cpt_row .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons);
+					}
+					$cpt_row .= '</li>';
+					$cpt_row .= '</ul>';
+				}
+				$cpt_row .= '</ul></div>';
+
+				$output .= $cpt_row;
+			}
+		}
+	}
+	return $output;
 }
 
 /**
@@ -440,49 +440,49 @@ 
  * @return string Html content.
  */
 function geodir_cpt_categories_child_cats($parent_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth = 1) {
-    $cat_taxonomy = $cpt . 'category';
-
-    $orderby = 'count';
-    $order = 'DESC';
-    if ($sort_by == 'az') {
-        $orderby = 'name';
-        $order = 'ASC';
-    }
-
-    if ($max_level != 'all' && $depth > (int)$max_level ) {
-        return '';
-    }
-
-    $child_cats = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_id, 'number' => $max_count));
-    if ($hide_empty) {
-        $child_cats = geodir_filter_empty_terms($child_cats);
-    }
-
-    if (empty($child_cats)) {
-        return '';
-    }
-
-    if ($sort_by == 'count') {
-        $child_cats = geodir_sort_terms($child_cats, 'count');
-    }
-
-    $content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-' . $depth . '">';
-    $depth++;
-    foreach ($child_cats as $category) {
-        $term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
-        $term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
-        $term_link = get_term_link( $category, $category->taxonomy );
-        /** Filter documented in geodirectory-functions/general_functions.php **/
-        $term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
-        $count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
-
-        $content .= '<li class="gd-cptcat-li gd-cptcat-li-sub">';
-        $content .= '<a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' . $term_icon_url . $category->name . $count . '</a></li>';
-        $content .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth);
-    }
-    $content .= '</li></ul>';
-
-    return $content;
+	$cat_taxonomy = $cpt . 'category';
+
+	$orderby = 'count';
+	$order = 'DESC';
+	if ($sort_by == 'az') {
+		$orderby = 'name';
+		$order = 'ASC';
+	}
+
+	if ($max_level != 'all' && $depth > (int)$max_level ) {
+		return '';
+	}
+
+	$child_cats = get_terms($cat_taxonomy, array('orderby' => $orderby, 'order' => $order, 'hide_empty' => $hide_empty, 'parent' => $parent_id, 'number' => $max_count));
+	if ($hide_empty) {
+		$child_cats = geodir_filter_empty_terms($child_cats);
+	}
+
+	if (empty($child_cats)) {
+		return '';
+	}
+
+	if ($sort_by == 'count') {
+		$child_cats = geodir_sort_terms($child_cats, 'count');
+	}
+
+	$content = '<li class="gd-cptcat-li gd-cptcat-li-sub"><ul class="gd-cptcat-ul gd-cptcat-sub gd-cptcat-sub-' . $depth . '">';
+	$depth++;
+	foreach ($child_cats as $category) {
+		$term_icon_url = !empty($term_icons) && isset($term_icons[$category->term_id]) ? $term_icons[$category->term_id] : '';
+		$term_icon_url = $term_icon_url != '' ? '<img alt="' . esc_attr($category->name) . ' icon" src="' . $term_icon_url . '" /> ' : '';
+		$term_link = get_term_link( $category, $category->taxonomy );
+		/** Filter documented in geodirectory-functions/general_functions.php **/
+		$term_link = apply_filters( 'geodir_category_term_link', $term_link, $category->term_id, $cpt );
+		$count = $show_count ? ' <span class="gd-cptcat-count">(' . $category->count . ')</span>' : '';
+
+		$content .= '<li class="gd-cptcat-li gd-cptcat-li-sub">';
+		$content .= '<a href="' . esc_url($term_link) . '" title="' . esc_attr($category->name) . '">' . $term_icon_url . $category->name . $count . '</a></li>';
+		$content .= geodir_cpt_categories_child_cats($category->term_id, $cpt, $hide_empty, $show_count, $sort_by, $max_count, $max_level, $term_icons, $depth);
+	}
+	$content .= '</li></ul>';
+
+	return $content;
 }
 
 /**
@@ -494,16 +494,16 @@ 
  * @return array Terms.
  */
 function geodir_filter_empty_terms($terms) {
-    if (empty($terms)) {
-        return $terms;
-    }
-
-    $return = array();
-    foreach ($terms as $term) {
-        if (isset($term->count) && $term->count > 0) {
-            $return[] = $term;
-        }
-    }
-    return $return;
+	if (empty($terms)) {
+		return $terms;
+	}
+
+	$return = array();
+	foreach ($terms as $term) {
+		if (isset($term->count) && $term->count > 0) {
+			$return[] = $term;
+		}
+	}
+	return $return;
 }
 ?>
\ No newline at end of file

geodirectory-widgets/geodirectory_features_widget.php

Spacing +81 added lines, -81 removed lines

@@ -7,10 +7,10 @@ 
      */
     function __construct() {
         $widget_ops = array(
-            'description' => __( 'Displays "GD Features" widget', 'geodirectory' ),
+            'description' => __('Displays "GD Features" widget', 'geodirectory'),
             'classname' => 'widget_gd_features',
         );
-        parent::__construct( false, $name = _x( 'GD > Features', 'widget name', 'geodirectory' ), $widget_ops );
+        parent::__construct(false, $name = _x('GD > Features', 'widget name', 'geodirectory'), $widget_ops);
 
     }
 
@@ -20,8 +20,8 @@ 
      * @param array $args Widget arguments.
      * @param array $instance The widget settings, as saved by the user.
      */
-    function widget( $args, $instance ) {
-        extract( $args );
+    function widget($args, $instance) {
+        extract($args);
 
         $title = empty($instance['title']) ? '' : apply_filters('gd_features_widget_title', __($instance['title'], 'geodirectory'));
         $icon_color = $instance['icon_color'];
@@ -299,7 +299,7 @@ 
     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' => '',
@@ -400,183 +400,183 @@ 
         </p>
 
         <p class="features-title">
-            <label><?php echo __( 'Title 1:', 'geodirectory' ); ?></label>
-            <input name="<?php echo $this->get_field_name( 'title1' ); ?>" type="text" value="<?php echo esc_attr($title1); ?>" class="widefat" />
+            <label><?php echo __('Title 1:', 'geodirectory'); ?></label>
+            <input name="<?php echo $this->get_field_name('title1'); ?>" type="text" value="<?php echo esc_attr($title1); ?>" class="widefat" />
         </p>
 
         <p class="features-image">
-            <label><?php echo __( 'Image URL:', 'geodirectory' ); ?></label>
-            <input type="text" class="widefat" name="<?php echo $this->get_field_name( 'image1' ); ?>" value="<?php echo esc_attr($image1); ?>" />
+            <label><?php echo __('Image URL:', 'geodirectory'); ?></label>
+            <input type="text" class="widefat" name="<?php echo $this->get_field_name('image1'); ?>" value="<?php echo esc_attr($image1); ?>" />
         </p>
 
         <p class="features-desc">
-            <label><?php echo __( 'Description:', 'geodirectory' ); ?></label>
-            <textarea name="<?php echo $this->get_field_name( 'desc1' ); ?>" rows="3" class="widefat"><?php echo esc_attr($desc1); ?></textarea>
+            <label><?php echo __('Description:', 'geodirectory'); ?></label>
+            <textarea name="<?php echo $this->get_field_name('desc1'); ?>" rows="3" class="widefat"><?php echo esc_attr($desc1); ?></textarea>
         </p>
 
         <p class="features-title">
-            <label><?php echo __( 'Title 2:', 'geodirectory' ); ?></label>
-            <input name="<?php echo $this->get_field_name( 'title2' ); ?>" type="text" value="<?php echo esc_attr($title2); ?>" class="widefat" />
+            <label><?php echo __('Title 2:', 'geodirectory'); ?></label>
+            <input name="<?php echo $this->get_field_name('title2'); ?>" type="text" value="<?php echo esc_attr($title2); ?>" class="widefat" />
         </p>
 
         <p class="features-image">
-            <label><?php echo __( 'Image URL:', 'geodirectory' ); ?></label>
-            <input type="text" class="widefat" name="<?php echo $this->get_field_name( 'image2' ); ?>" value="<?php echo esc_attr($image2); ?>" />
+            <label><?php echo __('Image URL:', 'geodirectory'); ?></label>
+            <input type="text" class="widefat" name="<?php echo $this->get_field_name('image2'); ?>" value="<?php echo esc_attr($image2); ?>" />
         </p>
 
         <p class="features-desc">
-            <label><?php echo __( 'Description:', 'geodirectory' ); ?></label>
-            <textarea name="<?php echo $this->get_field_name( 'desc2' ); ?>" rows="3" class="widefat"><?php echo esc_attr($desc2); ?></textarea>
+            <label><?php echo __('Description:', 'geodirectory'); ?></label>
+            <textarea name="<?php echo $this->get_field_name('desc2'); ?>" rows="3" class="widefat"><?php echo esc_attr($desc2); ?></textarea>
         </p>
 
         <p class="features-title">
-            <label><?php echo __( 'Title 3:', 'geodirectory' ); ?></label>
-            <input name="<?php echo $this->get_field_name( 'title3' ); ?>" type="text" value="<?php echo esc_attr($title3); ?>" class="widefat" />
+            <label><?php echo __('Title 3:', 'geodirectory'); ?></label>
+            <input name="<?php echo $this->get_field_name('title3'); ?>" type="text" value="<?php echo esc_attr($title3); ?>" class="widefat" />
         </p>
 
         <p class="features-image">
-            <label><?php echo __( 'Image URL:', 'geodirectory' ); ?></label>
-            <input type="text" class="widefat" name="<?php echo $this->get_field_name( 'image3' ); ?>" value="<?php echo esc_attr($image3); ?>" />
+            <label><?php echo __('Image URL:', 'geodirectory'); ?></label>
+            <input type="text" class="widefat" name="<?php echo $this->get_field_name('image3'); ?>" value="<?php echo esc_attr($image3); ?>" />
         </p>
 
         <p class="features-desc">
-            <label><?php echo __( 'Description:', 'geodirectory' ); ?></label>
-            <textarea name="<?php echo $this->get_field_name( 'desc3' ); ?>" rows="3" class="widefat"><?php echo esc_attr($desc3); ?></textarea>
+            <label><?php echo __('Description:', 'geodirectory'); ?></label>
+            <textarea name="<?php echo $this->get_field_name('desc3'); ?>" rows="3" class="widefat"><?php echo esc_attr($desc3); ?></textarea>
         </p>
 
         <p class="features-title">
-            <label><?php echo __( 'Title 4:', 'geodirectory' ); ?></label>
-            <input name="<?php echo $this->get_field_name( 'title4' ); ?>" type="text" value="<?php echo esc_attr($title4); ?>" class="widefat" />
+            <label><?php echo __('Title 4:', 'geodirectory'); ?></label>
+            <input name="<?php echo $this->get_field_name('title4'); ?>" type="text" value="<?php echo esc_attr($title4); ?>" class="widefat" />
         </p>
 
         <p class="features-image">
-            <label><?php echo __( 'Image URL:', 'geodirectory' ); ?></label>
-            <input type="text" class="widefat" name="<?php echo $this->get_field_name( 'image4' ); ?>" value="<?php echo esc_attr($image4); ?>" />
+            <label><?php echo __('Image URL:', 'geodirectory'); ?></label>
+            <input type="text" class="widefat" name="<?php echo $this->get_field_name('image4'); ?>" value="<?php echo esc_attr($image4); ?>" />
         </p>
 
         <p class="features-desc">
-            <label><?php echo __( 'Description:', 'geodirectory' ); ?></label>
-            <textarea name="<?php echo $this->get_field_name( 'desc4' ); ?>" rows="3" class="widefat"><?php echo esc_attr($desc4); ?></textarea>
+            <label><?php echo __('Description:', 'geodirectory'); ?></label>
+            <textarea name="<?php echo $this->get_field_name('desc4'); ?>" rows="3" class="widefat"><?php echo esc_attr($desc4); ?></textarea>
         </p>
 
         <p class="features-title">
-            <label><?php echo __( 'Title 5:', 'geodirectory' ); ?></label>
-            <input name="<?php echo $this->get_field_name( 'title5' ); ?>" type="text" value="<?php echo esc_attr($title5); ?>" class="widefat" />
+            <label><?php echo __('Title 5:', 'geodirectory'); ?></label>
+            <input name="<?php echo $this->get_field_name('title5'); ?>" type="text" value="<?php echo esc_attr($title5); ?>" class="widefat" />
         </p>
 
         <p class="features-image">
-            <label><?php echo __( 'Image URL:', 'geodirectory' ); ?></label>
-            <input type="text" class="widefat" name="<?php echo $this->get_field_name( 'image5' ); ?>" value="<?php echo esc_attr($image5); ?>" />
+            <label><?php echo __('Image URL:', 'geodirectory'); ?></label>
+            <input type="text" class="widefat" name="<?php echo $this->get_field_name('image5'); ?>" value="<?php echo esc_attr($image5); ?>" />
         </p>
 
         <p class="features-desc">
-            <label><?php echo __( 'Description:', 'geodirectory' ); ?></label>
-            <textarea name="<?php echo $this->get_field_name( 'desc5' ); ?>" rows="3" class="widefat"><?php echo esc_attr($desc5); ?></textarea>
+            <label><?php echo __('Description:', 'geodirectory'); ?></label>
+            <textarea name="<?php echo $this->get_field_name('desc5'); ?>" rows="3" class="widefat"><?php echo esc_attr($desc5); ?></textarea>
         </p>
 
         <p class="features-title">
-            <label><?php echo __( 'Title 6:', 'geodirectory' ); ?></label>
-            <input name="<?php echo $this->get_field_name( 'title6' ); ?>" type="text" value="<?php echo esc_attr($title6); ?>" class="widefat" />
+            <label><?php echo __('Title 6:', 'geodirectory'); ?></label>
+            <input name="<?php echo $this->get_field_name('title6'); ?>" type="text" value="<?php echo esc_attr($title6); ?>" class="widefat" />
         </p>
 
         <p class="features-image">
-            <label><?php echo __( 'Image URL:', 'geodirectory' ); ?></label>
-            <input type="text" class="widefat" name="<?php echo $this->get_field_name( 'image6' ); ?>" value="<?php echo esc_attr($image6); ?>" />
+            <label><?php echo __('Image URL:', 'geodirectory'); ?></label>
+            <input type="text" class="widefat" name="<?php echo $this->get_field_name('image6'); ?>" value="<?php echo esc_attr($image6); ?>" />
         </p>
 
         <p class="features-desc">
-            <label><?php echo __( 'Description:', 'geodirectory' ); ?></label>
-            <textarea name="<?php echo $this->get_field_name( 'desc6' ); ?>" rows="3" class="widefat"><?php echo esc_attr($desc6); ?></textarea>
+            <label><?php echo __('Description:', 'geodirectory'); ?></label>
+            <textarea name="<?php echo $this->get_field_name('desc6'); ?>" rows="3" class="widefat"><?php echo esc_attr($desc6); ?></textarea>
         </p>
 
         <p class="features-title">
-            <label><?php echo __( 'Title 7:', 'geodirectory' ); ?></label>
-            <input name="<?php echo $this->get_field_name( 'title7' ); ?>" type="text" value="<?php echo esc_attr($title7); ?>" class="widefat" />
+            <label><?php echo __('Title 7:', 'geodirectory'); ?></label>
+            <input name="<?php echo $this->get_field_name('title7'); ?>" type="text" value="<?php echo esc_attr($title7); ?>" class="widefat" />
         </p>
 
         <p class="features-image">
-            <label><?php echo __( 'Image URL:', 'geodirectory' ); ?></label>
-            <input type="text" class="widefat" name="<?php echo $this->get_field_name( 'image7' ); ?>" value="<?php echo esc_attr($image7); ?>" />
+            <label><?php echo __('Image URL:', 'geodirectory'); ?></label>
+            <input type="text" class="widefat" name="<?php echo $this->get_field_name('image7'); ?>" value="<?php echo esc_attr($image7); ?>" />
         </p>
 
         <p class="features-desc">
-            <label><?php echo __( 'Description:', 'geodirectory' ); ?></label>
-            <textarea name="<?php echo $this->get_field_name( 'desc7' ); ?>" rows="3" class="widefat"><?php echo esc_attr($desc7); ?></textarea>
+            <label><?php echo __('Description:', 'geodirectory'); ?></label>
+            <textarea name="<?php echo $this->get_field_name('desc7'); ?>" rows="3" class="widefat"><?php echo esc_attr($desc7); ?></textarea>
         </p>
 
         <p class="features-title">
-            <label><?php echo __( 'Title 8:', 'geodirectory' ); ?></label>
-            <input name="<?php echo $this->get_field_name( 'title8' ); ?>" type="text" value="<?php echo esc_attr($title8); ?>" class="widefat" />
+            <label><?php echo __('Title 8:', 'geodirectory'); ?></label>
+            <input name="<?php echo $this->get_field_name('title8'); ?>" type="text" value="<?php echo esc_attr($title8); ?>" class="widefat" />
         </p>
 
         <p class="features-image">
-            <label><?php echo __( 'Image URL:', 'geodirectory' ); ?></label>
-            <input type="text" class="widefat" name="<?php echo $this->get_field_name( 'image8' ); ?>" value="<?php echo esc_attr($image8); ?>" />
+            <label><?php echo __('Image URL:', 'geodirectory'); ?></label>
+            <input type="text" class="widefat" name="<?php echo $this->get_field_name('image8'); ?>" value="<?php echo esc_attr($image8); ?>" />
         </p>
 
         <p class="features-desc">
-            <label><?php echo __( 'Description:', 'geodirectory' ); ?></label>
-            <textarea name="<?php echo $this->get_field_name( 'desc8' ); ?>" rows="3" class="widefat"><?php echo esc_attr($desc8); ?></textarea>
+            <label><?php echo __('Description:', 'geodirectory'); ?></label>
+            <textarea name="<?php echo $this->get_field_name('desc8'); ?>" rows="3" class="widefat"><?php echo esc_attr($desc8); ?></textarea>
         </p>
 
         <p class="features-title">
-            <label><?php echo __( 'Title 9:', 'geodirectory' ); ?></label>
-            <input name="<?php echo $this->get_field_name( 'title9' ); ?>" type="text" value="<?php echo esc_attr($title9); ?>" class="widefat" />
+            <label><?php echo __('Title 9:', 'geodirectory'); ?></label>
+            <input name="<?php echo $this->get_field_name('title9'); ?>" type="text" value="<?php echo esc_attr($title9); ?>" class="widefat" />
         </p>
 
         <p class="features-image">
-            <label><?php echo __( 'Image URL:', 'geodirectory' ); ?></label>
-            <input type="text" class="widefat" name="<?php echo $this->get_field_name( 'image9' ); ?>" value="<?php echo esc_attr($image9); ?>" />
+            <label><?php echo __('Image URL:', 'geodirectory'); ?></label>
+            <input type="text" class="widefat" name="<?php echo $this->get_field_name('image9'); ?>" value="<?php echo esc_attr($image9); ?>" />
         </p>
 
         <p class="features-desc">
-            <label><?php echo __( 'Description:', 'geodirectory' ); ?></label>
-            <textarea name="<?php echo $this->get_field_name( 'desc9' ); ?>" rows="3" class="widefat"><?php echo esc_attr($desc9); ?></textarea>
+            <label><?php echo __('Description:', 'geodirectory'); ?></label>
+            <textarea name="<?php echo $this->get_field_name('desc9'); ?>" rows="3" class="widefat"><?php echo esc_attr($desc9); ?></textarea>
         </p>
 
         <p class="features-title">
-            <label><?php echo __( 'Title 10:', 'geodirectory' ); ?></label>
-            <input name="<?php echo $this->get_field_name( 'title10' ); ?>" type="text" value="<?php echo esc_attr($title10); ?>" class="widefat" />
+            <label><?php echo __('Title 10:', 'geodirectory'); ?></label>
+            <input name="<?php echo $this->get_field_name('title10'); ?>" type="text" value="<?php echo esc_attr($title10); ?>" class="widefat" />
         </p>
 
         <p class="features-image">
-            <label><?php echo __( 'Image URL:', 'geodirectory' ); ?></label>
-            <input type="text" class="widefat" name="<?php echo $this->get_field_name( 'image10' ); ?>" value="<?php echo esc_attr($image10); ?>" />
+            <label><?php echo __('Image URL:', 'geodirectory'); ?></label>
+            <input type="text" class="widefat" name="<?php echo $this->get_field_name('image10'); ?>" value="<?php echo esc_attr($image10); ?>" />
         </p>
 
         <p class="features-desc">
-            <label><?php echo __( 'Description:', 'geodirectory' ); ?></label>
-            <textarea name="<?php echo $this->get_field_name( 'desc10' ); ?>" rows="3" class="widefat"><?php echo esc_attr($desc10); ?></textarea>
+            <label><?php echo __('Description:', 'geodirectory'); ?></label>
+            <textarea name="<?php echo $this->get_field_name('desc10'); ?>" rows="3" class="widefat"><?php echo esc_attr($desc10); ?></textarea>
         </p>
 
         <p class="features-title">
-            <label><?php echo __( 'Title 11:', 'geodirectory' ); ?></label>
-            <input name="<?php echo $this->get_field_name( 'title11' ); ?>" type="text" value="<?php echo esc_attr($title11); ?>" class="widefat" />
+            <label><?php echo __('Title 11:', 'geodirectory'); ?></label>
+            <input name="<?php echo $this->get_field_name('title11'); ?>" type="text" value="<?php echo esc_attr($title11); ?>" class="widefat" />
         </p>
 
         <p class="features-image">
-            <label><?php echo __( 'Image URL:', 'geodirectory' ); ?></label>
-            <input type="text" class="widefat" name="<?php echo $this->get_field_name( 'image11' ); ?>" value="<?php echo esc_attr($image11); ?>" />
+            <label><?php echo __('Image URL:', 'geodirectory'); ?></label>
+            <input type="text" class="widefat" name="<?php echo $this->get_field_name('image11'); ?>" value="<?php echo esc_attr($image11); ?>" />
         </p>
 
         <p class="features-desc">
-            <label><?php echo __( 'Description:', 'geodirectory' ); ?></label>
-            <textarea name="<?php echo $this->get_field_name( 'desc11' ); ?>" rows="3" class="widefat"><?php echo esc_attr($desc11); ?></textarea>
+            <label><?php echo __('Description:', 'geodirectory'); ?></label>
+            <textarea name="<?php echo $this->get_field_name('desc11'); ?>" rows="3" class="widefat"><?php echo esc_attr($desc11); ?></textarea>
         </p>
 
         <p class="features-title">
-            <label><?php echo __( 'Title 12:', 'geodirectory' ); ?></label>
-            <input name="<?php echo $this->get_field_name( 'title12' ); ?>" type="text" value="<?php echo esc_attr($title12); ?>" class="widefat" />
+            <label><?php echo __('Title 12:', 'geodirectory'); ?></label>
+            <input name="<?php echo $this->get_field_name('title12'); ?>" type="text" value="<?php echo esc_attr($title12); ?>" class="widefat" />
         </p>
 
         <p class="features-image">
-            <label><?php echo __( 'Image URL:', 'geodirectory' ); ?></label>
-            <input type="text" class="widefat" name="<?php echo $this->get_field_name( 'image12' ); ?>" value="<?php echo esc_attr($image12); ?>" />
+            <label><?php echo __('Image URL:', 'geodirectory'); ?></label>
+            <input type="text" class="widefat" name="<?php echo $this->get_field_name('image12'); ?>" value="<?php echo esc_attr($image12); ?>" />
         </p>
 
         <p class="features-desc">
-            <label><?php echo __( 'Description:', 'geodirectory' ); ?></label>
-            <textarea name="<?php echo $this->get_field_name( 'desc12' ); ?>" rows="3" class="widefat"><?php echo esc_attr($desc12); ?></textarea>
+            <label><?php echo __('Description:', 'geodirectory'); ?></label>
+            <textarea name="<?php echo $this->get_field_name('desc12'); ?>" rows="3" class="widefat"><?php echo esc_attr($desc12); ?></textarea>
         </p>
         <?php
     }
@@ -584,13 +584,13 @@ 
 }
 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 (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>';
+        $image = '<i style="color:' . $icon_color . '" class="fa ' . $image . '"></i>';
     }
     return $image;
 }

Indentation +386 added lines, -386 removed lines

@@ -2,385 +2,385 @@ 
 
 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.
-     */
-    function widget( $args, $instance ) {
-        extract( $args );
-
-        $title = empty($instance['title']) ? '' : apply_filters('gd_features_widget_title', __($instance['title'], 'geodirectory'));
-        $icon_color = $instance['icon_color'];
-
-        $title1 = $instance['title1'];
-        $title2 = $instance['title2'];
-        $title3 = $instance['title3'];
-        $title4 = $instance['title4'];
-        $title5 = $instance['title5'];
-        $title6 = $instance['title6'];
-        $title7 = $instance['title7'];
-        $title8 = $instance['title8'];
-        $title9 = $instance['title9'];
-        $title10 = $instance['title10'];
-        $title11 = $instance['title11'];
-        $title12 = $instance['title12'];
-
-        $image1 = $instance['image1'];
-        $image2 = $instance['image2'];
-        $image3 = $instance['image3'];
-        $image4 = $instance['image4'];
-        $image5 = $instance['image5'];
-        $image6 = $instance['image6'];
-        $image7 = $instance['image7'];
-        $image8 = $instance['image8'];
-        $image9 = $instance['image9'];
-        $image10 = $instance['image10'];
-        $image11 = $instance['image11'];
-        $image12 = $instance['image12'];
-
-        $desc1 = $instance['desc1'];
-        $desc2 = $instance['desc2'];
-        $desc3 = $instance['desc3'];
-        $desc4 = $instance['desc4'];
-        $desc5 = $instance['desc5'];
-        $desc6 = $instance['desc6'];
-        $desc7 = $instance['desc7'];
-        $desc8 = $instance['desc8'];
-        $desc9 = $instance['desc9'];
-        $desc10 = $instance['desc10'];
-        $desc11 = $instance['desc11'];
-        $desc12 = $instance['desc12'];
-
-        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.
+	 */
+	function widget( $args, $instance ) {
+		extract( $args );
+
+		$title = empty($instance['title']) ? '' : apply_filters('gd_features_widget_title', __($instance['title'], 'geodirectory'));
+		$icon_color = $instance['icon_color'];
+
+		$title1 = $instance['title1'];
+		$title2 = $instance['title2'];
+		$title3 = $instance['title3'];
+		$title4 = $instance['title4'];
+		$title5 = $instance['title5'];
+		$title6 = $instance['title6'];
+		$title7 = $instance['title7'];
+		$title8 = $instance['title8'];
+		$title9 = $instance['title9'];
+		$title10 = $instance['title10'];
+		$title11 = $instance['title11'];
+		$title12 = $instance['title12'];
+
+		$image1 = $instance['image1'];
+		$image2 = $instance['image2'];
+		$image3 = $instance['image3'];
+		$image4 = $instance['image4'];
+		$image5 = $instance['image5'];
+		$image6 = $instance['image6'];
+		$image7 = $instance['image7'];
+		$image8 = $instance['image8'];
+		$image9 = $instance['image9'];
+		$image10 = $instance['image10'];
+		$image11 = $instance['image11'];
+		$image12 = $instance['image12'];
+
+		$desc1 = $instance['desc1'];
+		$desc2 = $instance['desc2'];
+		$desc3 = $instance['desc3'];
+		$desc4 = $instance['desc4'];
+		$desc5 = $instance['desc5'];
+		$desc6 = $instance['desc6'];
+		$desc7 = $instance['desc7'];
+		$desc8 = $instance['desc8'];
+		$desc9 = $instance['desc9'];
+		$desc10 = $instance['desc10'];
+		$desc11 = $instance['desc11'];
+		$desc12 = $instance['desc12'];
+
+		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'>";
-        if ($title1 OR $image1 OR $desc1) {
-            echo "<li>";
-            if ($title1) {
-                echo "<h3 class='gd-fe-title'>" . $title1 . "</h3>";
-            }
-            if ($image1) {
-                echo "<div class='gd-fe-image'>" . gd_features_parse_image($image1, $icon_color) . "</div>";
-            }
-            if ($desc1) {
-                echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc1) . "</div>";
-            }
-            echo "</li>";
-        }
-
-        if ($title2 OR $image2 OR $desc2) {
-            echo "<li>";
-            if ($title2) {
-                echo "<h3 class='gd-fe-title'>" . $title2 . "</h3>";
-            }
-            if ($image2) {
-                echo "<div class='gd-fe-image'>" . gd_features_parse_image($image2, $icon_color) . "</div>";
-            }
-            if ($desc2) {
-                echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc2) . "</div>";
-            }
-            echo "</li>";
-        }
-
-        if ($title3 OR $image3 OR $desc3) {
-            echo "<li>";
-            if ($title3) {
-                echo "<h3 class='gd-fe-title'>" . $title3 . "</h3>";
-            }
-            if ($image3) {
-                echo "<div class='gd-fe-image'>" . gd_features_parse_image($image3, $icon_color) . "</div>";
-            }
-            if ($desc3) {
-                echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc3) . "</div>";
-            }
-            echo "</li>";
-        }
-
-        if ($title4 OR $image4 OR $desc4) {
-            echo "<li>";
-            if ($title4) {
-                echo "<h3 class='gd-fe-title'>" . $title4 . "</h3>";
-            }
-            if ($image4) {
-                echo "<div class='gd-fe-image'>" . gd_features_parse_image($image4, $icon_color) . "</div>";
-            }
-            if ($desc4) {
-                echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc4) . "</div>";
-            }
-            echo "</li>";
-        }
-
-        if ($title5 OR $image5 OR $desc5) {
-            echo "<li>";
-            if ($title5) {
-                echo "<h3 class='gd-fe-title'>" . $title5 . "</h3>";
-            }
-            if ($image5) {
-                echo "<div class='gd-fe-image'>" . gd_features_parse_image($image5, $icon_color) . "</div>";
-            }
-            if ($desc5) {
-                echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc5) . "</div>";
-            }
-            echo "</li>";
-        }
-
-        if ($title6 OR $image6 OR $desc6) {
-            echo "<li>";
-            if ($title6) {
-                echo "<h3 class='gd-fe-title'>" . $title6 . "</h3>";
-            }
-            if ($image6) {
-                echo "<div class='gd-fe-image'>" . gd_features_parse_image($image6, $icon_color) . "</div>";
-            }
-            if ($desc6) {
-                echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc6) . "</div>";
-            }
-            echo "</li>";
-        }
-
-        if ($title7 OR $image7 OR $desc7) {
-            echo "<li>";
-            if ($title7) {
-                echo "<h3 class='gd-fe-title'>" . $title7 . "</h3>";
-            }
-            if ($image7) {
-                echo "<div class='gd-fe-image'>" . gd_features_parse_image($image7, $icon_color) . "</div>";
-            }
-            if ($desc7) {
-                echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc7) . "</div>";
-            }
-            echo "</li>";
-        }
-
-        if ($title8 OR $image8 OR $desc8) {
-            echo "<li>";
-            if ($title8) {
-                echo "<h3 class='gd-fe-title'>" . $title8 . "</h3>";
-            }
-            if ($image8) {
-                echo "<div class='gd-fe-image'>" . gd_features_parse_image($image8, $icon_color) . "</div>";
-            }
-            if ($desc8) {
-                echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc8) . "</div>";
-            }
-            echo "</li>";
-        }
-
-        if ($title9 OR $image9 OR $desc9) {
-            echo "<li>";
-            if ($title9) {
-                echo "<h3 class='gd-fe-title'>" . $title9 . "</h3>";
-            }
-            if ($image9) {
-                echo "<div class='gd-fe-image'>" . gd_features_parse_image($image9, $icon_color) . "</div>";
-            }
-            if ($desc9) {
-                echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc9) . "</div>";
-            }
-            echo "</li>";
-        }
-
-        if ($title10 OR $image10 OR $desc10) {
-            echo "<li>";
-            if ($title10) {
-                echo "<h3 class='gd-fe-title'>" . $title10 . "</h3>";
-            }
-            if ($image10) {
-                echo "<div class='gd-fe-image'>" . gd_features_parse_image($image10, $icon_color) . "</div>";
-            }
-            if ($desc10) {
-                echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc10) . "</div>";
-            }
-            echo "</li>";
-        }
-
-        if ($title11 OR $image11 OR $desc11) {
-            echo "<li>";
-            if ($title11) {
-                echo "<h3 class='gd-fe-title'>" . $title11 . "</h3>";
-            }
-            if ($image11) {
-                echo "<div class='gd-fe-image'>" . gd_features_parse_image($image11, $icon_color) . "</div>";
-            }
-            if ($desc11) {
-                echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc11) . "</div>";
-            }
-            echo "</li>";
-        }
-
-        if ($title12 OR $image12 OR $desc12) {
-            echo "<li>";
-            if ($title12) {
-                echo "<h3 class='gd-fe-title'>" . $title12 . "</h3>";
-            }
-            if ($image12) {
-                echo "<div class='gd-fe-image'>" . gd_features_parse_image($image12, $icon_color) . "</div>";
-            }
-            if ($desc12) {
-                echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc12) . "</div>";
-            }
-            echo "</li>";
-        }
-        echo "</ul>";
-        ?>
+		echo "<ul class='gd-features'>";
+		if ($title1 OR $image1 OR $desc1) {
+			echo "<li>";
+			if ($title1) {
+				echo "<h3 class='gd-fe-title'>" . $title1 . "</h3>";
+			}
+			if ($image1) {
+				echo "<div class='gd-fe-image'>" . gd_features_parse_image($image1, $icon_color) . "</div>";
+			}
+			if ($desc1) {
+				echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc1) . "</div>";
+			}
+			echo "</li>";
+		}
+
+		if ($title2 OR $image2 OR $desc2) {
+			echo "<li>";
+			if ($title2) {
+				echo "<h3 class='gd-fe-title'>" . $title2 . "</h3>";
+			}
+			if ($image2) {
+				echo "<div class='gd-fe-image'>" . gd_features_parse_image($image2, $icon_color) . "</div>";
+			}
+			if ($desc2) {
+				echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc2) . "</div>";
+			}
+			echo "</li>";
+		}
+
+		if ($title3 OR $image3 OR $desc3) {
+			echo "<li>";
+			if ($title3) {
+				echo "<h3 class='gd-fe-title'>" . $title3 . "</h3>";
+			}
+			if ($image3) {
+				echo "<div class='gd-fe-image'>" . gd_features_parse_image($image3, $icon_color) . "</div>";
+			}
+			if ($desc3) {
+				echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc3) . "</div>";
+			}
+			echo "</li>";
+		}
+
+		if ($title4 OR $image4 OR $desc4) {
+			echo "<li>";
+			if ($title4) {
+				echo "<h3 class='gd-fe-title'>" . $title4 . "</h3>";
+			}
+			if ($image4) {
+				echo "<div class='gd-fe-image'>" . gd_features_parse_image($image4, $icon_color) . "</div>";
+			}
+			if ($desc4) {
+				echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc4) . "</div>";
+			}
+			echo "</li>";
+		}
+
+		if ($title5 OR $image5 OR $desc5) {
+			echo "<li>";
+			if ($title5) {
+				echo "<h3 class='gd-fe-title'>" . $title5 . "</h3>";
+			}
+			if ($image5) {
+				echo "<div class='gd-fe-image'>" . gd_features_parse_image($image5, $icon_color) . "</div>";
+			}
+			if ($desc5) {
+				echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc5) . "</div>";
+			}
+			echo "</li>";
+		}
+
+		if ($title6 OR $image6 OR $desc6) {
+			echo "<li>";
+			if ($title6) {
+				echo "<h3 class='gd-fe-title'>" . $title6 . "</h3>";
+			}
+			if ($image6) {
+				echo "<div class='gd-fe-image'>" . gd_features_parse_image($image6, $icon_color) . "</div>";
+			}
+			if ($desc6) {
+				echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc6) . "</div>";
+			}
+			echo "</li>";
+		}
+
+		if ($title7 OR $image7 OR $desc7) {
+			echo "<li>";
+			if ($title7) {
+				echo "<h3 class='gd-fe-title'>" . $title7 . "</h3>";
+			}
+			if ($image7) {
+				echo "<div class='gd-fe-image'>" . gd_features_parse_image($image7, $icon_color) . "</div>";
+			}
+			if ($desc7) {
+				echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc7) . "</div>";
+			}
+			echo "</li>";
+		}
+
+		if ($title8 OR $image8 OR $desc8) {
+			echo "<li>";
+			if ($title8) {
+				echo "<h3 class='gd-fe-title'>" . $title8 . "</h3>";
+			}
+			if ($image8) {
+				echo "<div class='gd-fe-image'>" . gd_features_parse_image($image8, $icon_color) . "</div>";
+			}
+			if ($desc8) {
+				echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc8) . "</div>";
+			}
+			echo "</li>";
+		}
+
+		if ($title9 OR $image9 OR $desc9) {
+			echo "<li>";
+			if ($title9) {
+				echo "<h3 class='gd-fe-title'>" . $title9 . "</h3>";
+			}
+			if ($image9) {
+				echo "<div class='gd-fe-image'>" . gd_features_parse_image($image9, $icon_color) . "</div>";
+			}
+			if ($desc9) {
+				echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc9) . "</div>";
+			}
+			echo "</li>";
+		}
+
+		if ($title10 OR $image10 OR $desc10) {
+			echo "<li>";
+			if ($title10) {
+				echo "<h3 class='gd-fe-title'>" . $title10 . "</h3>";
+			}
+			if ($image10) {
+				echo "<div class='gd-fe-image'>" . gd_features_parse_image($image10, $icon_color) . "</div>";
+			}
+			if ($desc10) {
+				echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc10) . "</div>";
+			}
+			echo "</li>";
+		}
+
+		if ($title11 OR $image11 OR $desc11) {
+			echo "<li>";
+			if ($title11) {
+				echo "<h3 class='gd-fe-title'>" . $title11 . "</h3>";
+			}
+			if ($image11) {
+				echo "<div class='gd-fe-image'>" . gd_features_parse_image($image11, $icon_color) . "</div>";
+			}
+			if ($desc11) {
+				echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc11) . "</div>";
+			}
+			echo "</li>";
+		}
+
+		if ($title12 OR $image12 OR $desc12) {
+			echo "<li>";
+			if ($title12) {
+				echo "<h3 class='gd-fe-title'>" . $title12 . "</h3>";
+			}
+			if ($image12) {
+				echo "<div class='gd-fe-image'>" . gd_features_parse_image($image12, $icon_color) . "</div>";
+			}
+			if ($desc12) {
+				echo "<div class='gd-fe-desc'>" . gd_features_parse_desc($desc12) . "</div>";
+			}
+			echo "</li>";
+		}
+		echo "</ul>";
+		?>
         <?php echo $after_widget; ?>
         <?php
-    }
-
-    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']);
-
-        $instance['title1'] = $new_instance['title1'];
-        $instance['title2'] = $new_instance['title2'];
-        $instance['title3'] = $new_instance['title3'];
-        $instance['title4'] = $new_instance['title4'];
-        $instance['title5'] = $new_instance['title5'];
-        $instance['title6'] = $new_instance['title6'];
-        $instance['title7'] = $new_instance['title7'];
-        $instance['title8'] = $new_instance['title8'];
-        $instance['title9'] = $new_instance['title9'];
-        $instance['title10'] = $new_instance['title10'];
-        $instance['title11'] = $new_instance['title11'];
-        $instance['title12'] = $new_instance['title12'];
-        //image
-        $instance['image1'] = $new_instance['image1'];
-        $instance['image2'] = $new_instance['image2'];
-        $instance['image3'] = $new_instance['image3'];
-        $instance['image4'] = $new_instance['image4'];
-        $instance['image5'] = $new_instance['image5'];
-        $instance['image6'] = $new_instance['image6'];
-        $instance['image7'] = $new_instance['image7'];
-        $instance['image8'] = $new_instance['image8'];
-        $instance['image9'] = $new_instance['image9'];
-        $instance['image10'] = $new_instance['image10'];
-        $instance['image11'] = $new_instance['image11'];
-        $instance['image12'] = $new_instance['image12'];
-        //Description
-        $instance['desc1'] = $new_instance['desc1'];
-        $instance['desc2'] = $new_instance['desc2'];
-        $instance['desc3'] = $new_instance['desc3'];
-        $instance['desc4'] = $new_instance['desc4'];
-        $instance['desc5'] = $new_instance['desc5'];
-        $instance['desc6'] = $new_instance['desc6'];
-        $instance['desc7'] = $new_instance['desc7'];
-        $instance['desc8'] = $new_instance['desc8'];
-        $instance['desc9'] = $new_instance['desc9'];
-        $instance['desc10'] = $new_instance['desc10'];
-        $instance['desc11'] = $new_instance['desc11'];
-        $instance['desc12'] = $new_instance['desc12'];
-        return $instance;
-    }
-
-    function form($instance)
-    {
-        //widgetform in backend
-        $instance = wp_parse_args((array)$instance, array(
-            'title' => '',
-            'icon_color' => '#757575',
-            'title1' => '',
-            'title2' => '',
-            'title3' => '',
-            'title4' => '',
-            'title5' => '',
-            'title6' => '',
-            'title7' => '',
-            'title8' => '',
-            'title9' => '',
-            'title10' => '',
-            'title11' => '',
-            'title12' => '',
-            'image1' => '',
-            'image2' => '',
-            'image3' => '',
-            'image4' => '',
-            'image5' => '',
-            'image6' => '',
-            'image7' => '',
-            'image8' => '',
-            'image9' => '',
-            'image10' => '',
-            'image11' => '',
-            'image12' => '',
-            'desc1' => '',
-            'desc2' => '',
-            'desc3' => '',
-            'desc4' => '',
-            'desc5' => '',
-            'desc6' => '',
-            'desc7' => '',
-            'desc8' => '',
-            'desc9' => '',
-            'desc10' => '',
-            'desc11' => '',
-            'desc12' => '',
-        ));
-        $title = strip_tags($instance['title']);
-        $icon_color = strip_tags($instance['icon_color']);
-
-        $title1 = strip_tags($instance['title1']);
-        $title2 = strip_tags($instance['title2']);
-        $title3 = strip_tags($instance['title3']);
-        $title4 = strip_tags($instance['title4']);
-        $title5 = strip_tags($instance['title5']);
-        $title6 = strip_tags($instance['title6']);
-        $title7 = strip_tags($instance['title7']);
-        $title8 = strip_tags($instance['title8']);
-        $title9 = strip_tags($instance['title9']);
-        $title10 = strip_tags($instance['title10']);
-        $title11 = strip_tags($instance['title11']);
-        $title12 = strip_tags($instance['title12']);
-
-        $image1 = strip_tags($instance['image1']);
-        $image2 = strip_tags($instance['image2']);
-        $image3 = strip_tags($instance['image3']);
-        $image4 = strip_tags($instance['image4']);
-        $image5 = strip_tags($instance['image5']);
-        $image6 = strip_tags($instance['image6']);
-        $image7 = strip_tags($instance['image7']);
-        $image8 = strip_tags($instance['image8']);
-        $image9 = strip_tags($instance['image9']);
-        $image10 = strip_tags($instance['image10']);
-        $image11 = strip_tags($instance['image11']);
-        $image12 = strip_tags($instance['image12']);
-
-        $desc1 = strip_tags($instance['desc1']);
-        $desc2 = strip_tags($instance['desc2']);
-        $desc3 = strip_tags($instance['desc3']);
-        $desc4 = strip_tags($instance['desc4']);
-        $desc5 = strip_tags($instance['desc5']);
-        $desc6 = strip_tags($instance['desc6']);
-        $desc7 = strip_tags($instance['desc7']);
-        $desc8 = strip_tags($instance['desc8']);
-        $desc9 = strip_tags($instance['desc9']);
-        $desc10 = strip_tags($instance['desc10']);
-        $desc11 = strip_tags($instance['desc11']);
-        $desc12 = strip_tags($instance['desc12']);
-        ?>
+	}
+
+	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']);
+
+		$instance['title1'] = $new_instance['title1'];
+		$instance['title2'] = $new_instance['title2'];
+		$instance['title3'] = $new_instance['title3'];
+		$instance['title4'] = $new_instance['title4'];
+		$instance['title5'] = $new_instance['title5'];
+		$instance['title6'] = $new_instance['title6'];
+		$instance['title7'] = $new_instance['title7'];
+		$instance['title8'] = $new_instance['title8'];
+		$instance['title9'] = $new_instance['title9'];
+		$instance['title10'] = $new_instance['title10'];
+		$instance['title11'] = $new_instance['title11'];
+		$instance['title12'] = $new_instance['title12'];
+		//image
+		$instance['image1'] = $new_instance['image1'];
+		$instance['image2'] = $new_instance['image2'];
+		$instance['image3'] = $new_instance['image3'];
+		$instance['image4'] = $new_instance['image4'];
+		$instance['image5'] = $new_instance['image5'];
+		$instance['image6'] = $new_instance['image6'];
+		$instance['image7'] = $new_instance['image7'];
+		$instance['image8'] = $new_instance['image8'];
+		$instance['image9'] = $new_instance['image9'];
+		$instance['image10'] = $new_instance['image10'];
+		$instance['image11'] = $new_instance['image11'];
+		$instance['image12'] = $new_instance['image12'];
+		//Description
+		$instance['desc1'] = $new_instance['desc1'];
+		$instance['desc2'] = $new_instance['desc2'];
+		$instance['desc3'] = $new_instance['desc3'];
+		$instance['desc4'] = $new_instance['desc4'];
+		$instance['desc5'] = $new_instance['desc5'];
+		$instance['desc6'] = $new_instance['desc6'];
+		$instance['desc7'] = $new_instance['desc7'];
+		$instance['desc8'] = $new_instance['desc8'];
+		$instance['desc9'] = $new_instance['desc9'];
+		$instance['desc10'] = $new_instance['desc10'];
+		$instance['desc11'] = $new_instance['desc11'];
+		$instance['desc12'] = $new_instance['desc12'];
+		return $instance;
+	}
+
+	function form($instance)
+	{
+		//widgetform in backend
+		$instance = wp_parse_args((array)$instance, array(
+			'title' => '',
+			'icon_color' => '#757575',
+			'title1' => '',
+			'title2' => '',
+			'title3' => '',
+			'title4' => '',
+			'title5' => '',
+			'title6' => '',
+			'title7' => '',
+			'title8' => '',
+			'title9' => '',
+			'title10' => '',
+			'title11' => '',
+			'title12' => '',
+			'image1' => '',
+			'image2' => '',
+			'image3' => '',
+			'image4' => '',
+			'image5' => '',
+			'image6' => '',
+			'image7' => '',
+			'image8' => '',
+			'image9' => '',
+			'image10' => '',
+			'image11' => '',
+			'image12' => '',
+			'desc1' => '',
+			'desc2' => '',
+			'desc3' => '',
+			'desc4' => '',
+			'desc5' => '',
+			'desc6' => '',
+			'desc7' => '',
+			'desc8' => '',
+			'desc9' => '',
+			'desc10' => '',
+			'desc11' => '',
+			'desc12' => '',
+		));
+		$title = strip_tags($instance['title']);
+		$icon_color = strip_tags($instance['icon_color']);
+
+		$title1 = strip_tags($instance['title1']);
+		$title2 = strip_tags($instance['title2']);
+		$title3 = strip_tags($instance['title3']);
+		$title4 = strip_tags($instance['title4']);
+		$title5 = strip_tags($instance['title5']);
+		$title6 = strip_tags($instance['title6']);
+		$title7 = strip_tags($instance['title7']);
+		$title8 = strip_tags($instance['title8']);
+		$title9 = strip_tags($instance['title9']);
+		$title10 = strip_tags($instance['title10']);
+		$title11 = strip_tags($instance['title11']);
+		$title12 = strip_tags($instance['title12']);
+
+		$image1 = strip_tags($instance['image1']);
+		$image2 = strip_tags($instance['image2']);
+		$image3 = strip_tags($instance['image3']);
+		$image4 = strip_tags($instance['image4']);
+		$image5 = strip_tags($instance['image5']);
+		$image6 = strip_tags($instance['image6']);
+		$image7 = strip_tags($instance['image7']);
+		$image8 = strip_tags($instance['image8']);
+		$image9 = strip_tags($instance['image9']);
+		$image10 = strip_tags($instance['image10']);
+		$image11 = strip_tags($instance['image11']);
+		$image12 = strip_tags($instance['image12']);
+
+		$desc1 = strip_tags($instance['desc1']);
+		$desc2 = strip_tags($instance['desc2']);
+		$desc3 = strip_tags($instance['desc3']);
+		$desc4 = strip_tags($instance['desc4']);
+		$desc5 = strip_tags($instance['desc5']);
+		$desc6 = strip_tags($instance['desc6']);
+		$desc7 = strip_tags($instance['desc7']);
+		$desc8 = strip_tags($instance['desc8']);
+		$desc9 = strip_tags($instance['desc9']);
+		$desc10 = strip_tags($instance['desc10']);
+		$desc11 = strip_tags($instance['desc11']);
+		$desc12 = strip_tags($instance['desc12']);
+		?>
         <p>
             <b>Heads Up!</b> If you don't have enough content, You can keep some boxes blank.
         </p>
@@ -579,22 +579,22 @@ 
             <textarea name="<?php echo $this->get_field_name( 'desc12' ); ?>" rows="3" class="widefat"><?php echo esc_attr($desc12); ?></textarea>
         </p>
         <?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;
 }
\ No newline at end of file

geodirectory-widgets/geodirectory_listing_slider_widget.php

Spacing +16 added lines, -16 removed lines

@@ -90,7 +90,7 @@ 
     {

 

         //widgetform in backend

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

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

             array('title' => '',

                 'post_type' => '',

                 'category' => '',

@@ -146,7 +146,7 @@ 
         ?>

 

         <p>

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

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

 

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

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

@@ -156,7 +156,7 @@ 
 

         <p>

             <label

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

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

 

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

 

@@ -180,7 +180,7 @@ 
 

         <p>

             <label

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

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

 

                 <?php

                 $category_taxonomy = geodir_get_taxonomies('gd_place');

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

         <p>

             <label

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

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

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

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

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

@@ -226,7 +226,7 @@ 
 

         <p>

             <label

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

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

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

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

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

@@ -235,7 +235,7 @@ 
 

         <p>

             <label

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

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

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

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

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

@@ -244,7 +244,7 @@ 
 

         <p>

             <label

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

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

 

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

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

@@ -262,7 +262,7 @@ 
 

         <p>

             <label

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

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

 

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

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

@@ -272,7 +272,7 @@ 
 

         <p>

             <label

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

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

 

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

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

@@ -282,7 +282,7 @@ 
 

         <p>

             <label

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

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

 

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

                     echo 'checked="checked"';

@@ -294,7 +294,7 @@ 
 

         <p>

             <label

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

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

 

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

                     echo 'checked="checked"';

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

         <p>

             <label

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

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

 

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

                     echo 'checked="checked"';

@@ -319,7 +319,7 @@ 
 

         <p>

             <label

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

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

 

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

                     echo 'checked="checked"';

@@ -353,10 +353,10 @@ 
 

             }

 

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

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

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

 

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

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

             <?php } ?>

 

         </script>

Indentation +109 added lines, -109 removed lines

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

 /**

- * GeoDirectory Listing Slider Widget

- *

- * @since 1.0.0

- *

- * @package GeoDirectory

- */

+	 * GeoDirectory Listing Slider Widget

+	 *

+	 * @since 1.0.0

+	 *

+	 * @package GeoDirectory

+	 */

 

 /**

  * GeoDirectory listing slider widget class.

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

 {

 

-    /**

+	/**

 	 * Register the listing slider widget.

 	 *

 	 * @since 1.0.0

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

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

 	 */

-    public function __construct() {

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

-        parent::__construct(

-            'listing_slider_view', // Base ID

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

-            $widget_ops// Args

-        );

-    }

+	public function __construct() {

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

+		parent::__construct(

+			'listing_slider_view', // Base ID

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

+			$widget_ops// Args

+		);

+	}

 	

 	/**

 	 * Front-end display content for listing slider widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $args     Widget arguments.

 	 * @param array $instance Saved values from database.

 	 */

-    public function widget($args, $instance)

-    {

-        geodir_listing_slider_widget_output($args, $instance);

-    }

+	public function widget($args, $instance)

+	{

+		geodir_listing_slider_widget_output($args, $instance);

+	}

 

 	/**

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

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

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

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

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

 	 */

 	public function update($new_instance, $old_instance)

-    {

-        //save the widget

-        $instance = $old_instance;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-

-        return $instance;

-    }

+	{

+		//save the widget

+		$instance = $old_instance;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+

+		return $instance;

+	}

 

 	/**

 	 * Back-end listing slider widget settings form.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

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

 	 */

 	public function form($instance)

-    {

+	{

 

-        //widgetform in backend

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

-            array('title' => '',

-                'post_type' => '',

-                'category' => '',

-                'post_number' => '5',

-                'max_show' => '1',

-                'slide_width' => '',

-                'show_title' => '',

-                'slideshow' => '',

-                'animationLoop' => '',

-                'directionNav' => '',

-                'slideshowSpeed' => 5000,

-                'animationSpeed' => 600,

-                'animation' => '',

-                'list_sort' => 'latest',

-                'show_featured_only' => '',

-            )

-        );

+		//widgetform in backend

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

+			array('title' => '',

+				'post_type' => '',

+				'category' => '',

+				'post_number' => '5',

+				'max_show' => '1',

+				'slide_width' => '',

+				'show_title' => '',

+				'slideshow' => '',

+				'animationLoop' => '',

+				'directionNav' => '',

+				'slideshowSpeed' => 5000,

+				'animationSpeed' => 600,

+				'animation' => '',

+				'list_sort' => 'latest',

+				'show_featured_only' => '',

+			)

+		);

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

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

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

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

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

 

-        $sort_fields = array();

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

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

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

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

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

-        ?>

+		$sort_fields = array();

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

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

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

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

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

+		?>

 

         <p>

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

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

 

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

-                            echo 'selected="selected"';

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

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

+							echo 'selected="selected"';

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

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

 

                     <?php } ?>

 

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

 

                 <?php

-                $category_taxonomy = geodir_get_taxonomies('gd_place');

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

-                ?>

+				$category_taxonomy = geodir_get_taxonomies('gd_place');

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

+				?>

 

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

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

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

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

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

 

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

-                            echo 'selected="selected"';

-                        } ?>

+							echo 'selected="selected"';

+						} ?>

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

 

                     <?php } ?>

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

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

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

-                        echo 'selected="selected"';

-                    } ?> value="slide">Slide

+						echo 'selected="selected"';

+					} ?> value="slide">Slide

                     </option>

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

-                        echo 'selected="selected"';

-                    } ?> value="fade">Fade

+						echo 'selected="selected"';

+					} ?> value="fade">Fade

                     </option>

                 </select>

             </label>

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

 

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

-                    echo 'checked="checked"';

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

+					echo 'checked="checked"';

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

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

 

             </label>

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

 

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

-                    echo 'checked="checked"';

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

+					echo 'checked="checked"';

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

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

 

             </label>

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

 

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

-                    echo 'checked="checked"';

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

+					echo 'checked="checked"';

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

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

 

             </label>

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

 

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

-                    echo 'checked="checked"';

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

+					echo 'checked="checked"';

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

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

 

             </label>

@@ -363,7 +363,7 @@ 
 

 

     <?php

-    }

+	}

 } // class geodir_listing_slider_widget

 

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

Braces +4 added lines, -1 removed lines

@@ -332,7 +332,10 @@
             <label

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

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

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

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

                        value="1"/>

             </label>

         </p>

geodirectory-widgets/geodirectory_popular_widget.php

Spacing +28 added lines, -28 removed lines

@@ -60,7 +60,7 @@ 
         //save the widget

         $instance = $old_instance;

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

-        $category_limit = (int)$new_instance['category_limit'];

+        $category_limit = (int) $new_instance['category_limit'];

         $instance['category_limit'] = $category_limit > 0 ? $category_limit : 15;

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

         return $instance;

@@ -78,10 +78,10 @@ 
 	public function form($instance)

     {

         //widgetform in backend

-        $instance = wp_parse_args((array)$instance, array('title' => '', 'category_limit' => 15, 'default_post_type' => ''));

+        $instance = wp_parse_args((array) $instance, array('title' => '', 'category_limit' => 15, 'default_post_type' => ''));

 

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

-        $category_limit = (int)$instance['category_limit'];

+        $category_limit = (int) $instance['category_limit'];

         $category_limit = $category_limit > 0 ? $category_limit : 15;

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

 		

@@ -96,10 +96,10 @@ 
         </p>

 		<p>

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

-		  <?php _e('Default post type to use (if not set by page)', 'geodirectory');?>

+		  <?php _e('Default post type to use (if not set by page)', 'geodirectory'); ?>

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

 			<?php foreach ($post_type_options as $name => $title) { ?>

-			<option value="<?php echo $name;?>" <?php selected($name, $default_post_type);?>><?php echo $title; ?></option>

+			<option value="<?php echo $name; ?>" <?php selected($name, $default_post_type); ?>><?php echo $title; ?></option>

 			<?php } ?>

 		  </select>

 		  </label>

@@ -109,7 +109,7 @@ 
                 for="<?php echo $this->get_field_id('category_limit'); ?>"><?php _e('Customize categories count to appear by default:', 'geodirectory'); ?>

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

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

-                       value="<?php echo (int)esc_attr($category_limit); ?>"/>

+                       value="<?php echo (int) esc_attr($category_limit); ?>"/>

 

                 <p class="description"

                    style="padding:0"><?php _e('After categories count reaches this limit option More Categories / Less Categoris will be displayed to show/hide categories. Default: 15', 'geodirectory'); ?></p>

@@ -215,7 +215,7 @@ 
 	public function form($instance)

     {

         //widgetform in backend

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

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

             array('title' => '',

                 'post_type' => '',

                 'category' => array(),

@@ -266,9 +266,9 @@ 
         ?>

 

         <p>

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

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

                 <small>(%posttype_singular_label% ,

-                    %posttype_plural_label% <?php _e('can be used', 'geodirectory');?>)

+                    %posttype_plural_label% <?php _e('can be used', 'geodirectory'); ?>)

                 </small>

 

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

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

         <p>

             <label

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

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

 

                 <?php $postypes = geodir_get_posttypes();

 				/**

@@ -311,7 +311,7 @@ 
 

         <p id="post_type_cats">

             <label

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

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

 

                 <?php

 

@@ -350,14 +350,14 @@ 
 

                 <input type="hidden" name="<?php echo $this->get_field_name('category_title'); ?>"

                        id="<?php echo $this->get_field_id('category_title'); ?>"

-                       value="<?php if ($category_title != '') echo $category_title; else echo __('All', 'geodirectory');?>"/>

+                       value="<?php if ($category_title != '') echo $category_title; else echo __('All', 'geodirectory'); ?>"/>

 

             </label>

         </p>

 

         <p>

             <label

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

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

 

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

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

@@ -393,7 +393,7 @@ 
         <p>

 

             <label

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

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

 

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

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

@@ -403,7 +403,7 @@ 
 

         <p>

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

-                <?php _e('Layout:', 'geodirectory');?>

+                <?php _e('Layout:', 'geodirectory'); ?>

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

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

                     <option <?php if ($layout == 'gridview_onehalf') {

@@ -432,7 +432,7 @@ 
 

         <p>

             <label

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

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

 

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

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

@@ -442,7 +442,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('character_count'); ?>"><?php _e('Post Content excerpt character count :', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('character_count'); ?>"><?php _e('Post Content excerpt character count :', 'geodirectory'); ?>

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

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

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

@@ -451,41 +451,41 @@ 
 

         <p>

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

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

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

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

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

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

                        value="1"/>

             </label>

         </p>

         <p>

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

-                <?php _e('Show only featured listings:', 'geodirectory');?> <input type="checkbox"

+                <?php _e('Show only featured listings:', 'geodirectory'); ?> <input type="checkbox"

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

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

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

                                                                                             value="1"/>

             </label>

         </p>

         <p>

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

-                <?php _e('Show only listings with special offers:', 'geodirectory');?> <input type="checkbox"

+                <?php _e('Show only listings with special offers:', 'geodirectory'); ?> <input type="checkbox"

                                                                                                        id="<?php echo $this->get_field_id('show_special_only'); ?>"

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

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

                                                                                                        value="1"/>

             </label>

         </p>

         <p>

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

-                <?php _e('Show only listings with pics:', 'geodirectory');?> <input type="checkbox"

+                <?php _e('Show only listings with pics:', 'geodirectory'); ?> <input type="checkbox"

                                                                                              id="<?php echo $this->get_field_id('with_pics_only'); ?>"

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

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

                                                                                              value="1"/>

             </label>

         </p>

         <p>

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

-                <?php _e('Show only listings with videos:', 'geodirectory');?> <input type="checkbox"

+                <?php _e('Show only listings with videos:', 'geodirectory'); ?> <input type="checkbox"

                                                                                                id="<?php echo $this->get_field_id('with_videos_only'); ?>"

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

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

                                                                                                value="1"/>

             </label>

         </p>

@@ -531,7 +531,7 @@ 
 

             }

 

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

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

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

 

             <?php } ?>

Indentation +161 added lines, -161 removed lines

@@ -14,41 +14,41 @@ 
  */

 class geodir_popular_post_category extends WP_Widget

 {

-    /**

+	/**

 	 * Register the popular post category widget.

 	 *

 	 * @since 1.0.0

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

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

 	 */

-    public function __construct() {

-        $widget_ops = array('classname' => 'geodir_popular_post_category', 'description' => __('GD > Popular Post Category', 'geodirectory'));

-        parent::__construct(

-            'popular_post_category', // Base ID

-            __('GD > Popular Post Category', 'geodirectory'), // Name

-            $widget_ops// Args

-        );

-    }

+	public function __construct() {

+		$widget_ops = array('classname' => 'geodir_popular_post_category', 'description' => __('GD > Popular Post Category', 'geodirectory'));

+		parent::__construct(

+			'popular_post_category', // Base ID

+			__('GD > Popular Post Category', 'geodirectory'), // Name

+			$widget_ops// Args

+		);

+	}

 

 	/**

 	 * Front-end display content for popular post category widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $args     Widget arguments.

 	 * @param array $instance Saved values from database.

 	 */

 	public function widget($args, $instance)

-    {

-        geodir_popular_post_category_output($args, $instance);

-    }

+	{

+		geodir_popular_post_category_output($args, $instance);

+	}

 

 	/**

 	 * Sanitize popular post category widget form values as they are saved.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

-     * @since 1.5.1 Added default_post_type parameter.

+	 * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Added default_post_type parameter.

 	 *

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

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

@@ -56,37 +56,37 @@ 
 	 * @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']);

-        $category_limit = (int)$new_instance['category_limit'];

-        $instance['category_limit'] = $category_limit > 0 ? $category_limit : 15;

+	{

+		//save the widget

+		$instance = $old_instance;

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

+		$category_limit = (int)$new_instance['category_limit'];

+		$instance['category_limit'] = $category_limit > 0 ? $category_limit : 15;

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

-        return $instance;

-    }

+		return $instance;

+	}

 

 	/**

 	 * Back-end popular post category widget settings form.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

-     * @since 1.5.1 Added option to set default post type.

+	 * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Added option to set default post type.

 	 *

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

 	 */

 	public function form($instance)

-    {

-        //widgetform in backend

-        $instance = wp_parse_args((array)$instance, array('title' => '', 'category_limit' => 15, 'default_post_type' => ''));

+	{

+		//widgetform in backend

+		$instance = wp_parse_args((array)$instance, array('title' => '', 'category_limit' => 15, 'default_post_type' => ''));

 

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

-        $category_limit = (int)$instance['category_limit'];

-        $category_limit = $category_limit > 0 ? $category_limit : 15;

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

+		$category_limit = (int)$instance['category_limit'];

+		$category_limit = $category_limit > 0 ? $category_limit : 15;

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

 		

 		$post_type_options = geodir_get_posttypes('options');

-        ?>

+		?>

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

@@ -116,7 +116,7 @@ 
             </label>

         </p>

     <?php

-    }

+	}

 } // class geodir_popular_post_category

 

 register_widget('geodir_popular_post_category');

@@ -130,40 +130,40 @@ 
 class geodir_popular_postview extends WP_Widget

 {

 

-    /**

+	/**

 	 * Register the popular posts widget.

 	 *

 	 * @since 1.0.0

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

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

 	 */

-    public function __construct() {

-        $widget_ops = array('classname' => 'geodir_popular_post_view', 'description' => __('GD > Popular Post View', 'geodirectory'));

-        parent::__construct(

-            'popular_post_view', // Base ID

-            __('GD > Popular Post View', 'geodirectory'), // Name

-            $widget_ops// Args

-        );

-    }

+	public function __construct() {

+		$widget_ops = array('classname' => 'geodir_popular_post_view', 'description' => __('GD > Popular Post View', 'geodirectory'));

+		parent::__construct(

+			'popular_post_view', // Base ID

+			__('GD > Popular Post View', 'geodirectory'), // Name

+			$widget_ops// Args

+		);

+	}

 

 	/**

 	 * Front-end display content for popular posts widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $args     Widget arguments.

 	 * @param array $instance Saved values from database.

 	 */

 	public function widget($args, $instance)

-    {

-        geodir_popular_postview_output($args, $instance);

-    }

+	{

+		geodir_popular_postview_output($args, $instance);

+	}

 

 	/**

 	 * Sanitize popular posts widget form values as they are saved.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

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

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

@@ -171,99 +171,99 @@ 
 	 * @return array Updated safe values to be saved.

 	 */

 	public function update($new_instance, $old_instance)

-    {

-        //save the widget

-        $instance = $old_instance;

-

-        if ($new_instance['title'] == '') {

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

-            //$instance['title'] = $title;

-        }

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

-

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

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

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

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

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

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

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

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

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

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

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

-        else

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

-

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

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

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

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

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

-

-        return $instance;

-    }

+	{

+		//save the widget

+		$instance = $old_instance;

+

+		if ($new_instance['title'] == '') {

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

+			//$instance['title'] = $title;

+		}

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

+

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

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

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

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

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

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

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

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

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

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

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

+		else

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

+

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

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

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

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

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

+

+		return $instance;

+	}

 

 	/**

 	 * Back-end popular posts widget settings form.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

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

 	 */

 	public function form($instance)

-    {

-        //widgetform in backend

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

-            array('title' => '',

-                'post_type' => '',

-                'category' => 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' => ''

-            )

-        );

+	{

+		//widgetform in backend

+		$instance = wp_parse_args((array)$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' => ''

+			)

+		);

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

 

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

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

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

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

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

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

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

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

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

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

 

-        ?>

+		?>

 

         <p>

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

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

 

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

-                            echo 'selected="selected"';

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

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

+							echo 'selected="selected"';

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

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

 

                     <?php } ?>

 

@@ -315,30 +315,30 @@ 
 

                 <?php

 

-                $post_type = ($post_type != '') ? $post_type : 'gd_place';

+				$post_type = ($post_type != '') ? $post_type : 'gd_place';

 

-                $all_postypes = geodir_get_posttypes();

+				$all_postypes = geodir_get_posttypes();

 

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

-                    $post_type = 'gd_place';

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

+					$post_type = 'gd_place';

 

-                $category_taxonomy = geodir_get_taxonomies($post_type);

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

+				$category_taxonomy = geodir_get_taxonomies($post_type);

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

 

-                ?>

+				?>

 

                 <select multiple="multiple" class="widefat" name="<?php echo $this->get_field_name('category'); ?>[]"

                         onchange="geodir_popular_widget_cat_title(this)">

 

                     <option <?php if (!is_array($category) || (is_array($category) && in_array('0', $category))) {

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

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

-                        $selected = '';

-                        if (is_array($category) && in_array($category_obj->term_id, $category))

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

+						$selected = '';

+						if (is_array($category) && in_array($category_obj->term_id, $category))

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

 

-                        ?>

+						?>

 

                         <option <?php echo $selected; ?>

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

@@ -363,28 +363,28 @@ 
                         name="<?php echo $this->get_field_name('list_sort'); ?>">

 

                     <option <?php if ($list_sort == 'az') {

-                        echo 'selected="selected"';

-                    } ?> value="az"><?php _e('A-Z', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="az"><?php _e('A-Z', 'geodirectory'); ?></option>

 

                     <option <?php if ($list_sort == 'latest') {

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

 

                     <option <?php if ($list_sort == 'featured') {

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

 

                     <option <?php if ($list_sort == 'high_review') {

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

 

                     <option <?php if ($list_sort == 'high_rating') {

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

 

                     <option <?php if ($list_sort == 'random') {

-                        echo 'selected="selected"';

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

+						echo 'selected="selected"';

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

 

                 </select>

             </label>

@@ -407,24 +407,24 @@ 
                 <select class="widefat" id="<?php echo $this->get_field_id('layout'); ?>"

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

                     <option <?php if ($layout == 'gridview_onehalf') {

-                        echo 'selected="selected"';

-                    } ?>

+						echo 'selected="selected"';

+					} ?>

                         value="gridview_onehalf"><?php _e('Grid View (Two Columns)', 'geodirectory'); ?></option>

                     <option <?php if ($layout == 'gridview_onethird') {

-                        echo 'selected="selected"';

-                    } ?>

+						echo 'selected="selected"';

+					} ?>

                         value="gridview_onethird"><?php _e('Grid View (Three Columns)', 'geodirectory'); ?></option>

                     <option <?php if ($layout == 'gridview_onefourth') {

-                        echo 'selected="selected"';

-                    } ?>

+						echo 'selected="selected"';

+					} ?>

                         value="gridview_onefourth"><?php _e('Grid View (Four Columns)', 'geodirectory'); ?></option>

                     <option <?php if ($layout == 'gridview_onefifth') {

-                        echo 'selected="selected"';

-                    } ?>

+						echo 'selected="selected"';

+					} ?>

                         value="gridview_onefifth"><?php _e('Grid View (Five Columns)', 'geodirectory'); ?></option>

                     <option <?php if ($layout == 'list') {

-                        echo 'selected="selected"';

-                    } ?> value="list"><?php _e('List view', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="list"><?php _e('List view', 'geodirectory'); ?></option>

 

                 </select>

             </label>

@@ -494,8 +494,8 @@ 
                 for="<?php echo $this->get_field_id('use_viewing_post_type'); ?>"><?php _e('Use current viewing post type:', 'geodirectory'); ?>

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

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

-                    echo 'checked="checked"';

-                } ?>  value="1"/>

+					echo 'checked="checked"';

+				} ?>  value="1"/>

             </label>

         </p>

 

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

 

     <?php

-    }

+	}

 } // class geodir_popular_postview

 

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

Braces +37 added lines, -14 removed lines

@@ -190,10 +190,11 @@ 
         $instance['listing_width'] = strip_tags($new_instance['listing_width']);

         $instance['list_sort'] = strip_tags($new_instance['list_sort']);

         $instance['character_count'] = $new_instance['character_count'];

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

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

-        else

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

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

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

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

@@ -319,8 +320,9 @@ 
 

                 $all_postypes = geodir_get_posttypes();

 

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

-                    $post_type = 'gd_place';

+                if (!in_array($post_type, $all_postypes)) {
+                                    $post_type = 'gd_place';
+                }
 

                 $category_taxonomy = geodir_get_taxonomies($post_type);

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

@@ -335,8 +337,9 @@ 
                     } ?> value="0"><?php _e('All', 'geodirectory'); ?></option>

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

                         $selected = '';

-                        if (is_array($category) && in_array($category_obj->term_id, $category))

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

+                        if (is_array($category) && in_array($category_obj->term_id, $category)) {
+                                                    echo $selected = 'selected="selected"';
+                        }
 

                         ?>

 

@@ -350,7 +353,12 @@ 
 

                 <input type="hidden" name="<?php echo $this->get_field_name('category_title'); ?>"

                        id="<?php echo $this->get_field_id('category_title'); ?>"

-                       value="<?php if ($category_title != '') echo $category_title; else echo __('All', 'geodirectory');?>"/>

+                       value="<?php if ($category_title != '') {
+	echo $category_title;
+} else {
+	echo __('All', 'geodirectory');
+}
+?>"/>

 

             </label>

         </p>

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

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

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

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

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

                        value="1"/>

             </label>

         </p>

@@ -461,7 +472,10 @@ 
             <label for="<?php echo $this->get_field_id('show_featured_only'); ?>">

                 <?php _e('Show only featured listings:', 'geodirectory');?> <input type="checkbox"

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

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

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

                                                                                             value="1"/>

             </label>

         </p>

@@ -469,7 +483,10 @@ 
             <label for="<?php echo $this->get_field_id('show_special_only'); ?>">

                 <?php _e('Show only listings with special offers:', 'geodirectory');?> <input type="checkbox"

                                                                                                        id="<?php echo $this->get_field_id('show_special_only'); ?>"

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

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

                                                                                                        value="1"/>

             </label>

         </p>

@@ -477,7 +494,10 @@ 
             <label for="<?php echo $this->get_field_id('with_pics_only'); ?>">

                 <?php _e('Show only listings with pics:', 'geodirectory');?> <input type="checkbox"

                                                                                              id="<?php echo $this->get_field_id('with_pics_only'); ?>"

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

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

                                                                                              value="1"/>

             </label>

         </p>

@@ -485,7 +505,10 @@ 
             <label for="<?php echo $this->get_field_id('with_videos_only'); ?>">

                 <?php _e('Show only listings with videos:', 'geodirectory');?> <input type="checkbox"

                                                                                                id="<?php echo $this->get_field_id('with_videos_only'); ?>"

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

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

                                                                                                value="1"/>

             </label>

         </p>

geodirectory-widgets/geodirectory_related_listing_widget.php

Spacing +10 added lines, -10 removed lines

@@ -137,7 +137,7 @@ 
     public function form($instance)
     {
         //widgetform in backend
-        $instance = wp_parse_args((array)$instance,
+        $instance = wp_parse_args((array) $instance,
             array('title' => '',
                 'list_sort' => '',
                 'list_order' => '',
@@ -169,7 +169,7 @@ 
 
         ?>
         <p>
-            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>
+            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory'); ?>
 
                 <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"
                        name="<?php echo $this->get_field_name('title'); ?>" type="text"
@@ -178,7 +178,7 @@ 
         </p>
         <p>
             <label
-                for="<?php echo $this->get_field_id('list_sort'); ?>"><?php _e('Sort by:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('list_sort'); ?>"><?php _e('Sort by:', 'geodirectory'); ?>
 
                 <select class="widefat" id="<?php echo $this->get_field_id('list_sort'); ?>"
                         name="<?php echo $this->get_field_name('list_sort'); ?>">
@@ -208,7 +208,7 @@ 
         </p>
         <p>
             <label
-                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts:', 'geodirectory'); ?>
 
                 <input class="widefat" id="<?php echo $this->get_field_id('post_number'); ?>"
                        name="<?php echo $this->get_field_name('post_number'); ?>" type="text"
@@ -217,7 +217,7 @@ 
         </p>
         <p>
             <label for="<?php echo $this->get_field_id('relate_to'); ?>">
-                <?php _e('Relate to:', 'geodirectory');?>
+                <?php _e('Relate to:', 'geodirectory'); ?>
                 <select class="widefat" id="<?php echo $this->get_field_id('relate_to'); ?>"
                         name="<?php echo $this->get_field_name('relate_to'); ?>">
                     <option <?php if ($relate_to == 'category') {
@@ -232,7 +232,7 @@ 
         <p>
         <p>
             <label for="<?php echo $this->get_field_id('layout'); ?>">
-                <?php _e('Layout:', 'geodirectory');?>
+                <?php _e('Layout:', 'geodirectory'); ?>
                 <select class="widefat" id="<?php echo $this->get_field_id('layout'); ?>"
                         name="<?php echo $this->get_field_name('layout'); ?>">
                     <option <?php if ($layout == 'gridview_onehalf') {
@@ -260,7 +260,7 @@ 
         </p>
         <p>
             <label
-                for="<?php echo $this->get_field_id('listing_width'); ?>"><?php _e('Listing width:', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('listing_width'); ?>"><?php _e('Listing width:', 'geodirectory'); ?>
 
                 <input class="widefat" id="<?php echo $this->get_field_id('listing_width'); ?>"
                        name="<?php echo $this->get_field_name('listing_width'); ?>" type="text"
@@ -269,7 +269,7 @@ 
         </p>
         <p>
             <label
-                for="<?php echo $this->get_field_id('character_count'); ?>"><?php _e('Post Content excerpt character count :', 'geodirectory');?>
+                for="<?php echo $this->get_field_id('character_count'); ?>"><?php _e('Post Content excerpt character count :', 'geodirectory'); ?>
                 <input class="widefat" id="<?php echo $this->get_field_id('character_count'); ?>"
                        name="<?php echo $this->get_field_name('character_count'); ?>" type="text"
                        value="<?php echo esc_attr($character_count); ?>"/>
@@ -277,9 +277,9 @@ 
         </p>
         <p>
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">
-                <?php _e('Enable Location Filter:', 'geodirectory');?>
+                <?php _e('Enable Location Filter:', 'geodirectory'); ?>
                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"
-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>
+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"'; ?>
                        value="1"/>
             </label>
         </p>

Indentation +120 added lines, -120 removed lines

@@ -14,160 +14,160 @@ 
  */
 class geodir_related_listing_postview extends WP_Widget
 {
-    /**
+	/**
 	 * Register the related listing widget.
 	 *
 	 * @since 1.0.0
-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
 	 */
-    public function __construct() {
-        $widget_ops = array('classname' => 'geodir_related_listing_post_view', 'description' => __('GD > Related Listing', 'geodirectory'));
-        parent::__construct(
-            'post_related_listing', // Base ID
-            __('GD > Related Listing', 'geodirectory'), // Name
-            $widget_ops// Args
-        );
-    }
+	public function __construct() {
+		$widget_ops = array('classname' => 'geodir_related_listing_post_view', 'description' => __('GD > Related Listing', 'geodirectory'));
+		parent::__construct(
+			'post_related_listing', // Base ID
+			__('GD > Related Listing', 'geodirectory'), // Name
+			$widget_ops// Args
+		);
+	}
 
 	/**
 	 * Front-end display content for related listing widget.
 	 *
 	 * @since 1.0.0
-     * @since 1.5.1 Declare function public.
+	 * @since 1.5.1 Declare function public.
 	 *
 	 * @param array $args     Widget arguments.
 	 * @param array $instance Saved values from database.
 	 */
-    public function widget($args, $instance)
-    {
+	public function widget($args, $instance)
+	{
 
-        // prints the widget
-        extract($args, EXTR_SKIP);
+		// prints the widget
+		extract($args, EXTR_SKIP);
 
-        /** This filter is documented in geodirectory_widgets.php */
-        $title = empty($instance['title']) ? __('Related Listing', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
+		/** This filter is documented in geodirectory_widgets.php */
+		$title = empty($instance['title']) ? __('Related Listing', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
+		/** This filter is documented in geodirectory-functions/general_functions.php */
 		$post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
 
-        /**
-         * Filter the relation type to get related listing.
-         *
-         * @since 1.0.0
-         * @param string $instance['relate_to'] Can be tags or category.
-         */
+		/**
+		 * Filter the relation type to get related listing.
+		 *
+		 * @since 1.0.0
+		 * @param string $instance['relate_to'] Can be tags or category.
+		 */
 		$relate_to = empty($instance['relate_to']) ? 'category' : apply_filters('widget_relate_to', $instance['relate_to']);
 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
+		/** This filter is documented in geodirectory-functions/general_functions.php */
 		$layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);
 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
+		/** This filter is documented in geodirectory-functions/general_functions.php */
 		$add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);
 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
+		/** This filter is documented in geodirectory-functions/general_functions.php */
 		$listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);
 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
+		/** This filter is documented in geodirectory-functions/general_functions.php */
 		$list_sort = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);
 
-        /** This filter is documented in geodirectory-functions/general_functions.php */
+		/** This filter is documented in geodirectory-functions/general_functions.php */
 		$character_count = empty($instance['character_count']) ? 20 : apply_filters('widget_list_character_count', $instance['character_count']);
 
-        $arr = array(
-            'before_title' => $before_title,
-            'after_title' => $after_title,
-            'title' => $title,
-            'post_number' => $post_number,
-            'relate_to' => $relate_to,
-            'layout' => $layout,
-            'add_location_filter' => $add_location_filter,
-            'listing_width' => $listing_width,
-            'list_sort' => $list_sort,
-            'character_count' => $character_count,
-            'is_widget' => '1'
-        );
-
-        if ($widget_display = geodir_related_posts_display($arr)) {
-
-            echo $before_widget;
-            echo $widget_display;
-            echo $after_widget;
-        }
-    }
+		$arr = array(
+			'before_title' => $before_title,
+			'after_title' => $after_title,
+			'title' => $title,
+			'post_number' => $post_number,
+			'relate_to' => $relate_to,
+			'layout' => $layout,
+			'add_location_filter' => $add_location_filter,
+			'listing_width' => $listing_width,
+			'list_sort' => $list_sort,
+			'character_count' => $character_count,
+			'is_widget' => '1'
+		);
+
+		if ($widget_display = geodir_related_posts_display($arr)) {
+
+			echo $before_widget;
+			echo $widget_display;
+			echo $after_widget;
+		}
+	}
 
 	/**
 	 * Sanitize related listing widget form values as they are saved.
 	 *
 	 * @since 1.0.0
-     * @since 1.5.1 Declare function public.
+	 * @since 1.5.1 Declare function public.
 	 *
 	 * @param array $new_instance Values just sent to be saved.
 	 * @param array $old_instance Previously saved values from database.
 	 *
 	 * @return array Updated safe values to be saved.
 	 */
-    public function update($new_instance, $old_instance)
-    {
-        //save the widget
-        $instance = $old_instance;
-
-        $instance['title'] = strip_tags($new_instance['title']);
-        $instance['post_number'] = strip_tags($new_instance['post_number']);
-        $instance['relate_to'] = strip_tags($new_instance['relate_to']);
-        $instance['layout'] = strip_tags($new_instance['layout']);
-        $instance['listing_width'] = strip_tags($new_instance['listing_width']);
-        $instance['list_sort'] = strip_tags($new_instance['list_sort']);
-        $instance['character_count'] = $new_instance['character_count'];
-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
-        else
-            $instance['add_location_filter'] = '0';
-
-        return $instance;
-    }
+	public function update($new_instance, $old_instance)
+	{
+		//save the widget
+		$instance = $old_instance;
+
+		$instance['title'] = strip_tags($new_instance['title']);
+		$instance['post_number'] = strip_tags($new_instance['post_number']);
+		$instance['relate_to'] = strip_tags($new_instance['relate_to']);
+		$instance['layout'] = strip_tags($new_instance['layout']);
+		$instance['listing_width'] = strip_tags($new_instance['listing_width']);
+		$instance['list_sort'] = strip_tags($new_instance['list_sort']);
+		$instance['character_count'] = $new_instance['character_count'];
+		if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
+			$instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
+		else
+			$instance['add_location_filter'] = '0';
+
+		return $instance;
+	}
 
 	/**
 	 * Back-end related listing widget settings form.
 	 *
 	 * @since 1.0.0
-     * @since 1.5.1 Declare function public.
+	 * @since 1.5.1 Declare function public.
 	 *
 	 * @param array $instance Previously saved values from database.
 	 */
-    public function form($instance)
-    {
-        //widgetform in backend
-        $instance = wp_parse_args((array)$instance,
-            array('title' => '',
-                'list_sort' => '',
-                'list_order' => '',
-                'post_number' => '5',
-                'relate_to' => '',
-                'layout' => 'gridview_onehalf',
-                'listing_width' => '',
-                'add_location_filter' => '1',
-                'character_count' => '20')
-        );
+	public function form($instance)
+	{
+		//widgetform in backend
+		$instance = wp_parse_args((array)$instance,
+			array('title' => '',
+				'list_sort' => '',
+				'list_order' => '',
+				'post_number' => '5',
+				'relate_to' => '',
+				'layout' => 'gridview_onehalf',
+				'listing_width' => '',
+				'add_location_filter' => '1',
+				'character_count' => '20')
+		);
 
-        $title = strip_tags($instance['title']);
+		$title = strip_tags($instance['title']);
 
-        $list_sort = strip_tags($instance['list_sort']);
+		$list_sort = strip_tags($instance['list_sort']);
 
-        $list_order = strip_tags($instance['list_order']);
+		$list_order = strip_tags($instance['list_order']);
 
-        $post_number = strip_tags($instance['post_number']);
+		$post_number = strip_tags($instance['post_number']);
 
-        $relate_to = strip_tags($instance['relate_to']);
+		$relate_to = strip_tags($instance['relate_to']);
 
-        $layout = strip_tags($instance['layout']);
+		$layout = strip_tags($instance['layout']);
 
-        $listing_width = strip_tags($instance['listing_width']);
+		$listing_width = strip_tags($instance['listing_width']);
 
-        $add_location_filter = strip_tags($instance['add_location_filter']);
+		$add_location_filter = strip_tags($instance['add_location_filter']);
 
-        $character_count = $instance['character_count'];
+		$character_count = $instance['character_count'];
 
-        ?>
+		?>
         <p>
             <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>
 
@@ -184,24 +184,24 @@ 
                         name="<?php echo $this->get_field_name('list_sort'); ?>">
 
                     <option <?php if ($list_sort == 'latest') {
-                        echo 'selected="selected"';
-                    } ?> value="latest"><?php _e('Latest', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="latest"><?php _e('Latest', 'geodirectory'); ?></option>
 
                     <option <?php if ($list_sort == 'featured') {
-                        echo 'selected="selected"';
-                    } ?> value="featured"><?php _e('Featured', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="featured"><?php _e('Featured', 'geodirectory'); ?></option>
 
                     <option <?php if ($list_sort == 'high_review') {
-                        echo 'selected="selected"';
-                    } ?> value="high_review"><?php _e('Review', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="high_review"><?php _e('Review', 'geodirectory'); ?></option>
 
                     <option <?php if ($list_sort == 'high_rating') {
-                        echo 'selected="selected"';
-                    } ?> value="high_rating"><?php _e('Rating', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="high_rating"><?php _e('Rating', 'geodirectory'); ?></option>
 
                     <option <?php if ($list_sort == 'random') {
-                        echo 'selected="selected"';
-                    } ?> value="random"><?php _e('Random', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="random"><?php _e('Random', 'geodirectory'); ?></option>
 
                 </select>
             </label>
@@ -221,11 +221,11 @@ 
                 <select class="widefat" id="<?php echo $this->get_field_id('relate_to'); ?>"
                         name="<?php echo $this->get_field_name('relate_to'); ?>">
                     <option <?php if ($relate_to == 'category') {
-                        echo 'selected="selected"';
-                    } ?> value="category"><?php _e('Categories', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="category"><?php _e('Categories', 'geodirectory'); ?></option>
                     <option <?php if ($relate_to == 'tags') {
-                        echo 'selected="selected"';
-                    } ?> value="tags"><?php _e('Tags', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="tags"><?php _e('Tags', 'geodirectory'); ?></option>
                 </select>
             </label>
         </p>
@@ -236,24 +236,24 @@ 
                 <select class="widefat" id="<?php echo $this->get_field_id('layout'); ?>"
                         name="<?php echo $this->get_field_name('layout'); ?>">
                     <option <?php if ($layout == 'gridview_onehalf') {
-                        echo 'selected="selected"';
-                    } ?>
+						echo 'selected="selected"';
+					} ?>
                         value="gridview_onehalf"><?php _e('Grid View (Two Columns)', 'geodirectory'); ?></option>
                     <option <?php if ($layout == 'gridview_onethird') {
-                        echo 'selected="selected"';
-                    } ?>
+						echo 'selected="selected"';
+					} ?>
                         value="gridview_onethird"><?php _e('Grid View (Three Columns)', 'geodirectory'); ?></option>
                     <option <?php if ($layout == 'gridview_onefourth') {
-                        echo 'selected="selected"';
-                    } ?>
+						echo 'selected="selected"';
+					} ?>
                         value="gridview_onefourth"><?php _e('Grid View (Four Columns)', 'geodirectory'); ?></option>
                     <option <?php if ($layout == 'gridview_onefifth') {
-                        echo 'selected="selected"';
-                    } ?>
+						echo 'selected="selected"';
+					} ?>
                         value="gridview_onefifth"><?php _e('Grid View (Five Columns)', 'geodirectory'); ?></option>
                     <option <?php if ($layout == 'list') {
-                        echo 'selected="selected"';
-                    } ?> value="list"><?php _e('List view', 'geodirectory'); ?></option>
+						echo 'selected="selected"';
+					} ?> value="list"><?php _e('List view', 'geodirectory'); ?></option>
 
                 </select>
             </label>
@@ -285,7 +285,7 @@ 
         </p>
 
     <?php
-    }
+	}
 } // class geodir_related_listing_postview
 
 register_widget('geodir_related_listing_postview');
\ No newline at end of file

Braces +9 added lines, -5 removed lines

@@ -118,10 +118,11 @@ 
         $instance['listing_width'] = strip_tags($new_instance['listing_width']);
         $instance['list_sort'] = strip_tags($new_instance['list_sort']);
         $instance['character_count'] = $new_instance['character_count'];
-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
-        else
-            $instance['add_location_filter'] = '0';
+        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '') {
+                    $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
+        } else {
+                    $instance['add_location_filter'] = '0';
+        }
 
         return $instance;
     }
@@ -279,7 +280,10 @@ 
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">
                 <?php _e('Enable Location Filter:', 'geodirectory');?>
                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"
-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>
+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) {
+	echo 'checked="checked"';
+}
+?>
                        value="1"/>
             </label>
         </p>

geodirectory-widgets/geodirectory_reviews_widget.php

Spacing +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
 	public function form($instance)

     {

         //widgetform in backend

-        $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'count' => ''));

+        $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'count' => ''));

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

         $count = strip_tags($instance['count']);

         ?>

Indentation +49 added lines, -49 removed lines

@@ -14,37 +14,37 @@ 
  */

 class geodir_recent_reviews_widget extends WP_Widget

 {

-    /**

+	/**

 	 * Register the recent reviews widget.

 	 *

 	 * @since 1.0.0

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

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

 	 */

-    public function __construct() {

-        $widget_ops = array('classname' => 'geodir_recent_reviews', 'description' => __('GD > Recent Reviews', 'geodirectory'));

-        parent::__construct(

-            'geodir_recent_reviews', // Base ID

-            __('GD > Recent Reviews', 'geodirectory'), // Name

-            $widget_ops// Args

-        );

-    }

+	public function __construct() {

+		$widget_ops = array('classname' => 'geodir_recent_reviews', 'description' => __('GD > Recent Reviews', 'geodirectory'));

+		parent::__construct(

+			'geodir_recent_reviews', // Base ID

+			__('GD > Recent Reviews', 'geodirectory'), // Name

+			$widget_ops// Args

+		);

+	}

 

 	/**

 	 * Front-end display content for recent reviews widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $args     Widget arguments.

 	 * @param array $instance Saved values from database.

 	 */

 	public function widget($args, $instance)

-    {

-        // prints the widget

-        extract($args, EXTR_SKIP);

+	{

+		// prints the widget

+		extract($args, EXTR_SKIP);

 

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

-        $title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

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

+		$title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

 		

 		/**

 		 * Filter the number of reviews to display.

@@ -63,35 +63,35 @@ 
 		 * @param int $g_size Height and width of the avatar image in pixels. Default 30.

 		 */

 		$g_size = apply_filters('geodir_recent_reviews_g_size', 30);

-        /**

-         * Filter the excerpt length

-         *

-         * @since 1.0.0

-         *

-         * @param int $excerpt_length Excerpt length. Default 100.

-         */

-        $excerpt_length = apply_filters('geodir_recent_reviews_excerpt_length', 100);

-        $comments_li = geodir_get_recent_reviews($g_size, $count, $excerpt_length, false);

+		/**

+		 * Filter the excerpt length

+		 *

+		 * @since 1.0.0

+		 *

+		 * @param int $excerpt_length Excerpt length. Default 100.

+		 */

+		$excerpt_length = apply_filters('geodir_recent_reviews_excerpt_length', 100);

+		$comments_li = geodir_get_recent_reviews($g_size, $count, $excerpt_length, false);

 

-        if ($comments_li) {

-            echo $before_widget;

-            ?>

+		if ($comments_li) {

+			echo $before_widget;

+			?>

             <div class="widget geodir_recent_reviews_section">

                 <?php if ($title) {

-                    echo $before_title . $title . $after_title;

-                } ?>

+					echo $before_title . $title . $after_title;

+				} ?>

                 <ul class="geodir_recent_reviews"><?php echo $comments_li; ?></ul>

             </div>

             <?php

-            echo $after_widget;

-        }

-    }

+			echo $after_widget;

+		}

+	}

 

 	/**

 	 * Sanitize recent reviews widget form values as they are saved.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

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

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

@@ -99,29 +99,29 @@ 
 	 * @return array Updated safe values to be saved.

 	 */

 	public function update($new_instance, $old_instance)

-    {

-        //save the widget

-        $instance = $old_instance;

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

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

-        return $instance;

-    }

+	{

+		//save the widget

+		$instance = $old_instance;

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

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

+		return $instance;

+	}

     

 	/**

 	 * Back-end recent reviews widget settings form.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

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

 	 */

 	public function form($instance)

-    {

-        //widgetform in backend

-        $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'count' => ''));

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

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

-        ?>

+	{

+		//widgetform in backend

+		$instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'count' => ''));

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

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

+		?>

         <p><label for="<?php echo $this->get_field_id('title'); ?>">Widget Title: <input class="widefat"

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

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

@@ -135,7 +135,7 @@ 
                                                                                              value="<?php echo esc_attr($count); ?>"/></label>

         </p>

     <?php

-    }

+	}

 } // class geodir_recent_reviews_widget

 

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