GeoDirectory / geodirectory

geodirectory-widgets/geodirectory_popular_widget.php

Indentation +75 added lines, -75 removed lines

@@ -15,11 +15,11 @@ 
 class geodir_popular_post_category extends WP_Widget

 {

     /**

-	 * Register the popular post category widget.

-	 *

-	 * @since 1.0.0

+     * Register the popular post category widget.

+     *

+     * @since 1.0.0

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

-	 */

+     */

     function __construct() {

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

         parent::__construct(

@@ -29,53 +29,53 @@ 
         );

     }

 

-	/**

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

-	 *

-	 * @since 1.0.0

+    /**

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

+     *

+     * @since 1.0.0

      * @since 1.5.1 Declare function public.

-	 *

-	 * @param array $args     Widget arguments.

-	 * @param array $instance Saved values from database.

-	 */

-	public function widget($args, $instance)

+     *

+     * @param array $args     Widget arguments.

+     * @param array $instance Saved values from database.

+     */

+    public function widget($args, $instance)

     {

         geodir_popular_post_category_output($args, $instance);

     }

 

-	/**

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

-	 *

-	 * @since 1.0.0

+    /**

+     * 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.

-	 *

-	 * @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)

+     *

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

         $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'] : '';

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

         return $instance;

     }

 

-	/**

-	 * Back-end popular post category widget settings form.

-	 *

-	 * @since 1.0.0

+    /**

+     * 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.

-	 *

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

-	 */

-	public function form($instance)

+     *

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

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

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

 		

-		$post_type_options = geodir_get_posttypes('options');

+        $post_type_options = geodir_get_posttypes('options');

         ?>

         <p>

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

@@ -131,11 +131,11 @@ 
 {

 

     /**

-	 * Register the popular posts widget.

-	 *

-	 * @since 1.0.0

+     * Register the popular posts widget.

+     *

+     * @since 1.0.0

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

-	 */

+     */

     function __construct() {

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

         parent::__construct(

@@ -145,32 +145,32 @@ 
         );

     }

 

-	/**

-	 * Front-end display content for popular posts widget.

-	 *

-	 * @since 1.0.0

+    /**

+     * Front-end display content for popular posts widget.

+     *

+     * @since 1.0.0

      * @since 1.5.1 Declare function public.

-	 *

-	 * @param array $args     Widget arguments.

-	 * @param array $instance Saved values from database.

-	 */

-	public function widget($args, $instance)

+     *

+     * @param array $args     Widget arguments.

+     * @param array $instance Saved values from database.

+     */

+    public function widget($args, $instance)

     {

         geodir_popular_postview_output($args, $instance);

     }

 

-	/**

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

-	 *

-	 * @since 1.0.0

+    /**

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

+     *

+     * @since 1.0.0

      * @since 1.5.1 Declare function public.

-	 *

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

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

-	 *

-	 * @return array Updated safe values to be saved.

-	 */

-	public function update($new_instance, $old_instance)

+     *

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

@@ -204,15 +204,15 @@ 
         return $instance;

     }

 

-	/**

-	 * Back-end popular posts widget settings form.

-	 *

-	 * @since 1.0.0

+    /**

+     * Back-end popular posts widget settings form.

+     *

+     * @since 1.0.0

      * @since 1.5.1 Declare function public.

-	 *

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

-	 */

-	public function form($instance)

+     *

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

+     */

+    public function form($instance)

     {

         //widgetform in backend

         $instance = wp_parse_args((array)$instance,

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

 

                 <?php $postypes = geodir_get_posttypes();

-				/**

-				 * Filter the post types to display in widget.

-				 *

-				 * @since 1.0.0

-				 *

-				 * @param array $postypes Post types array.

-				 */

-				$postypes = apply_filters('geodir_post_type_list_in_p_widget', $postypes); ?>

+                /**

+                 * Filter the post types to display in widget.

+                 *

+                 * @since 1.0.0

+                 *

+                 * @param array $postypes Post types array.

+                 */

+                $postypes = apply_filters('geodir_post_type_list_in_p_widget', $postypes); ?>

 

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

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

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

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

Indentation +36 added lines, -36 removed lines

@@ -15,11 +15,11 @@ 
 class geodir_related_listing_postview extends WP_Widget
 {
     /**
-	 * Register the related listing widget.
-	 *
-	 * @since 1.0.0
+     * Register the related listing widget.
+     *
+     * @since 1.0.0
      * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
-	 */
+     */
     function __construct() {
         $widget_ops = array('classname' => 'geodir_related_listing_post_view', 'description' => __('GD > Related Listing', 'geodirectory'));
         parent::__construct(
@@ -29,15 +29,15 @@ 
         );
     }
 
-	/**
-	 * Front-end display content for related listing widget.
-	 *
-	 * @since 1.0.0
+    /**
+     * Front-end display content for related listing widget.
+     *
+     * @since 1.0.0
      * @since 1.5.1 Declare function public.
-	 *
-	 * @param array $args     Widget arguments.
-	 * @param array $instance Saved values from database.
-	 */
+     *
+     * @param array $args     Widget arguments.
+     * @param array $instance Saved values from database.
+     */
     public function widget($args, $instance)
     {
 
@@ -48,7 +48,7 @@ 
         $title = empty($instance['title']) ? __('Related Listing', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
 
         /** 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']);
+        $post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);
 
         /**
          * Filter the relation type to get related listing.
@@ -56,22 +56,22 @@ 
          * @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']);
+        $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 */
-		$layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);
+        $layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);
 
         /** 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']);
+        $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 */
-		$listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);
+        $listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);
 
         /** 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']);
+        $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 */
-		$character_count = empty($instance['character_count']) ? 20 : apply_filters('widget_list_character_count', $instance['character_count']);
+        $character_count = empty($instance['character_count']) ? 20 : apply_filters('widget_list_character_count', $instance['character_count']);
 
         $arr = array(
             'before_title' => $before_title,
@@ -95,17 +95,17 @@ 
         }
     }
 
-	/**
-	 * Sanitize related listing widget form values as they are saved.
-	 *
-	 * @since 1.0.0
+    /**
+     * Sanitize related listing widget form values as they are saved.
+     *
+     * @since 1.0.0
      * @since 1.5.1 Declare function public.
-	 *
-	 * @param array $new_instance Values just sent to be saved.
-	 * @param array $old_instance Previously saved values from database.
-	 *
-	 * @return array Updated safe values to be saved.
-	 */
+     *
+     * @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
@@ -126,14 +126,14 @@ 
         return $instance;
     }
 
-	/**
-	 * Back-end related listing widget settings form.
-	 *
-	 * @since 1.0.0
+    /**
+     * Back-end related listing widget settings form.
+     *
+     * @since 1.0.0
      * @since 1.5.1 Declare function public.
-	 *
-	 * @param array $instance Previously saved values from database.
-	 */
+     *
+     * @param array $instance Previously saved values from database.
+     */
     public function form($instance)
     {
         //widgetform in backend

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>

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

Indentation +48 added lines, -48 removed lines

@@ -15,11 +15,11 @@ 
 class geodir_recent_reviews_widget extends WP_Widget

 {

     /**

-	 * Register the recent reviews widget.

-	 *

-	 * @since 1.0.0

+     * Register the recent reviews widget.

+     *

+     * @since 1.0.0

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

-	 */

+     */

     function __construct() {

         $widget_ops = array('classname' => 'geodir_recent_reviews', 'description' => __('GD > Recent Reviews', 'geodirectory'));

         parent::__construct(

@@ -29,16 +29,16 @@ 
         );

     }

 

-	/**

-	 * Front-end display content for recent reviews widget.

-	 *

-	 * @since 1.0.0

+    /**

+     * Front-end display content for recent reviews widget.

+     *

+     * @since 1.0.0

      * @since 1.5.1 Declare function public.

-	 *

-	 * @param array $args     Widget arguments.

-	 * @param array $instance Saved values from database.

-	 */

-	public function widget($args, $instance)

+     *

+     * @param array $args     Widget arguments.

+     * @param array $instance Saved values from database.

+     */

+    public function widget($args, $instance)

     {

         // prints the widget

         extract($args, EXTR_SKIP);

@@ -46,23 +46,23 @@ 
         /** 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.

-		 *

-		 * @since 1.0.0

-		 *

-		 * @param int $instance['count'] Number of reviews to display.

-		 */

-		$count = empty($instance['count']) ? '5' : apply_filters('widget_count', $instance['count']);

+        /**

+         * Filter the number of reviews to display.

+         *

+         * @since 1.0.0

+         *

+         * @param int $instance['count'] Number of reviews to display.

+         */

+        $count = empty($instance['count']) ? '5' : apply_filters('widget_count', $instance['count']);

 

-		/**

-		 * Filter the height and width of the avatar image in pixels.

-		 *

-		 * @since 1.0.0

-		 *

-		 * @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 height and width of the avatar image in pixels.

+         *

+         * @since 1.0.0

+         *

+         * @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

          *

@@ -87,18 +87,18 @@ 
         }

     }

 

-	/**

-	 * Sanitize recent reviews widget form values as they are saved.

-	 *

-	 * @since 1.0.0

+    /**

+     * Sanitize recent reviews widget form values as they are saved.

+     *

+     * @since 1.0.0

      * @since 1.5.1 Declare function public.

-	 *

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

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

-	 *

-	 * @return array Updated safe values to be saved.

-	 */

-	public function update($new_instance, $old_instance)

+     *

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

@@ -107,15 +107,15 @@ 
         return $instance;

     }

     

-	/**

-	 * Back-end recent reviews widget settings form.

-	 *

-	 * @since 1.0.0

+    /**

+     * Back-end recent reviews widget settings form.

+     *

+     * @since 1.0.0

      * @since 1.5.1 Declare function public.

-	 *

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

-	 */

-	public function form($instance)

+     *

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

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

         ?>

geodirectory-widgets/home_map_widget.php

Indentation +33 added lines, -33 removed lines

@@ -17,11 +17,11 @@ 
 class geodir_homepage_map extends WP_Widget

 {

     /**

-	 * Register the home page map widget.

-	 *

-	 * @since 1.0.0

+     * Register the home page map widget.

+     *

+     * @since 1.0.0

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

-	 */

+     */

     function __construct() {

         $widget_ops = array('classname' => 'widget Google Map in Home page', 'description' => __('Google Map in Home page. It will show you google map V3 for Home page with category checkbox selection.', 'geodirectory'));

         parent::__construct(

@@ -31,15 +31,15 @@ 
         );

     }

 

-	/**

-	 * Front-end display content for home page map widget.

-	 *

-	 * @since 1.0.0

+    /**

+     * Front-end display content for home page map widget.

+     *

+     * @since 1.0.0

      * @since 1.5.1 Declare function public.

-	 *

-	 * @param array $args     Widget arguments.

-	 * @param array $instance Saved values from database.

-	 */

+     *

+     * @param array $args     Widget arguments.

+     * @param array $instance Saved values from database.

+     */

     public function widget($args, $instance)

     {

         extract($args, EXTR_SKIP);

@@ -90,17 +90,17 @@ 
 

     }

 

-	/**

-	 * Sanitize home page map widget form values as they are saved.

-	 *

-	 * @since 1.0.0

+    /**

+     * Sanitize home page map widget form values as they are saved.

+     *

+     * @since 1.0.0

      * @since 1.5.1 Declare function public.

-	 *

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

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

-	 *

-	 * @return array Updated safe values to be saved.

-	 */

+     *

+     * @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

@@ -116,14 +116,14 @@ 
         return $instance;

     }

 

-	/**

-	 * Back-end home page map widget settings form.

-	 *

-	 * @since 1.0.0

+    /**

+     * Back-end home page map widget settings form.

+     *

+     * @since 1.0.0

      * @since 1.5.1 Declare function public.

-	 *

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

-	 */

+     *

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

+     */

     public function form($instance)

     {

         //widgetform in backend

@@ -238,11 +238,11 @@ 
     }

 

     /**

-	 * Adds the javascript in the footer for home page map widget.

-	 *

-	 * @since 1.0.0

+     * Adds the javascript in the footer for home page map widget.

+     *

+     * @since 1.0.0

      * @since 1.5.1 Declare function public.

-	 */

+     */

     public function geodir_home_map_add_script()

     {

         ?>

Spacing +4 added lines, -4 removed lines

@@ -128,7 +128,7 @@ 
     {

         //widgetform in backend

 

-        $instance = wp_parse_args((array)$instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'child_collapse' => '0', 'scrollwheel' => '0'));

+        $instance = wp_parse_args((array) $instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'child_collapse' => '0', 'scrollwheel' => '0'));

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

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

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

@@ -173,7 +173,7 @@ 
                     <option <?php if (isset($maptype) && $maptype == 'HYBRID') {

                         echo 'selected="selected"';

                     } ?> value="HYBRID"><?php _e('Hybrid Map', 'geodirectory'); ?></option>

-					<option <?php selected($maptype, 'TERRAIN');?> 

+					<option <?php selected($maptype, 'TERRAIN'); ?> 

 							value="TERRAIN"><?php _e('Terrain Map', 'geodirectory'); ?></option>

                 </select>

             </label>

@@ -220,7 +220,7 @@ 
                 :

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

                        name="<?php echo $this->get_field_name('child_collapse'); ?>" type="checkbox" value="1"

-                       <?php if ($child_collapse){ ?>checked="checked" <?php } ?> />

+                       <?php if ($child_collapse) { ?>checked="checked" <?php } ?> />

             </label>

         </p>

 

@@ -230,7 +230,7 @@ 
                 :

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

                        name="<?php echo $this->get_field_name('scrollwheel'); ?>" type="checkbox" value="1"

-                       <?php if ($scrollwheel){ ?>checked="checked" <?php } ?> />

+                       <?php if ($scrollwheel) { ?>checked="checked" <?php } ?> />

             </label>

         </p>

 

Braces +3 added lines, -2 removed lines

@@ -192,8 +192,9 @@
 

                     foreach ($map_zoom_level as $level) {

                         $selected = '';

-                        if ($level == $zoom)

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

+                        if ($level == $zoom) {
+                                                    $selected = 'selected="selected"';
+                        }
 

                         echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>';

 

geodirectory-widgets/listing_map_widget.php

Indentation +35 added lines, -35 removed lines

@@ -90,11 +90,11 @@ 
 {

 

     /**

-	 * Register the listing page map widget.

-	 *

-	 * @since 1.0.0

+     * Register the listing page map widget.

+     *

+     * @since 1.0.0

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

-	 */

+     */

     function __construct() {

         $widget_ops = array('classname' => 'widget geodir-map-listing-page', 'description' => __('Google Map for Listing page. It will show you google map V3 for Listing page.', 'geodirectory'));

         parent::__construct(

@@ -110,17 +110,17 @@ 
         add_action('wp_footer', 'show_listing_widget_map'); // Show map for listings with markers

     }

 

-	/**

-	 * Front-end display content for listing page map widget.

-	 *

-	 * @since 1.0.0

+    /**

+     * Front-end display content for listing page map widget.

+     *

+     * @since 1.0.0

      * @since 1.5.1 Declare function public.

-	 *

+     *

      * @global object $post The current post object.

      *

-	 * @param array $args     Widget arguments.

-	 * @param array $instance Saved values from database.

-	 */

+     * @param array $args     Widget arguments.

+     * @param array $instance Saved values from database.

+     */

     public function widget($args, $instance)

     {

 

@@ -150,17 +150,17 @@ 
             $scrollwheel = empty($instance['scrollwheel']) ? '0' : apply_filters('widget_scrollwheel', $instance['scrollwheel']);

             $showall = empty($instance['showall']) ? '0' : apply_filters('widget_showall', $instance['showall']);

 			

-			/**

+            /**

              * Filter the listing map should to be displayed or not.

              *

              * @since 1.4.6

-			 *

+             *

              * @param bool $display true if map should be displayed, false if not.

              */

-			$show_map = apply_filters( 'geodir_show_map_listing', $display = true );

-			if ( !$show_map ) {

-				return;

-			}

+            $show_map = apply_filters( 'geodir_show_map_listing', $display = true );

+            if ( !$show_map ) {

+                return;

+            }

 

             $map_args = array();

             $map_args['map_canvas_name'] = str_replace('-', '_', $args['widget_id']);

@@ -219,17 +219,17 @@ 
         endif;

     }

 

-	/**

-	 * Sanitize listing page map widget form values as they are saved.

-	 *

-	 * @since 1.0.0

+    /**

+     * Sanitize listing page map widget form values as they are saved.

+     *

+     * @since 1.0.0

      * @since 1.5.1 Declare function public.

-	 *

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

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

-	 *

-	 * @return array Updated safe values to be saved.

-	 */

+     *

+     * @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

@@ -246,14 +246,14 @@ 
         return $instance;

     }

 

-	/**

-	 * Back-end listing page map widget settings form.

-	 *

-	 * @since 1.0.0

+    /**

+     * Back-end listing page map widget settings form.

+     *

+     * @since 1.0.0

      * @since 1.5.1 Declare function public.

-	 *

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

-	 */

+     *

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

+     */

     public function form($instance)

     {

         //widgetform in backend

Spacing +6 added lines, -6 removed lines

@@ -45,7 +45,7 @@ 
          * @param string $post->marker_json JSON representation of the post marker info.

          * @param object $post The post object.

          */

-        $list_map_json[] = apply_filters('geodir_create_list_jsondata',$post->marker_json,$post);

+        $list_map_json[] = apply_filters('geodir_create_list_jsondata', $post->marker_json, $post);

     }

 

 }

@@ -157,8 +157,8 @@ 
 			 *

              * @param bool $display true if map should be displayed, false if not.

              */

-			$show_map = apply_filters( 'geodir_show_map_listing', $display = true );

-			if ( !$show_map ) {

+			$show_map = apply_filters('geodir_show_map_listing', $display = true);

+			if (!$show_map) {

 				return;

 			}

 

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

     {

         //widgetform in backend

-        $instance = wp_parse_args((array)$instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'sticky' => '', 'scrollwheel' => '0', 'showall' => '0'));

+        $instance = wp_parse_args((array) $instance, array('width' => '', 'heigh' => '', 'maptype' => '', 'zoom' => '', 'autozoom' => '', 'sticky' => '', 'scrollwheel' => '0', 'showall' => '0'));

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

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

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

@@ -303,7 +303,7 @@ 
                     <option <?php if (isset($maptype) && $maptype == 'HYBRID') {

                         echo 'selected="selected"';

                     } ?> value="HYBRID"><?php _e('Hybrid Map', 'geodirectory'); ?></option>

-					<option <?php selected($maptype, 'TERRAIN');?> 

+					<option <?php selected($maptype, 'TERRAIN'); ?> 

 							value="TERRAIN"><?php _e('Terrain Map', 'geodirectory'); ?></option>

                 </select>

             </label>

@@ -361,7 +361,7 @@ 
                 :

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

                        name="<?php echo $this->get_field_name('scrollwheel'); ?>" type="checkbox" value="1"

-                       <?php if ($scrollwheel){ ?>checked="checked" <?php } ?> />

+                       <?php if ($scrollwheel) { ?>checked="checked" <?php } ?> />

             </label>

         </p>

 

Braces +11 added lines, -7 removed lines

@@ -69,10 +69,11 @@ 
     $totalcount = count(array_unique($list_map_json));

 

 

-    if (!empty($cat_content_info))

-        $list_json = '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';

-    else

-        $list_json = '[{"totalcount":"0"}]';

+    if (!empty($cat_content_info)) {
+            $list_json = '[{"totalcount":"' . $totalcount . '",' . substr(implode(',', $cat_content_info), 1) . ']';
+    } else {
+            $list_json = '[{"totalcount":"0"}]';
+    }
 

     $listing_map_args = array('list_json' => $list_json);

 

@@ -195,7 +196,9 @@ 
                 $mapview = $maptype;

             }

 

-            if (empty($mapzoom)) $mapzoom = $zoom;

+            if (empty($mapzoom)) {
+                $mapzoom = $zoom;
+            }
 

             // Set default map options

             $map_args['ajax_url'] = geodir_get_ajax_url();

@@ -323,8 +326,9 @@ 
 

                     foreach ($map_zoom_level as $level) {

                         $selected = '';

-                        if ($level == $zoom)

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

+                        if ($level == $zoom) {
+                                                    $selected = 'selected="selected"';
+                        }
 

                         echo '<option ' . $selected . ' value="' . $level . '">' . $level . '</option>';

 

geodirectory.php

Indentation +1 added lines, -1 removed lines

@@ -197,7 +197,7 @@
      * @since 1.5.6

      */

     global $pagenow;

-   // if ( 'plugins.php' === $pagenow )

+    // if ( 'plugins.php' === $pagenow )

     {

         // Better update message

         $file   = basename( __FILE__ );

Braces +24 added lines, -8 removed lines

@@ -74,7 +74,9 @@ 
 /**

  * Do not store any revisions (except the one autosave per post).

  */

-if (!defined('WP_POST_REVISIONS')) define('WP_POST_REVISIONS', 0);

+if (!defined('WP_POST_REVISIONS')) {
+    define('WP_POST_REVISIONS', 0);
+}
 

 

 /*

@@ -82,17 +84,29 @@ 
  */

 

 /** Define the database name for the countries table. */

-if (!defined('GEODIR_COUNTRIES_TABLE')) define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');

+if (!defined('GEODIR_COUNTRIES_TABLE')) {
+    define('GEODIR_COUNTRIES_TABLE', $plugin_prefix . 'countries');
+}
 /** Define the database name for the custom fields table. */

-if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');

+if (!defined('GEODIR_CUSTOM_FIELDS_TABLE')) {
+    define('GEODIR_CUSTOM_FIELDS_TABLE', $plugin_prefix . 'custom_fields');
+}
 /** Define the database name for the icons table. */

-if (!defined('GEODIR_ICON_TABLE')) define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');

+if (!defined('GEODIR_ICON_TABLE')) {
+    define('GEODIR_ICON_TABLE', $plugin_prefix . 'post_icon');
+}
 /** Define the database name for the attachments table. */

-if (!defined('GEODIR_ATTACHMENT_TABLE')) define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');

+if (!defined('GEODIR_ATTACHMENT_TABLE')) {
+    define('GEODIR_ATTACHMENT_TABLE', $plugin_prefix . 'attachments');
+}
 /** Define the database name for the review table. */

-if (!defined('GEODIR_REVIEW_TABLE')) define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');

+if (!defined('GEODIR_REVIEW_TABLE')) {
+    define('GEODIR_REVIEW_TABLE', $plugin_prefix . 'post_review');
+}
 /** Define the database name for the custom sort fields table. */

-if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');

+if (!defined('GEODIR_CUSTOM_SORT_FIELDS_TABLE')) {
+    define('GEODIR_CUSTOM_SORT_FIELDS_TABLE', $plugin_prefix . 'custom_sort_fields');
+}
 

 

 if ($_SERVER['REQUEST_URI'] == '' || $_SERVER['REQUEST_URI'] == '/') {

@@ -107,7 +121,9 @@ 
 /*

  * Localisation items.

  */

-if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');

+if (!defined('GEODIRECTORY_TEXTDOMAIN')) {
+    define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');
+}
 

 // Load geodirectory plugin textdomain.

 add_action( 'plugins_loaded', 'geodir_load_textdomain' );

Spacing +11 added lines, -11 removed lines

@@ -100,7 +100,7 @@ 
      * This tries to disable cache on homepage as it can be very dynamic.

      */

     define('DONOTCACHEPAGE', TRUE);

-    $_SERVER['DONOTCACHEPAGE']= TRUE;

+    $_SERVER['DONOTCACHEPAGE'] = TRUE;

 }

 

 

@@ -110,7 +110,7 @@ 
 if (!defined('GEODIRECTORY_TEXTDOMAIN')) define('GEODIRECTORY_TEXTDOMAIN', 'geodirectory');

 

 // Load geodirectory plugin textdomain.

-add_action( 'plugins_loaded', 'geodir_load_textdomain' );

+add_action('plugins_loaded', 'geodir_load_textdomain');

 

 /*

  * A function to log GD errors no matter the type given.

@@ -121,18 +121,18 @@ 
  * @param mixed $log The thing that should be logged.

  * @package GeoDirectory

  */

-function geodir_error_log($log){

+function geodir_error_log($log) {

     /*

      * A filter to override the WP_DEBUG setting for function geodir_error_log().

      *

      * @since 1.5.7

      */

-    $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);

-    if ( true === $should_log ) {

-        if ( is_array( $log ) || is_object( $log ) ) {

-            error_log( print_r( $log, true ) );

+    $should_log = apply_filters('geodir_log_errors', WP_DEBUG);

+    if (true === $should_log) {

+        if (is_array($log) || is_object($log)) {

+            error_log(print_r($log, true));

         } else {

-            error_log( $log );

+            error_log($log);

         }

     }

 }

@@ -225,11 +225,11 @@ 
    // if ( 'plugins.php' === $pagenow )

     {

         // Better update message

-        $file   = basename( __FILE__ );

-        $folder = basename( dirname( __FILE__ ) );

+        $file   = basename(__FILE__);

+        $folder = basename(dirname(__FILE__));

         $hook = "in_plugin_update_message-{$folder}/{$file}";

         //echo $hook;

-        add_action( 'in_plugin_update_message-geodirectory/geodirectory.php', 'geodire_admin_upgrade_notice', 20, 2 );

+        add_action('in_plugin_update_message-geodirectory/geodirectory.php', 'geodire_admin_upgrade_notice', 20, 2);

     }

 

 }

geodirectory_shortcodes.php

Indentation +120 added lines, -120 removed lines

@@ -110,7 +110,7 @@ 
         'autozoom' => '',
         'child_collapse' => '0',
         'scrollwheel' => '0',
-		'marker_cluster' => false,
+        'marker_cluster' => false,
         'latitude' => '',
         'longitude' => ''
     );
@@ -142,7 +142,7 @@ 
          * Filter the widget maptype of the map on home/listings page.
          *
          * @since 1.0.0
-		 * @since 1.5.2 Added TERRAIN map type.
+         * @since 1.5.2 Added TERRAIN map type.
          * @param string $params['maptype'] The map type. Can be ROADMAP | SATELLITE | HYBRID | TERRAIN.
          */
         'maptype' => apply_filters('widget_maptype', $params['maptype']),
@@ -199,8 +199,8 @@ 
         'is_geodir_home_map_widget' => true,
     );
 
-	// Add marker cluster
-	if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
+    // Add marker cluster
+    if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
         $map_args['enable_marker_cluster'] = true;
         if(get_option('geodir_marker_cluster_type')) {
             if ($map_args['autozoom']) {
@@ -212,9 +212,9 @@ 
             $map_args['enable_marker_cluster_server'] = true ;
 
         }
-	} else {
-		$map_args['enable_marker_cluster'] = false;
-	}
+    } else {
+        $map_args['enable_marker_cluster'] = false;
+    }
 
     // if lat and long set in shortcode, hack it so the map is not repositioned
     if(!empty($params['latitude']) && !empty($params['longitude']) ){
@@ -281,7 +281,7 @@ 
         'scrollwheel' => '0',
         'maptype' => 'ROADMAP',
         'child_collapse' => 0,
-		'marker_cluster' => false
+        'marker_cluster' => false
     );
 
     $params = shortcode_atts($defaults, $atts);
@@ -336,12 +336,12 @@ 
     $map_args['maxZoom'] = 21;
     $map_args['bubble_size'] = 'small';
 	
-	// Add marker cluster
-	if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
-		$map_args['enable_marker_cluster'] = true;
-	} else {
-		$map_args['enable_marker_cluster'] = false;
-	}
+    // Add marker cluster
+    if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
+        $map_args['enable_marker_cluster'] = true;
+    } else {
+        $map_args['enable_marker_cluster'] = false;
+    }
 
     geodir_draw_map($map_args);
 
@@ -572,12 +572,12 @@ 
         'before_title' => '',
         'after_title' => '',
         'title' => '',
-		'default_post_type' => '',
+        'default_post_type' => '',
     );
 
     $params = shortcode_atts($defaults, $atts, 'popular_post_category');
     $params['category_limit'] = absint($params['category_limit']);
-	$params['default_post_type'] = gdsc_is_post_type_valid($params['default_post_type']) ? $params['default_post_type'] : '';
+    $params['default_post_type'] = gdsc_is_post_type_valid($params['default_post_type']) ? $params['default_post_type'] : '';
     geodir_popular_post_category_output($params, $params);
 
     $output = ob_get_contents();
@@ -738,8 +738,8 @@ 
 function geodir_sc_recent_reviews($atts) {
     ob_start();
     $defaults = array(
-		'title' => '',
-		'count' => 5,
+        'title' => '',
+        'count' => 5,
     );
 
     $params = shortcode_atts($defaults, $atts);
@@ -749,7 +749,7 @@ 
         $count = 1;
     }
 	
-	$title = !empty($params['title']) ? __($params['title'], 'geodirectory') : '';
+    $title = !empty($params['title']) ? __($params['title'], 'geodirectory') : '';
 
     $comments_li = geodir_get_recent_reviews(30, $count, 100, false);
 
@@ -878,34 +878,34 @@ 
  */
 function geodir_sc_advanced_search($atts) {
     $defaults = array(
-		'title' => '',
-		'before_widget' => '<section id="geodir_advanced_search-1" class="widget geodir-widget geodir_advanced_search_widget">',
+        'title' => '',
+        'before_widget' => '<section id="geodir_advanced_search-1" class="widget geodir-widget geodir_advanced_search_widget">',
         'after_widget' => '</section>',
         'before_title' => '<h3 class="widget-title">',
         'after_title' => '</h3>',
-		'show_adv_search' => 'default'
-	);
+        'show_adv_search' => 'default'
+    );
 	
-	$params = shortcode_atts($defaults, $atts);
+    $params = shortcode_atts($defaults, $atts);
 	
-	$show_adv_search = isset($params['show_adv_search']) && in_array($params['show_adv_search'], array('default', 'always', 'searched')) ? $params['show_adv_search'] : '';
+    $show_adv_search = isset($params['show_adv_search']) && in_array($params['show_adv_search'], array('default', 'always', 'searched')) ? $params['show_adv_search'] : '';
 	
-	if ($show_adv_search != '' ) {
-		$show_adv_class = 'geodir-advance-search-' . $show_adv_search . ' ';
-		if ($show_adv_search == 'searched' && geodir_is_page('search')) {
-			$show_adv_search = 'search';
-		}
-		$show_adv_attrs = 'data-show-adv="' . $show_adv_search . '"';
+    if ($show_adv_search != '' ) {
+        $show_adv_class = 'geodir-advance-search-' . $show_adv_search . ' ';
+        if ($show_adv_search == 'searched' && geodir_is_page('search')) {
+            $show_adv_search = 'search';
+        }
+        $show_adv_attrs = 'data-show-adv="' . $show_adv_search . '"';
 		
-		$params['before_widget'] = str_replace('class="', $show_adv_attrs . ' class="' . $show_adv_class, $params['before_widget']);
-	}
+        $params['before_widget'] = str_replace('class="', $show_adv_attrs . ' class="' . $show_adv_class, $params['before_widget']);
+    }
 	
-	ob_start();
+    ob_start();
 	
-	//geodir_get_template_part('listing', 'filter-form');
-	the_widget('geodir_advance_search_widget', $params, $params );
+    //geodir_get_template_part('listing', 'filter-form');
+    the_widget('geodir_advance_search_widget', $params, $params );
 	
-	$output = ob_get_contents();
+    $output = ob_get_contents();
     ob_end_clean();
 
     return $output;
@@ -944,21 +944,21 @@ 
  * @return string HTML content to display best of listings.
  */
 function geodir_sc_bestof_widget($atts, $content = '') {
-	$defaults = array(
-		'title' => '',
-		'post_type' => 'gd_place',
-		'post_limit' => 5,
-		'categ_limit' => 3,
-		'character_count' => 20,
-		'use_viewing_post_type' => '1',
-		'add_location_filter' => '1',
-		'tab_layout' => 'bestof-tabs-on-top',
-		'before_widget' => '<section id="bestof_widget-1" class="widget geodir-widget geodir_bestof_widget geodir_sc_bestof_widget">',
+    $defaults = array(
+        'title' => '',
+        'post_type' => 'gd_place',
+        'post_limit' => 5,
+        'categ_limit' => 3,
+        'character_count' => 20,
+        'use_viewing_post_type' => '1',
+        'add_location_filter' => '1',
+        'tab_layout' => 'bestof-tabs-on-top',
+        'before_widget' => '<section id="bestof_widget-1" class="widget geodir-widget geodir_bestof_widget geodir_sc_bestof_widget">',
         'after_widget' => '</section>',
         'before_title' => '<h3 class="widget-title">',
         'after_title' => '</h3>',
-	);
-	$params = shortcode_atts($defaults, $atts);
+    );
+    $params = shortcode_atts($defaults, $atts);
 
     /**
      * Validate our incoming params
@@ -969,29 +969,29 @@ 
         $params['post_type'] = 'gd_place';
     }
 	
-	// Post limit needs to be a positive integer
+    // Post limit needs to be a positive integer
     $params['post_limit'] = absint($params['post_limit']);
     if (0 == $params['post_limit']) {
         $params['post_limit'] = 5;
     }
 	
-	// Category limit needs to be a positive integer
+    // Category limit needs to be a positive integer
     $params['categ_limit'] = absint($params['categ_limit']);
     if (0 == $params['categ_limit']) {
         $params['categ_limit'] = 3;
     }
 	
-	// Tab layout validation
+    // Tab layout validation
     $params['tab_layout'] = $params['tab_layout'];
     if (!in_array($params['tab_layout'], array('bestof-tabs-on-top', 'bestof-tabs-on-left', 'bestof-tabs-as-dropdown'))) {
         $params['tab_layout'] = 'bestof-tabs-on-top';
     }
 	
-	// Validate character_count
+    // Validate character_count
     $params['character_count'] = $params['character_count'];
 
-	ob_start();
-	the_widget('geodir_bestof_widget', $params, $params);
+    ob_start();
+    the_widget('geodir_bestof_widget', $params, $params);
     $output = ob_get_contents();
     ob_end_clean();
 
@@ -1036,31 +1036,31 @@ 
  * @return string HTML content to display geodirectory listings.
  */
 function geodir_sc_gd_listings($atts, $content = '') {
-	$defaults = array(
-		'title'					=> '',
-		'post_type' 			=> 'gd_place',
-		'category'				=> 0,
-		'list_sort'				=> 'latest',
-		'event_type'			=> '',
-		'post_number'			=> 10,
-		'layout'				=> 'gridview_onehalf',
-		'listing_width'			=> '',
-		'character_count'		=> 20,
-		'add_location_filter' 	=> 1,
-		'show_featured_only'	=> '',
-		'show_special_only' 	=> '',
-		'with_pics_only' 		=> '',
-		'with_videos_only' 		=> '',
-		'with_pagination' 		=> '1',
-		'top_pagination' 		=> '0',
-		'bottom_pagination' 	=> '1',
-	);
-	$params = shortcode_atts($defaults, $atts);
-
-	$params['title'] 		= wp_strip_all_tags($params['title']);
+    $defaults = array(
+        'title'					=> '',
+        'post_type' 			=> 'gd_place',
+        'category'				=> 0,
+        'list_sort'				=> 'latest',
+        'event_type'			=> '',
+        'post_number'			=> 10,
+        'layout'				=> 'gridview_onehalf',
+        'listing_width'			=> '',
+        'character_count'		=> 20,
+        'add_location_filter' 	=> 1,
+        'show_featured_only'	=> '',
+        'show_special_only' 	=> '',
+        'with_pics_only' 		=> '',
+        'with_videos_only' 		=> '',
+        'with_pagination' 		=> '1',
+        'top_pagination' 		=> '0',
+        'bottom_pagination' 	=> '1',
+    );
+    $params = shortcode_atts($defaults, $atts);
+
+    $params['title'] 		= wp_strip_all_tags($params['title']);
     $params['post_type'] 	= gdsc_is_post_type_valid($params['post_type']) ? $params['post_type'] : 'gd_place';
 	
-	// Validate the selected category/ies - Grab the current list based on post_type
+    // Validate the selected category/ies - Grab the current list based on post_type
     $category_taxonomy 		= geodir_get_taxonomies($params['post_type']);
     $categories 			= get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
 
@@ -1073,15 +1073,15 @@ 
     // Otherwise it becomes empty and later on that will mean "All"
     $params['category'] 	= array_intersect($params['category'], $categories);
 	
-	// Post_number needs to be a positive integer
+    // Post_number needs to be a positive integer
     $params['post_number'] 	= absint($params['post_number']);
     $params['post_number']	= $params['post_number'] > 0 ? $params['post_number'] : 10;
 	
-	// Validate character_count
+    // Validate character_count
     //todo: is this necessary?
     $params['character_count'] 	= $params['character_count'];
 	
-	// Validate our layout choice
+    // Validate our layout choice
     // Outside of the norm, I added some more simple terms to match the existing
     // So now I just run the switch to set it properly.
     $params['layout'] 			= gdsc_validate_layout_choice($params['layout']);
@@ -1089,7 +1089,7 @@ 
     // Validate our sorting choice
     $params['list_sort'] 		= gdsc_validate_sort_choice($params['list_sort']);
 	
-	// Validate Listing width, used in the template widget-listing-listview.php
+    // Validate Listing width, used in the template widget-listing-listview.php
     // The context is in width=$listing_width% - So we need a positive number between 0 & 100
     $params['listing_width'] 	= gdsc_validate_listing_width($params['listing_width']);
 
@@ -1099,24 +1099,24 @@ 
     $params['show_special_only'] 	= gdsc_to_bool_val($params['show_special_only']);
     $params['with_pics_only'] 		= gdsc_to_bool_val($params['with_pics_only']);
     $params['with_videos_only'] 	= gdsc_to_bool_val($params['with_videos_only']);
-	$params['with_pagination'] 		= gdsc_to_bool_val($params['with_pagination']);
-	$params['top_pagination'] 		= gdsc_to_bool_val($params['top_pagination']);
-	$params['bottom_pagination'] 	= gdsc_to_bool_val($params['bottom_pagination']);
+    $params['with_pagination'] 		= gdsc_to_bool_val($params['with_pagination']);
+    $params['top_pagination'] 		= gdsc_to_bool_val($params['top_pagination']);
+    $params['bottom_pagination'] 	= gdsc_to_bool_val($params['bottom_pagination']);
 	
     /**
      * End of validation
      */
-	if (isset($atts['geodir_ajax'])) {
-		$params['geodir_ajax'] = $atts['geodir_ajax'];
-		unset($atts['geodir_ajax']);
-	}
-	if (isset($atts['pageno'])) {
-		$params['pageno'] = $atts['pageno'];
-		unset($atts['pageno']);
-	}
-	$params['shortcode_atts'] 		= $atts;
-
-	$output = geodir_sc_gd_listings_output($params);
+    if (isset($atts['geodir_ajax'])) {
+        $params['geodir_ajax'] = $atts['geodir_ajax'];
+        unset($atts['geodir_ajax']);
+    }
+    if (isset($atts['pageno'])) {
+        $params['pageno'] = $atts['pageno'];
+        unset($atts['pageno']);
+    }
+    $params['shortcode_atts'] 		= $atts;
+
+    $output = geodir_sc_gd_listings_output($params);
 
     return $output;
 }
@@ -1155,47 +1155,47 @@ 
  * @return string HTML content to display CPT categories.
  */
 function geodir_sc_cpt_categories_widget($atts, $content = '') {
-	$defaults = array(
-		'title' => '',
-		'post_type' => '', // NULL for all
-		'hide_empty' => '',
-		'show_count' => '',
-		'hide_icon' => '',
-		'cpt_left' => '',
-		'sort_by' => 'count',
-		'max_count' => 'all',
-		'max_level' => '1',
-		'before_widget' => '<section id="geodir_cpt_categories_widget-1" class="widget geodir-widget geodir_cpt_categories_widget geodir_sc_cpt_categories_widget">',
+    $defaults = array(
+        'title' => '',
+        'post_type' => '', // NULL for all
+        'hide_empty' => '',
+        'show_count' => '',
+        'hide_icon' => '',
+        'cpt_left' => '',
+        'sort_by' => 'count',
+        'max_count' => 'all',
+        'max_level' => '1',
+        'before_widget' => '<section id="geodir_cpt_categories_widget-1" class="widget geodir-widget geodir_cpt_categories_widget geodir_sc_cpt_categories_widget">',
         'after_widget' => '</section>',
         'before_title' => '<h3 class="widget-title">',
         'after_title' => '</h3>',
-	);
-	$params = shortcode_atts($defaults, $atts);
+    );
+    $params = shortcode_atts($defaults, $atts);
 
     /**
      * Validate our incoming params
      */
-	// Make sure we have an array
+    // Make sure we have an array
     $params['post_type'] = !is_array($params['post_type']) && trim($params['post_type']) != '' ? explode(',', trim($params['post_type'])) : array();
 	 
-	// Validate the checkboxes used on the widget
+    // Validate the checkboxes used on the widget
     $params['hide_empty'] 	= gdsc_to_bool_val($params['hide_empty']);
     $params['show_count'] 	= gdsc_to_bool_val($params['show_count']);
     $params['hide_icon'] 	= gdsc_to_bool_val($params['hide_icon']);
     $params['cpt_left'] 	= gdsc_to_bool_val($params['cpt_left']);
 	
-	if ($params['max_count'] != 'all') {
-		$params['max_count'] = absint($params['max_count']);
-	}
+    if ($params['max_count'] != 'all') {
+        $params['max_count'] = absint($params['max_count']);
+    }
 	
-	if ($params['max_level'] != 'all') {
-		$params['max_level'] = absint($params['max_level']);
-	}
+    if ($params['max_level'] != 'all') {
+        $params['max_level'] = absint($params['max_level']);
+    }
 	
-	$params['sort_by'] = $params['sort_by'] == 'az' ? 'az' : 'count';
+    $params['sort_by'] = $params['sort_by'] == 'az' ? 'az' : 'count';
 
-	ob_start();
-	the_widget('geodir_cpt_categories_widget', $params, $params);
+    ob_start();
+    the_widget('geodir_cpt_categories_widget', $params, $params);
     $output = ob_get_contents();
     ob_end_clean();
 

Spacing +27 added lines, -27 removed lines

@@ -202,14 +202,14 @@ 
 	// Add marker cluster
 	if (isset($params['marker_cluster']) && gdsc_to_bool_val($params['marker_cluster']) && defined('GDCLUSTER_VERSION')) {
         $map_args['enable_marker_cluster'] = true;
-        if(get_option('geodir_marker_cluster_type')) {
+        if (get_option('geodir_marker_cluster_type')) {
             if ($map_args['autozoom']) {
                 $map_args['enable_marker_cluster_no_reposition'] = false;
             } else {
                 $map_args['enable_marker_cluster_no_reposition'] = true;
             }
 
-            $map_args['enable_marker_cluster_server'] = true ;
+            $map_args['enable_marker_cluster_server'] = true;
 
         }
 	} else {
@@ -217,7 +217,7 @@ 
 	}
 
     // if lat and long set in shortcode, hack it so the map is not repositioned
-    if(!empty($params['latitude']) && !empty($params['longitude']) ){
+    if (!empty($params['latitude']) && !empty($params['longitude'])) {
         $map_args['enable_marker_cluster_no_reposition'] = true;
     }
 
@@ -890,7 +890,7 @@ 
 	
 	$show_adv_search = isset($params['show_adv_search']) && in_array($params['show_adv_search'], array('default', 'always', 'searched')) ? $params['show_adv_search'] : '';
 	
-	if ($show_adv_search != '' ) {
+	if ($show_adv_search != '') {
 		$show_adv_class = 'geodir-advance-search-' . $show_adv_search . ' ';
 		if ($show_adv_search == 'searched' && geodir_is_page('search')) {
 			$show_adv_search = 'search';
@@ -903,7 +903,7 @@ 
 	ob_start();
 	
 	//geodir_get_template_part('listing', 'filter-form');
-	the_widget('geodir_advance_search_widget', $params, $params );
+	the_widget('geodir_advance_search_widget', $params, $params);
 	
 	$output = ob_get_contents();
     ob_end_clean();
@@ -1057,12 +1057,12 @@ 
 	);
 	$params = shortcode_atts($defaults, $atts);
 
-	$params['title'] 		= wp_strip_all_tags($params['title']);
-    $params['post_type'] 	= gdsc_is_post_type_valid($params['post_type']) ? $params['post_type'] : 'gd_place';
+	$params['title'] = wp_strip_all_tags($params['title']);
+    $params['post_type'] = gdsc_is_post_type_valid($params['post_type']) ? $params['post_type'] : 'gd_place';
 	
 	// Validate the selected category/ies - Grab the current list based on post_type
-    $category_taxonomy 		= geodir_get_taxonomies($params['post_type']);
-    $categories 			= get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
+    $category_taxonomy = geodir_get_taxonomies($params['post_type']);
+    $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'fields' => 'ids'));
 
     // Make sure we have an array
     if (!(is_array($params['category']))) {
@@ -1071,37 +1071,37 @@ 
 
     // Array_intersect returns only the items in $params['category'] that are also in our category list
     // Otherwise it becomes empty and later on that will mean "All"
-    $params['category'] 	= array_intersect($params['category'], $categories);
+    $params['category'] = array_intersect($params['category'], $categories);
 	
 	// Post_number needs to be a positive integer
-    $params['post_number'] 	= absint($params['post_number']);
-    $params['post_number']	= $params['post_number'] > 0 ? $params['post_number'] : 10;
+    $params['post_number'] = absint($params['post_number']);
+    $params['post_number'] = $params['post_number'] > 0 ? $params['post_number'] : 10;
 	
 	// Validate character_count
     //todo: is this necessary?
-    $params['character_count'] 	= $params['character_count'];
+    $params['character_count'] = $params['character_count'];
 	
 	// Validate our layout choice
     // Outside of the norm, I added some more simple terms to match the existing
     // So now I just run the switch to set it properly.
-    $params['layout'] 			= gdsc_validate_layout_choice($params['layout']);
+    $params['layout'] = gdsc_validate_layout_choice($params['layout']);
 
     // Validate our sorting choice
-    $params['list_sort'] 		= gdsc_validate_sort_choice($params['list_sort']);
+    $params['list_sort'] = gdsc_validate_sort_choice($params['list_sort']);
 	
 	// Validate Listing width, used in the template widget-listing-listview.php
     // The context is in width=$listing_width% - So we need a positive number between 0 & 100
-    $params['listing_width'] 	= gdsc_validate_listing_width($params['listing_width']);
+    $params['listing_width'] = gdsc_validate_listing_width($params['listing_width']);
 
     // Validate the checkboxes used on the widget
-    $params['add_location_filter'] 	= gdsc_to_bool_val($params['add_location_filter']);
-    $params['show_featured_only'] 	= gdsc_to_bool_val($params['show_featured_only']);
-    $params['show_special_only'] 	= gdsc_to_bool_val($params['show_special_only']);
-    $params['with_pics_only'] 		= gdsc_to_bool_val($params['with_pics_only']);
-    $params['with_videos_only'] 	= gdsc_to_bool_val($params['with_videos_only']);
-	$params['with_pagination'] 		= gdsc_to_bool_val($params['with_pagination']);
-	$params['top_pagination'] 		= gdsc_to_bool_val($params['top_pagination']);
-	$params['bottom_pagination'] 	= gdsc_to_bool_val($params['bottom_pagination']);
+    $params['add_location_filter'] = gdsc_to_bool_val($params['add_location_filter']);
+    $params['show_featured_only'] = gdsc_to_bool_val($params['show_featured_only']);
+    $params['show_special_only'] = gdsc_to_bool_val($params['show_special_only']);
+    $params['with_pics_only'] = gdsc_to_bool_val($params['with_pics_only']);
+    $params['with_videos_only'] = gdsc_to_bool_val($params['with_videos_only']);
+	$params['with_pagination'] = gdsc_to_bool_val($params['with_pagination']);
+	$params['top_pagination'] = gdsc_to_bool_val($params['top_pagination']);
+	$params['bottom_pagination'] = gdsc_to_bool_val($params['bottom_pagination']);
 	
     /**
      * End of validation
@@ -1114,7 +1114,7 @@ 
 		$params['pageno'] = $atts['pageno'];
 		unset($atts['pageno']);
 	}
-	$params['shortcode_atts'] 		= $atts;
+	$params['shortcode_atts'] = $atts;
 
 	$output = geodir_sc_gd_listings_output($params);
 
@@ -1181,8 +1181,8 @@ 
 	// Validate the checkboxes used on the widget
     $params['hide_empty'] 	= gdsc_to_bool_val($params['hide_empty']);
     $params['show_count'] 	= gdsc_to_bool_val($params['show_count']);
-    $params['hide_icon'] 	= gdsc_to_bool_val($params['hide_icon']);
-    $params['cpt_left'] 	= gdsc_to_bool_val($params['cpt_left']);
+    $params['hide_icon'] = gdsc_to_bool_val($params['hide_icon']);
+    $params['cpt_left'] = gdsc_to_bool_val($params['cpt_left']);
 	
 	if ($params['max_count'] != 'all') {
 		$params['max_count'] = absint($params['max_count']);

geodirectory_template_tags.php

Braces +38 added lines, -20 removed lines

@@ -247,13 +247,14 @@ 
  */

 function geodir_add_async_forscript($url)

 {

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

-        return $url;

-    else if (is_admin())

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

-    else

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

-}

+    if (strpos($url, '#asyncload')===false) {
+            return $url;
+    } else if (is_admin()) {
+            return str_replace('#asyncload', '', $url);
+    } else {
+            return str_replace('#asyncload', '', $url)."' async='async";
+    }
+    }

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

 

 /**

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

         wp_enqueue_style('geodir-chosen-style');

 

-    }else{

+    } else{

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

         wp_enqueue_style('geodir-core-scss');

 

@@ -361,8 +362,10 @@ 
 

     $half_pages_to_show = round($pages_to_show / 2);

 

-    if (geodir_is_page('home') || (get_option('geodir_set_as_home') && is_home())) // dont apply default  pagination for geodirectory home page.

-        return;

+    if (geodir_is_page('home') || (get_option('geodir_set_as_home') && is_home())) {
+        // dont apply default  pagination for geodirectory home page.

+        return;
+    }
 

     if (!is_single()) {

 		if (function_exists('geodir_location_geo_home_link')) {

@@ -435,11 +438,21 @@ 
     }

     $dist_dif = 1000;

 

-    if ($dist <= 5000) $dist_dif = 500;

-    if ($dist <= 1000) $dist_dif = 100;

-    if ($dist <= 500) $dist_dif = 50;

-    if ($dist <= 100) $dist_dif = 10;

-    if ($dist <= 50) $dist_dif = 5;

+    if ($dist <= 5000) {
+        $dist_dif = 500;
+    }
+    if ($dist <= 1000) {
+        $dist_dif = 100;
+    }
+    if ($dist <= 500) {
+        $dist_dif = 50;
+    }
+    if ($dist <= 100) {
+        $dist_dif = 10;
+    }
+    if ($dist <= 50) {
+        $dist_dif = 5;
+    }
 

     ?>

     <script type="text/javascript">

@@ -501,18 +514,23 @@ 
 {

 

     $default_search_for_text = SEARCH_FOR_TEXT;

-    if (get_option('geodir_search_field_default_text'))

-        $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

+    if (get_option('geodir_search_field_default_text')) {
+            $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
+    }
 

     $default_near_text = NEAR_TEXT;

-    if (get_option('geodir_near_field_default_text'))

-        $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

+    if (get_option('geodir_near_field_default_text')) {
+            $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
+    }
 

     ?>

 

 

     <script type="text/javascript">

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

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

         var latlng;

         var Sgeocoder;

         var address;

Indentation +29 added lines, -29 removed lines

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

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

     if ($is_detail_page) {

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

-	}

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

+    }

 

     // font awesome rating script

-	if (get_option('geodir_reviewrating_enable_font_awesome')) {

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

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

-	} else { // default rating script

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

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

-	}

+    if (get_option('geodir_reviewrating_enable_font_awesome')) {

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

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

+    } else { // default rating script

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

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

+    }

 

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

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

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

 function geodir_footer_scripts()

 {	

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

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

     echo stripslashes(get_option('geodir_footer_scripts'));

 }

 

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

 

     if (!is_single()) {

-		if (function_exists('geodir_location_geo_home_link')) {

-			remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

-		}

+        if (function_exists('geodir_location_geo_home_link')) {

+            remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

+        }

         $numposts = $wp_query->found_posts;

 

 

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

 

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

-			// Extra pagination info

-			$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

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

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

+            // Extra pagination info

+            $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

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

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

 			

-			if ($geodir_pagination_more_info != '') {

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

+            if ($geodir_pagination_more_info != '') {

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

 				

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

-					$before = $before . $pagination_info;

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

-					$after = $pagination_info . $after;

-				}

-			}

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

+                    $before = $before . $pagination_info;

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

+                    $after = $pagination_info . $after;

+                }

+            }

 			

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

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

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

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

             }

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

         }

 		

-		if (function_exists('geodir_location_geo_home_link')) {

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

-		}

+        if (function_exists('geodir_location_geo_home_link')) {

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

+        }

     }

 }

 

Spacing +35 added lines, -35 removed lines

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

     $is_detail_page = false;

 

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

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

         $is_detail_page = true;

     }

 

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

         'geodir_plugin_url' => geodir_plugin_url(),

         'geodir_ajax_url' => geodir_get_ajax_url(),

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

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

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

     );

 

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

      * }

      */

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

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

 

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

 

 

 

 

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

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

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

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

 

 

 

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

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

     wp_enqueue_script('geodirectory-lightbox-jquery');

 

 

 

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

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

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

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

 

 

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

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

            }

         */

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

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

     wp_enqueue_script('geodirectory-goMap-script');

 

 

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

         wp_enqueue_script('jquery-ui-sortable');

 

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

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

         wp_enqueue_script('geodirectory-plupload-script');

 

         // SCRIPT FOR UPLOAD END

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

 function geodir_add_async_forscript($url)

 {

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

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

         return $url;

     else if (is_admin())

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

     else

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

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

 }

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

 

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

 

 

-    if(get_option('geodir_scss_core')) {

+    if (get_option('geodir_scss_core')) {

 

 

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

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

         wp_enqueue_style('geodir-chosen-style');

 

-    }else{

+    } else {

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

         wp_enqueue_style('geodir-core-scss');

 

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

     }

 

-    if(is_rtl()){

+    if (is_rtl()) {

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

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

     }

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

 			// Extra pagination info

 			$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

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

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

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

 			

 			if ($geodir_pagination_more_info != '') {

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

             $("#distance_slider").slider({

                 range: true,

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

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

                 min: 0,

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

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

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

 

     <script type="text/javascript">

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

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

         var latlng;

         var Sgeocoder;

         var address;

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

 				

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

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

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

 				

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

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

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

 				}

 				

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

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

 					geodir_setsearch($form);

 				} else {

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

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

         

 		function geodir_setsearch($form) {

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

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

 			geocodeAddress($form);

 		}

 

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

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

 

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

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

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

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

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

                 }

                 jQuery($form).submit();

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

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

 

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

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

                     initialise2();

                 } else {

 

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

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

-                    if($near_add2 =

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

+                    if ($near_add2 =

                     /**

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

                      *

                      * @since 1.0.0

                      */

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

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

                         function (results, status) {

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

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

                             } else {

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

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

                             }

                         });

                 }

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

             switch (err.code) {

                 case err.UNKNOWN_ERROR:

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

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

                     break;

                 case err.PERMISSION_DENINED:

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

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

                     break;

                 case err.POSITION_UNAVAILABLE:

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

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

                     break;

                 case err.BREAK:

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

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

                     break;

                 default:

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

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

             }

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

         }

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

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

              */

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

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

             break;

         case 'new' :

             /**

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

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

              */

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

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

             break;

 

     }

geodirectory_widgets.php

Indentation +1 added lines, -1 removed lines

@@ -1083,7 +1083,7 @@
          * @package GeoDirectory

          */

         include_once('geodirectory-widgets/geodirectory_bestof_widget.php');

-		/**

+        /**

          * Contains all functions for cpt categories widget.

          *

          * @since 1.5.4

Spacing +15 added lines, -15 removed lines

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

             {

                 //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

+                $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

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

 

                 ?>

@@ -373,7 +373,7 @@ 
                 ?>

 

                 <a href="http://twitter.com/share"

-                   class="twitter-share-button"><?php _e('Tweet', 'geodirectory');?></a>

+                   class="twitter-share-button"><?php _e('Tweet', 'geodirectory'); ?></a>

 

                 <script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>

 

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

             {

                 //widgetform in backend

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

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

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

                 ?>

                 <p>No settings for this widget</p>

@@ -519,7 +519,7 @@ 
                 echo 'http://feeds2.feedburner.com/' . $id;

             } else {

                 bloginfo('rss_url');

-            } ?>"><i class="fa fa-rss-square"></i> </a><?php echo $after_title;?>

+            } ?>"><i class="fa fa-rss-square"></i> </a><?php echo $after_title; ?>

 

                 <?php if ($text <> "") { ?>

 

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

             {

                 //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'advt1' => '', 'text' => '', 'twitter' => '', 'facebook' => '', 'digg' => '', 'myspace' => ''));

+                $instance = wp_parse_args((array) $instance, array('title' => '', 'id' => '', 'advt1' => '', 'text' => '', 'twitter' => '', 'facebook' => '', 'digg' => '', 'myspace' => ''));

 

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

 

@@ -596,19 +596,19 @@ 
 

                 ?>

                 <p><label

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

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

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

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

                                value="<?php echo esc_attr($title); ?>"/></label></p>

 

                 <p><label

-                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Feedburner ID (ex :- geotheme)', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Feedburner ID (ex :- geotheme)', 'geodirectory'); ?>

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

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

                                  value="<?php echo esc_attr($id); ?>"/></label></p>

 

                 <p><label

-                        for="<?php echo $this->get_field_id('text'); ?>"><?php _e('Short Description', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('text'); ?>"><?php _e('Short Description', 'geodirectory'); ?>

                         <textarea class="widefat" rows="6" cols="20" id="<?php echo $this->get_field_id('text'); ?>"

                                   name="<?php echo $this->get_field_name('text'); ?>"><?php echo esc_attr($text); ?></textarea></label>

                 </p>

@@ -704,12 +704,12 @@ 
             public function form($instance)

             {

                 //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

+                $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));

 

                 $desc1 = ($instance['desc1']);

                 ?>

                 <p><label

-                        for="<?php echo $this->get_field_id('desc1'); ?>"><?php _e('Your Advt code (ex.google adsense, etc.)', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('desc1'); ?>"><?php _e('Your Advt code (ex.google adsense, etc.)', 'geodirectory'); ?>

                         <textarea class="widefat" rows="6" cols="20" id="<?php echo $this->get_field_id('desc1'); ?>"

                                   name="<?php echo $this->get_field_name('desc1'); ?>"><?php echo esc_attr($desc1); ?></textarea></label>

                 </p>

@@ -819,14 +819,14 @@ 
             {

 

                 //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'number' => ''));

+                $instance = wp_parse_args((array) $instance, array('title' => '', 'id' => '', 'number' => ''));

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

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

                 ?>

 

                 <p>

                     <label

-                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Flickr ID', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Flickr ID', 'geodirectory'); ?>

                         (<a href="http://www.idgettr.com">idGettr</a>):

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

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

@@ -836,7 +836,7 @@ 
 

                 <p>

                     <label

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

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

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

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

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

@@ -932,12 +932,12 @@ 
             public function form($instance)

             {

                 //widgetform in backend

-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'gd_tw_desc1' => ''));

+                $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'gd_tw_desc1' => ''));

 

                 $desc1 = ($instance['gd_tw_desc1']);

                 ?>

                 <p><label

-                        for="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"><?php _e('Your twitter code', 'geodirectory');?>

+                        for="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"><?php _e('Your twitter code', 'geodirectory'); ?>

                         <textarea class="widefat" rows="6" cols="20"

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

                                   name="<?php echo $this->get_field_name('gd_tw_desc1'); ?>"><?php echo esc_attr($desc1); ?></textarea></label>