GeoDirectory / geodirectory

geodirectory-templates/listing-detail.php

Indentation +35 added lines, -35 removed lines

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

 /**

- * Template for the details (post) page

- *

- * You can make most changes via hooks or see the link below for info on how to replace the template in your theme.

- *

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

- * @since 1.0.0

- * @package GeoDirectory

- */

+		 * Template for the details (post) page

+		 *

+		 * You can make most changes via hooks or see the link below for info on how to replace the template in your theme.

+		 *

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

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

 

 header("X-XSS-Protection: 0"); // IE requirement

 // call header

@@ -33,12 +33,12 @@ 
 

 ###### SIDEBAR ON LEFT ######

 if (get_option('geodir_detail_sidebar_left_section')) {

-    /**

-     * Adds the details page sidebar to the details template page.

-     *

-     * @since 1.1.0

-     */

-    do_action('geodir_detail_sidebar');

+	/**

+	 * Adds the details page sidebar to the details template page.

+	 *

+	 * @since 1.1.0

+	 */

+	do_action('geodir_detail_sidebar');

 }

 

 ###### MAIN CONTENT WRAPPERS OPEN ######

@@ -63,26 +63,26 @@ 
 ###### MAIN CONTENT ######

 // this call the main page content

 if (have_posts() && !$preview) {

-    the_post();

-    global $post, $post_images;

-    /**

-     * Calls the details page main content on the details template page.

-     *

-     * @since 1.1.0

-     * @param object $post The current post object.

-     */

-    do_action('geodir_details_main_content', $post);

+	the_post();

+	global $post, $post_images;

+	/**

+	 * Calls the details page main content on the details template page.

+	 *

+	 * @since 1.1.0

+	 * @param object $post The current post object.

+	 */

+	do_action('geodir_details_main_content', $post);

 } elseif ($preview) {

-    /**

-     * Called on the details page if the page is being previewed.

-     *

-     * This sets the value of `$post` to the preview values before the main content is called.

-     *

-     * @since 1.1.0

-     */

-    do_action('geodir_action_geodir_set_preview_post'); // set the $post to the preview values

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

-    do_action('geodir_details_main_content', $post);

+	/**

+	 * Called on the details page if the page is being previewed.

+	 *

+	 * This sets the value of `$post` to the preview values before the main content is called.

+	 *

+	 * @since 1.1.0

+	 */

+	do_action('geodir_action_geodir_set_preview_post'); // set the $post to the preview values

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

+	do_action('geodir_details_main_content', $post);

 }

 

 

@@ -104,8 +104,8 @@ 
 

 ###### SIDEBAR ON RIGHT ######

 if (!get_option('geodir_detail_sidebar_left_section')) {

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

-    do_action('geodir_detail_sidebar');

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

+	do_action('geodir_detail_sidebar');

 }

 

 

geodirectory_functions.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Function includes, this file calls all the separate function files
- *
- * @since 1.0.0
- * @package GeoDirectory
- */
+	 * Function includes, this file calls all the separate function files
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 */
  
 /**
  * Contains class & functions for geodirectory session usage.

geodirectory.php

Braces +27 added lines, -9 removed lines

@@ -76,29 +76,45 @@ 
 /**

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

 /**

  * Define constants

  */

-if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));

+if(!defined('GEODIRECTORY_PLUGIN_DIR')) {
+	define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));
+}
 

 /*

  * Declare database table names. All since version 1.0.0

  */

 

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

@@ -113,7 +129,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' );

Indentation +88 added lines, -88 removed lines

@@ -30,30 +30,30 @@ 
  * CHECK FOR OLD COMPATIBILITY PACKS AND DISABLE IF THEY ARE ACTIVE

  */

 if (is_admin()) {

-    /**

-     * Include WordPress core file so we can use core functions to check for active plugins.

-     */

-    include_once(ABSPATH . 'wp-admin/includes/plugin.php');

+	/**

+	 * Include WordPress core file so we can use core functions to check for active plugins.

+	 */

+	include_once(ABSPATH . 'wp-admin/includes/plugin.php');

 

-    if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

-        deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

+		deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

+	}

 

-    if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {

-        deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {

+		deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');

+	}

 

-    if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {

-        deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {

+		deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');

+	}

 

-    if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {

-        deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');

-    }

+	if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {

+		deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');

+	}

 

-    if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {

-        deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');

-    }

+	if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {

+		deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');

+	}

 

 }

 

@@ -104,11 +104,11 @@ 
 

 

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

-    /**

-     * This tries to disable cache on homepage as it can be very dynamic.

-     */

-    define('DONOTCACHEPAGE', TRUE);

-    $_SERVER['DONOTCACHEPAGE']= TRUE;

+	/**

+	 * This tries to disable cache on homepage as it can be very dynamic.

+	 */

+	define('DONOTCACHEPAGE', TRUE);

+	$_SERVER['DONOTCACHEPAGE']= TRUE;

 }

 

 

@@ -130,19 +130,19 @@ 
  * @package GeoDirectory

  */

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

-        } else {

-            error_log( $log );

-        }

-    }

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

+		}

+	}

 }

 

 /**

@@ -182,62 +182,62 @@ 
  */

 if (is_admin() || geodir_is_testing_mode()) {

 

-    /**

-     * Include functions used in admin area only.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_functions.php');

-    /**

-     * Most actions/hooks used in admin area only are called from here.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_hooks_actions.php');

-    /**

-     * Most admin JS and CSS is called from here.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_template_tags.php');

-    /**

-     * Include any functions needed for upgrades.

-     *

-     * @since 1.0.0

-     */

-    require_once(geodir_plugin_path() . '/upgrade.php');

-    if (get_option('geodir_installed') != 1) {

-        /**

-         * Define language constants, here as they are not loaded yet.

-         *

-         * @since 1.0.0

-         */

-        require_once(geodir_plugin_path() . '/language.php');

-        /**

-         * Include the plugin install file that sets up the databases and any options on first run.

-         *

-         * @since 1.0.0

-         */

-        require_once('geodirectory-admin/admin_install.php');

-        register_activation_hook(__FILE__, 'geodir_activation');

-    }

-    register_deactivation_hook(__FILE__, 'geodir_deactivation');

-    register_uninstall_hook(__FILE__, 'geodir_uninstall');

+	/**

+	 * Include functions used in admin area only.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_functions.php');

+	/**

+	 * Most actions/hooks used in admin area only are called from here.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_hooks_actions.php');

+	/**

+	 * Most admin JS and CSS is called from here.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_template_tags.php');

+	/**

+	 * Include any functions needed for upgrades.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once(geodir_plugin_path() . '/upgrade.php');

+	if (get_option('geodir_installed') != 1) {

+		/**

+		 * Define language constants, here as they are not loaded yet.

+		 *

+		 * @since 1.0.0

+		 */

+		require_once(geodir_plugin_path() . '/language.php');

+		/**

+		 * Include the plugin install file that sets up the databases and any options on first run.

+		 *

+		 * @since 1.0.0

+		 */

+		require_once('geodirectory-admin/admin_install.php');

+		register_activation_hook(__FILE__, 'geodir_activation');

+	}

+	register_deactivation_hook(__FILE__, 'geodir_deactivation');

+	register_uninstall_hook(__FILE__, 'geodir_uninstall');

 

-    /*

+	/*

      * Show a upgrade warning message if applicable.

      *

      * @since 1.5.6

      */

-    global $pagenow;

+	global $pagenow;

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

-    {

-        // Better update message

-        $file   = basename( __FILE__ );

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

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

-        add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

-    }

+	{

+		// Better update message

+		$file   = basename( __FILE__ );

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

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

+		add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

+	}

 

 }

 

@@ -249,9 +249,9 @@ 
  * @since 1.5.7

  */

 function geodir_is_testing_mode() {

-    if ( defined( 'GD_TESTING_MODE' ) && GD_TESTING_MODE ) {

-        return true;

-    } else {

-        return false;

-    }

+	if ( defined( 'GD_TESTING_MODE' ) && GD_TESTING_MODE ) {

+		return true;

+	} else {

+		return false;

+	}

 }
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -83,7 +83,7 @@ 
 /**

  * Define constants

  */

-if(!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path( __FILE__ ));

+if (!defined('GEODIRECTORY_PLUGIN_DIR')) define('GEODIRECTORY_PLUGIN_DIR', plugin_dir_path(__FILE__));

 

 /*

  * Declare database table names. All since version 1.0.0

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

      */

     define('DONOTCACHEPAGE', TRUE);

-    $_SERVER['DONOTCACHEPAGE']= TRUE;

+    $_SERVER['DONOTCACHEPAGE'] = TRUE;

 }

 

 

@@ -118,7 +118,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.

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

         }

     }

 }

@@ -230,13 +230,13 @@ 
      * @since 1.5.6

      */

     global $pagenow;

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

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

-        add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

+        add_action($hook, 'geodire_admin_upgrade_notice', 20, 2);

     }

 

 }

@@ -249,7 +249,7 @@ 
  * @since 1.5.7

  */

 function geodir_is_testing_mode() {

-    if ( defined( 'GD_TESTING_MODE' ) && GD_TESTING_MODE ) {

+    if (defined('GD_TESTING_MODE') && GD_TESTING_MODE) {

         return true;

     } else {

         return false;

geodirectory-templates/geodir-listing.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Template for the listings (category) page
- *
- * You can make most changes via hooks or see the link below for info on how to replace the template in your theme.
- *
- * @link http://docs.wpgeodirectory.com/customizing-geodirectory-templates/
- * @since 1.0.0
- * @package GeoDirectory
- */
+			 * Template for the listings (category) page
+			 *
+			 * You can make most changes via hooks or see the link below for info on how to replace the template in your theme.
+			 *
+			 * @link http://docs.wpgeodirectory.com/customizing-geodirectory-templates/
+			 * @since 1.0.0
+			 * @package GeoDirectory
+			 */
 
 // call header
 get_header();

language.php

Indentation +5 added lines, -5 removed lines

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

 /**

- * Language constants used in the plugin

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+	 * Language constants used in the plugin

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

 

 /*

  * NOTE: when editing text in this file, a single apostrophe ( ' ) can cause the site to break

geodirectory-widgets/geodirectory_features_widget.php

Indentation +128 added lines, -128 removed lines

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

Spacing +6 added lines, -6 removed lines

@@ -101,7 +101,7 @@ 
     public function form($instance)
     {
         //widgetform in backend
-        $instance = wp_parse_args((array)$instance, array(
+        $instance = wp_parse_args((array) $instance, array(
             'title' => '',
             'icon_color' => '#757575',
             'title1' => '',
@@ -138,15 +138,15 @@ 
         </p>
 
 
-        <div class="gd-fet-rep-<?php echo $this->get_field_id('xxx');?>">
+        <div class="gd-fet-rep-<?php echo $this->get_field_id('xxx'); ?>">
             <?php
 
             $i = 1;
             while ($i < 100) {
 
-                if ( $i==1 || (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) && ($instance['title' . $i] || $instance['image' . $i] || $instance['desc' . $i])) {
+                if ($i == 1 || (isset($instance['title' . $i]) || isset($instance['image' . $i]) || isset($instance['desc' . $i])) && ($instance['title' . $i] || $instance['image' . $i] || $instance['desc' . $i])) {
                     ?>
-                    <div class="gdrep<?php echo $i;?>">
+                    <div class="gdrep<?php echo $i; ?>">
                         <p class="features-title">
                             <label
                                 data-gdrep-title-num="1"><?php printf(__('Title %d:', 'geodirectory'), $i); ?></label>
@@ -179,8 +179,8 @@ 
 
             ?>
             <input class="button button-primary left"
-                   onclick="gd_featured_widget_repeat('gd-fet-rep-<?php echo $this->get_field_id('xxx');?>','<?php echo $this->get_field_name('xxx');?>')"
-                   type="button" value="<?php _e('Add item', 'geodirectory');?>"/>
+                   onclick="gd_featured_widget_repeat('gd-fet-rep-<?php echo $this->get_field_id('xxx'); ?>','<?php echo $this->get_field_name('xxx'); ?>')"
+                   type="button" value="<?php _e('Add item', 'geodirectory'); ?>"/>
         </div>
 
 

geodirectory-templates/listing-listview.php

Spacing +10 added lines, -10 removed lines

@@ -116,7 +116,7 @@ 
                                     echo geodir_show_badges_on_image('featured', $post, get_permalink());

                                 }

 

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

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

 

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

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

@@ -231,12 +231,12 @@ 
                                  */

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

                                 if ($show_listing_excerpt) {

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

-                                        $content_out = geodir_max_excerpt( $character_count );

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

+                                        $content_out = geodir_max_excerpt($character_count);

                                     } else {

                                         $content_out = get_the_excerpt();

                                     }

-                                    if ( ! empty( $content_out ) ) {

+                                    if (!empty($content_out)) {

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

                                     }

                                 }

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

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

                          */

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

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

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

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

 

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

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

                                  */

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

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

 

                                 $review_show = geodir_is_reviews_show('listview');

 

@@ -316,7 +316,7 @@ 
                                  *

                                  * @since 1.0.0

                                  */

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

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

 

 

                                 /**

@@ -327,7 +327,7 @@ 
                                  * @param int $post->ID The post id.

                                  * @param object $post The post object.

                                  */

-                                do_action( 'geodir_listing_after_pinpoint', $post->ID ,$post);

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

 

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

                                     <?php

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

                                                     <?php

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

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

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

                                                     ?>

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

                                                 </a>

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

                                                     <?php

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

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

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

                                                     ?>

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

                                                 </a>

Braces +8 added lines, -3 removed lines

@@ -80,7 +80,10 @@ 
                     echo ' geodir-listview ';

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

                     echo $post_view_class;

-                } ?>" <?php if (isset($listing_width) && $listing_width) echo "style='width:{$listing_width}%;'"; // Width for widget listing

+                } ?>" <?php if (isset($listing_width) && $listing_width) {
+                	echo "style='width:{$listing_width}%;'";
+                }
+                // Width for widget listing

 

                 echo " data-post-id='$post->ID' ";

                 /**

@@ -402,8 +405,10 @@ 
              */

             do_action('geodir_after_listing_post_listview');

 

-        else:

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

+        else {
+        	:

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

 			/**

              * Called inside the `ul` of the listings template, when no listing found.

Indentation +274 added lines, -274 removed lines

@@ -44,57 +44,57 @@ 
 

         <?php if (have_posts()) :

 

-            /**

-             * Called inside the `ul` of the listings template, but before any `li` elements.

-             *

-             * When used by the widget view template then it will only show if there are listings to be shown.

-             *

-             * @since 1.0.0

-             * @see 'geodir_after_listing_post_listview'

-             */

-            do_action('geodir_before_listing_post_listview');

-

-            while (have_posts()) : the_post();

-                global $post, $wpdb, $preview;

-

-                /**

-                 * Add a class to the `li` element of the listings list template.

-                 *

-                 * @since 1.0.0

-                 * @param string $class The extra class for the `li` element, default empty.

-                 */

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

-

-                /**

-                 * Add a class to the `article` tag inside the `li` element on the listings list template.

-                 *

-                 * @since 1.0.0

-                 * @param string $class The extra class for the `article` element, default empty.

-                 */

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

-                ?>

+			/**

+			 * Called inside the `ul` of the listings template, but before any `li` elements.

+			 *

+			 * When used by the widget view template then it will only show if there are listings to be shown.

+			 *

+			 * @since 1.0.0

+			 * @see 'geodir_after_listing_post_listview'

+			 */

+			do_action('geodir_before_listing_post_listview');

+

+			while (have_posts()) : the_post();

+				global $post, $wpdb, $preview;

+

+				/**

+				 * Add a class to the `li` element of the listings list template.

+				 *

+				 * @since 1.0.0

+				 * @param string $class The extra class for the `li` element, default empty.

+				 */

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

+

+				/**

+				 * Add a class to the `article` tag inside the `li` element on the listings list template.

+				 *

+				 * @since 1.0.0

+				 * @param string $class The extra class for the `article` element, default empty.

+				 */

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

+				?>

 

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

-                    echo 'geodir-gridview ' . $grid_view_class;

-                } else {

-                    echo ' geodir-listview ';

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

-                    echo $post_view_class;

-                } ?>" <?php if (isset($listing_width) && $listing_width) echo "style='width:{$listing_width}%;'"; // Width for widget listing

-

-                echo " data-post-id='$post->ID' ";

-                /**

-                 * Called inside the `<li>` tag for listing outputs.

-                 *

-                 * @since 1.5.9

-                 * @param object $post The post object.

-                 * @param string $string If called on the listing or widget template.

-                 */

-                do_action('geodir_listview_inside_li', $post, 'listing');

-                ?> >

+					echo 'geodir-gridview ' . $grid_view_class;

+				} else {

+					echo ' geodir-listview ';

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

+					echo $post_view_class;

+				} ?>" <?php if (isset($listing_width) && $listing_width) echo "style='width:{$listing_width}%;'"; // Width for widget listing

+

+				echo " data-post-id='$post->ID' ";

+				/**

+				 * Called inside the `<li>` tag for listing outputs.

+				 *

+				 * @since 1.5.9

+				 * @param object $post The post object.

+				 * @param string $string If called on the listing or widget template.

+				 */

+				do_action('geodir_listview_inside_li', $post, 'listing');

+				?> >

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

-                        echo $post_view_article_class;

-                    } ?>">

+						echo $post_view_article_class;

+					} ?>">

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

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

 

@@ -102,37 +102,37 @@ 
                                     <?php echo $fimage; ?>

                                 </a>

                                 <?php

-                                /**

-                                 * Called before badges are output.

-                                 *

-                                 * Called on the listings template after the image has been output and before the badges like `new` or `featured` are output.

-                                 *

-                                 * @since 1.0.0

-                                 * @param object $post The post object.

-                                 * @see 'geodir_after_badge_on_image'

-                                 */

-                                do_action('geodir_before_badge_on_image', $post);

-                                if (isset($post->is_featured) && $post->is_featured) {

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

-                                }

-

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

-

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

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

-                                }

-

-                                /**

-                                 * Called after badges are output.

-                                 *

-                                 * Called on the listings template after the image and badges like `new` or `featured` have been output.

-                                 *

-                                 * @since 1.0.0

-                                 * @param object $post The post object.

-                                 * @see 'geodir_before_badge_on_image'

-                                 */

-                                do_action('geodir_after_badge_on_image', $post);

-                                ?>

+								/**

+								 * Called before badges are output.

+								 *

+								 * Called on the listings template after the image has been output and before the badges like `new` or `featured` are output.

+								 *

+								 * @since 1.0.0

+								 * @param object $post The post object.

+								 * @see 'geodir_after_badge_on_image'

+								 */

+								do_action('geodir_before_badge_on_image', $post);

+								if (isset($post->is_featured) && $post->is_featured) {

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

+								}

+

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

+

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

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

+								}

+

+								/**

+								 * Called after badges are output.

+								 *

+								 * Called on the listings template after the image and badges like `new` or `featured` have been output.

+								 *

+								 * @since 1.0.0

+								 * @param object $post The post object.

+								 * @see 'geodir_before_badge_on_image'

+								 */

+								do_action('geodir_after_badge_on_image', $post);

+								?>

 

 

                             <?php } ?>

@@ -142,15 +142,15 @@ 
                         <div class="geodir-content <?php echo apply_filters('geodir_listing_listview_content_extra_class', '', 'listing'); ?>">

 

                             <?php

-                            /**

-                             * Called before the post title on the listings view template.

-                             *

-                             * @since 1.0.0

-                             * @param string $type The template type, default 'listview'.

-                             * @param object $post The post object.

-                             * @see 'geodir_after_listing_post_title'

-                             */

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

+							/**

+							 * Called before the post title on the listings view template.

+							 *

+							 * @since 1.0.0

+							 * @param string $type The template type, default 'listview'.

+							 * @param object $post The post object.

+							 * @see 'geodir_after_listing_post_title'

+							 */

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

 

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

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

@@ -162,222 +162,222 @@ 
                             <!-- .entry-header -->

 

                             <?php

-                            /**

-                             * Called after the post title on the listings view template.

-                             *

-                             * @since 1.0.0

-                             * @param string $type The template type, default 'listview'.

-                             * @param object $post The post object.

-                             * @see 'geodir_before_listing_post_title'

-                             */

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

+							/**

+							 * Called after the post title on the listings view template.

+							 *

+							 * @since 1.0.0

+							 * @param string $type The template type, default 'listview'.

+							 * @param object $post The post object.

+							 * @see 'geodir_before_listing_post_title'

+							 */

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

 

                             <?php /// Print Distance

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

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

 

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

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

 

-                                $endLat = $post->post_latitude;

-                                $endLon = $post->post_longitude;

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

-                                $uom = get_option('geodir_search_dist_1');

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

+								$endLat = $post->post_latitude;

+								$endLon = $post->post_longitude;

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

+								$uom = get_option('geodir_search_dist_1');

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

                                 <h3>

                                     <?php

 

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

-                                        $uom = get_option('geodir_search_dist_2');

-

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

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

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

-                                        } else {

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

-                                        }

-                                        echo round($distance) . ' ' . $uom . '<br />';

-                                    } else {

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

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

-                                        } else {

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

-                                        }

-                                        echo round($distance, 2) . ' ' . $uom . '<br />';

-                                    }

-                                    ?>

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

+										$uom = get_option('geodir_search_dist_2');

+

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

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

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

+										} else {

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

+										}

+										echo round($distance) . ' ' . $uom . '<br />';

+									} else {

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

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

+										} else {

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

+										}

+										echo round($distance, 2) . ' ' . $uom . '<br />';

+									}

+									?>

                                 </h3>

                             <?php } ?>

 

 

                             <?php

-                            /**

-                             * Called before the post excerpt on the listings view template.

-                             *

-                             * @since 1.0.0

-                             * @param object $post The post object.

-                             * @see 'geodir_after_listing_post_excerpt'

-                             */

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

+							/**

+							 * Called before the post excerpt on the listings view template.

+							 *

+							 * @since 1.0.0

+							 * @param object $post The post object.

+							 * @see 'geodir_after_listing_post_excerpt'

+							 */

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

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

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

 

                                 <?php

-                                /**

-                                 * Filter to hide the listing excerpt

-                                 *

-                                 * @since 1.5.3

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

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

-                                 * @param object $post The post object.

-                                 */

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

-                                if ($show_listing_excerpt) {

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

-                                        $content_out = geodir_max_excerpt( $character_count );

-                                    } else {

-                                        $content_out = get_the_excerpt();

-                                    }

-                                    if ( ! empty( $content_out ) ) {

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

-                                    }

-                                }

-                                ?></div>

+								/**

+								 * Filter to hide the listing excerpt

+								 *

+								 * @since 1.5.3

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

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

+								 * @param object $post The post object.

+								 */

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

+								if ($show_listing_excerpt) {

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

+										$content_out = geodir_max_excerpt( $character_count );

+									} else {

+										$content_out = get_the_excerpt();

+									}

+									if ( ! empty( $content_out ) ) {

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

+									}

+								}

+								?></div>

 

                             <?php

-                            /**

-                             * Called after the post excerpt on the listings view template.

-                             *

-                             * @since 1.0.0

-                             * @param object $post The post object.

-                             * @see 'geodir_before_listing_post_excerpt'

-                             */

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

+							/**

+							 * Called after the post excerpt on the listings view template.

+							 *

+							 * @since 1.0.0

+							 * @param object $post The post object.

+							 * @see 'geodir_before_listing_post_excerpt'

+							 */

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

                         </div>

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

                         <?php

-                        /**

-                         * Called after printing listing content.

-                         *

-                         * @since 1.5.3

-                         * @param object $post The post object.

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

-                         */

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

+						/**

+						 * Called after printing listing content.

+						 *

+						 * @since 1.5.3

+						 * @param object $post The post object.

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

+						 */

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

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

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

 

                                 <?php

-                                /**

-                                 * Called before printing review stars html.

-                                 *

-                                 * @since 1.5.3

-                                 * @param object $post The post object.

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

-                                 */

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

-

-                                $review_show = geodir_is_reviews_show('listview');

-

-                                if ($review_show) {

-

-                                    if (!$preview) {

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

-                                        /**

-                                         * Called before the rating stars are output on the listings view template.

-                                         *

-                                         * @since 1.0.0

-                                         * @param float $post_avgratings The average rating for the post.

-                                         * @param int $post->ID The post ID.

-                                         * @see 'geodir_after_review_rating_stars_on_listview'

-                                         */

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

-

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

-

-                                        /**

-                                         * Called after the rating stars are output on the listings view template.

-                                         *

-                                         * @since 1.0.0

-                                         * @param float $post_avgratings The average rating for the post.

-                                         * @param int $post->ID The post ID.

-                                         * @see 'geodir_before_review_rating_stars_on_listview'

-                                         */

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

-                                    }

-                                    ?>

+								/**

+								 * Called before printing review stars html.

+								 *

+								 * @since 1.5.3

+								 * @param object $post The post object.

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

+								 */

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

+

+								$review_show = geodir_is_reviews_show('listview');

+

+								if ($review_show) {

+

+									if (!$preview) {

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

+										/**

+										 * Called before the rating stars are output on the listings view template.

+										 *

+										 * @since 1.0.0

+										 * @param float $post_avgratings The average rating for the post.

+										 * @param int $post->ID The post ID.

+										 * @see 'geodir_after_review_rating_stars_on_listview'

+										 */

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

+

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

+

+										/**

+										 * Called after the rating stars are output on the listings view template.

+										 *

+										 * @since 1.0.0

+										 * @param float $post_avgratings The average rating for the post.

+										 * @param int $post->ID The post ID.

+										 * @see 'geodir_before_review_rating_stars_on_listview'

+										 */

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

+									}

+									?>

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

                                             class="fa fa-comments"></i>

                                         <?php geodir_comments_number($post->rating_count); ?></a>

                                 <?php

-                                }

+								}

 

 

-                                /**

-                                 * Called after printing favorite html.

-                                 *

-                                 * @since 1.0.0

-                                 */

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

+								/**

+								 * Called after printing favorite html.

+								 *

+								 * @since 1.0.0

+								 */

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

 

 

-                                /**

-                                 * Called after printing map pin point.

-                                 *

-                                 * @since 1.0.0

-                                 * @since 1.5.9 Added $post as second param.

-                                 * @param int $post->ID The post id.

-                                 * @param object $post The post object.

-                                 */

-                                do_action( 'geodir_listing_after_pinpoint', $post->ID ,$post);

+								/**

+								 * Called after printing map pin point.

+								 *

+								 * @since 1.0.0

+								 * @since 1.5.9 Added $post as second param.

+								 * @param int $post->ID The post id.

+								 * @param object $post The post object.

+								 */

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

 

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

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

                                     <?php

-                                    $addplacelink = get_permalink(geodir_add_listing_page_id());

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

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

+									$addplacelink = get_permalink(geodir_add_listing_page_id());

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

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

 

-                                    $ajaxlink = geodir_get_ajax_url();

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

+									$ajaxlink = geodir_get_ajax_url();

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

 

-                                    ?>

+									?>

 

                                     <span class="geodir-authorlink clearfix">

 											

 											<?php if (isset($_REQUEST['geodir_dashbord']) && $_REQUEST['geodir_dashbord']) {

-                                                /**

-                                                 * Called before the edit post link on the listings view template used on the author page.

-                                                 *

-                                                 * @since 1.0.0

-                                                 * @see 'geodir_after_edit_post_link_on_listing'

-                                                 */

-                                                do_action('geodir_before_edit_post_link_on_listing');

-                                                ?>

+												/**

+												 * Called before the edit post link on the listings view template used on the author page.

+												 *

+												 * @since 1.0.0

+												 * @see 'geodir_after_edit_post_link_on_listing'

+												 */

+												do_action('geodir_before_edit_post_link_on_listing');

+												?>

 

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

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

                                                     <?php

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

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

-                                                    ?>

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

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

+													?>

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

                                                 </a>

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

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

                                                     <?php

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

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

-                                                    ?>

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

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

+													?>

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

                                                 </a>

                                                 <?php

 

-                                                /**

-                                                 * Called after the edit post link on the listings view template used on the author page.

-                                                 *

-                                                 * @since 1.0.0

-                                                 * @see 'geodir_before_edit_post_link_on_listing'

-                                                 */

-                                                do_action('geodir_after_edit_post_link_on_listing');

-                                            } ?>

+												/**

+												 * Called after the edit post link on the listings view template used on the author page.

+												 *

+												 * @since 1.0.0

+												 * @see 'geodir_before_edit_post_link_on_listing'

+												 */

+												do_action('geodir_after_edit_post_link_on_listing');

+											} ?>

 											</span>

 

                                 <?php } ?>

@@ -390,39 +390,39 @@ 
                 </li>

 

             <?php

-            endwhile;

-

-            /**

-             * Called inside the `ul` of the listings template, but after all `li` elements.

-             *

-             * When used by the widget view template then it will only show if there are listings to be shown.

-             *

-             * @since 1.0.0

-             * @see 'geodir_before_listing_post_listview'

-             */

-            do_action('geodir_after_listing_post_listview');

-

-        else:

+			endwhile;

+

+			/**

+			 * Called inside the `ul` of the listings template, but after all `li` elements.

+			 *

+			 * When used by the widget view template then it will only show if there are listings to be shown.

+			 *

+			 * @since 1.0.0

+			 * @see 'geodir_before_listing_post_listview'

+			 */

+			do_action('geodir_after_listing_post_listview');

+

+		else:

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

             

 			/**

-             * Called inside the `ul` of the listings template, when no listing found.

-             *

-             * @since 1.5.5

+			 * Called inside the `ul` of the listings template, when no listing found.

+			 *

+			 * @since 1.5.5

 			 * @param string 'listing-listview' Listing listview template.

 			 * @param bool $favorite Are favorite listings results?

-             */

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

-        endif;

+			 */

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

+		endif;

 

-        ?>

+		?>

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

 

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

 <?php

 /**

- * Called after the listings list view template, after all the wrapper at the very end.

- *

- * @since 1.0.0

- */

+		 * Called after the listings list view template, after all the wrapper at the very end.

+		 *

+		 * @since 1.0.0

+		 */

 do_action('geodir_after_listing_listview');

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

Doc Comments +25 added lines

@@ -64,6 +64,9 @@ 
 
 class WP_UnitTest_Factory_For_Post extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		parent::__construct( $factory );
 		$this->default_generation_definitions = array(
@@ -127,6 +130,9 @@ 
 
 class WP_UnitTest_Factory_For_User extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		parent::__construct( $factory );
 		$this->default_generation_definitions = array(
@@ -152,6 +158,9 @@ 
 
 class WP_UnitTest_Factory_For_Comment extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		parent::__construct( $factory );
 		$this->default_generation_definitions = array(
@@ -183,6 +192,9 @@ 
 
 class WP_UnitTest_Factory_For_Blog extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		global $current_site, $base;
 		parent::__construct( $factory );
@@ -219,6 +231,9 @@ 
 
 class WP_UnitTest_Factory_For_Network extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		parent::__construct( $factory );
 		$this->default_generation_definitions = array(
@@ -255,6 +270,10 @@ 
 	private $taxonomy;
 	const DEFAULT_TAXONOMY = 'post_tag';
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 * @param string $taxonomy
+	 */
 	function __construct( $factory = null, $taxonomy = null ) {
 		parent::__construct( $factory );
 		$this->taxonomy = $taxonomy ? $taxonomy : self::DEFAULT_TAXONOMY;
@@ -342,6 +361,9 @@ 
 
 	abstract function get_object_by_id( $object_id );
 
+	/**
+	 * @param integer $count
+	 */
 	function create_many( $count, $args = array(), $generation_definitions = null ) {
 		$results = array();
 		for ( $i = 0; $i < $count; $i++ ) {
@@ -405,6 +427,9 @@ 
 	public $next;
 	public $template_string;
 
+	/**
+	 * @param integer $start
+	 */
 	function __construct( $template_string = '%s', $start = null ) {
 		if ( $start ) {
 			$this->next = $start;

Spacing +142 added lines, -142 removed lines

@@ -48,78 +48,78 @@ 
 	public $network;
 
 	function __construct() {
-		$this->post = new WP_UnitTest_Factory_For_Post( $this );
-		$this->attachment = new WP_UnitTest_Factory_For_Attachment( $this );
-		$this->comment = new WP_UnitTest_Factory_For_Comment( $this );
-		$this->user = new WP_UnitTest_Factory_For_User( $this );
-		$this->term = new WP_UnitTest_Factory_For_Term( $this );
-		$this->category = new WP_UnitTest_Factory_For_Term( $this, 'category' );
-		$this->tag = new WP_UnitTest_Factory_For_Term( $this, 'post_tag' );
-		if ( is_multisite() ) {
-			$this->blog = new WP_UnitTest_Factory_For_Blog( $this );
-			$this->network = new WP_UnitTest_Factory_For_Network( $this );
+		$this->post = new WP_UnitTest_Factory_For_Post($this);
+		$this->attachment = new WP_UnitTest_Factory_For_Attachment($this);
+		$this->comment = new WP_UnitTest_Factory_For_Comment($this);
+		$this->user = new WP_UnitTest_Factory_For_User($this);
+		$this->term = new WP_UnitTest_Factory_For_Term($this);
+		$this->category = new WP_UnitTest_Factory_For_Term($this, 'category');
+		$this->tag = new WP_UnitTest_Factory_For_Term($this, 'post_tag');
+		if (is_multisite()) {
+			$this->blog = new WP_UnitTest_Factory_For_Blog($this);
+			$this->network = new WP_UnitTest_Factory_For_Network($this);
 		}
 	}
 }
 
 class WP_UnitTest_Factory_For_Post extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null) {
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
 			'post_status' => 'publish',
-			'post_title' => new WP_UnitTest_Generator_Sequence( 'Post title %s' ),
-			'post_content' => new WP_UnitTest_Generator_Sequence( 'Post content %s' ),
-			'post_excerpt' => new WP_UnitTest_Generator_Sequence( 'Post excerpt %s' ),
+			'post_title' => new WP_UnitTest_Generator_Sequence('Post title %s'),
+			'post_content' => new WP_UnitTest_Generator_Sequence('Post content %s'),
+			'post_excerpt' => new WP_UnitTest_Generator_Sequence('Post excerpt %s'),
 			'post_type' => 'post'
 		);
 	}
 
-	function create_object( $args ) {
-		return wp_insert_post( $args );
+	function create_object($args) {
+		return wp_insert_post($args);
 	}
 
-	function update_object( $post_id, $fields ) {
+	function update_object($post_id, $fields) {
 		$fields['ID'] = $post_id;
-		return wp_update_post( $fields );
+		return wp_update_post($fields);
 	}
 
-	function get_object_by_id( $post_id ) {
-		return get_post( $post_id );
+	function get_object_by_id($post_id) {
+		return get_post($post_id);
 	}
 }
 
 class WP_UnitTest_Factory_For_Attachment extends WP_UnitTest_Factory_For_Post {
 
-	function create_object( $file, $parent = 0, $args = array() ) {
-		return wp_insert_attachment( $args, $file, $parent );
+	function create_object($file, $parent = 0, $args = array()) {
+		return wp_insert_attachment($args, $file, $parent);
 	}
 
-	function create_upload_object( $file, $parent = 0 ) {
+	function create_upload_object($file, $parent = 0) {
 		$contents = file_get_contents($file);
 		$upload = wp_upload_bits(basename($file), null, $contents);
 
 		$type = '';
-		if ( ! empty($upload['type']) ) {
+		if (!empty($upload['type'])) {
 			$type = $upload['type'];
 		} else {
-			$mime = wp_check_filetype( $upload['file'] );
+			$mime = wp_check_filetype($upload['file']);
 			if ($mime)
 				$type = $mime['type'];
 		}
 
 		$attachment = array(
-			'post_title' => basename( $upload['file'] ),
+			'post_title' => basename($upload['file']),
 			'post_content' => '',
 			'post_type' => 'attachment',
 			'post_parent' => $parent,
 			'post_mime_type' => $type,
-			'guid' => $upload[ 'url' ],
+			'guid' => $upload['url'],
 		);
 
 		// Save the data
-		$id = wp_insert_attachment( $attachment, $upload[ 'file' ], $parent );
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
+		$id = wp_insert_attachment($attachment, $upload['file'], $parent);
+		wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $upload['file']));
 
 		return $id;
 	}
@@ -127,126 +127,126 @@ 
 
 class WP_UnitTest_Factory_For_User extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null) {
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
-			'user_login' => new WP_UnitTest_Generator_Sequence( 'User %s' ),
+			'user_login' => new WP_UnitTest_Generator_Sequence('User %s'),
 			'user_pass' => 'password',
-			'user_email' => new WP_UnitTest_Generator_Sequence( 'user_%s@example.org' ),
+			'user_email' => new WP_UnitTest_Generator_Sequence('user_%s@example.org'),
 		);
 	}
 
-	function create_object( $args ) {
-		return wp_insert_user( $args );
+	function create_object($args) {
+		return wp_insert_user($args);
 	}
 
-	function update_object( $user_id, $fields ) {
+	function update_object($user_id, $fields) {
 		$fields['ID'] = $user_id;
-		return wp_update_user( $fields );
+		return wp_update_user($fields);
 	}
 
-	function get_object_by_id( $user_id ) {
-		return new WP_User( $user_id );
+	function get_object_by_id($user_id) {
+		return new WP_User($user_id);
 	}
 }
 
 class WP_UnitTest_Factory_For_Comment extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null) {
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
-			'comment_author' => new WP_UnitTest_Generator_Sequence( 'Commenter %s' ),
-			'comment_author_url' => new WP_UnitTest_Generator_Sequence( 'http://example.com/%s/' ),
+			'comment_author' => new WP_UnitTest_Generator_Sequence('Commenter %s'),
+			'comment_author_url' => new WP_UnitTest_Generator_Sequence('http://example.com/%s/'),
 			'comment_approved' => 1,
 			'comment_content' => 'This is a comment'
 		);
 	}
 
-	function create_object( $args ) {
-		return wp_insert_comment( $this->addslashes_deep( $args ) );
+	function create_object($args) {
+		return wp_insert_comment($this->addslashes_deep($args));
 	}
 
-	function update_object( $comment_id, $fields ) {
+	function update_object($comment_id, $fields) {
 		$fields['comment_ID'] = $comment_id;
-		return wp_update_comment( $this->addslashes_deep( $fields ) );
+		return wp_update_comment($this->addslashes_deep($fields));
 	}
 
-	function create_post_comments( $post_id, $count = 1, $args = array(), $generation_definitions = null ) {
+	function create_post_comments($post_id, $count = 1, $args = array(), $generation_definitions = null) {
 		$args['comment_post_ID'] = $post_id;
-		return $this->create_many( $count, $args, $generation_definitions );
+		return $this->create_many($count, $args, $generation_definitions);
 	}
 
-	function get_object_by_id( $comment_id ) {
-		return get_comment( $comment_id );
+	function get_object_by_id($comment_id) {
+		return get_comment($comment_id);
 	}
 }
 
 class WP_UnitTest_Factory_For_Blog extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
+	function __construct($factory = null) {
 		global $current_site, $base;
-		parent::__construct( $factory );
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
 			'domain' => $current_site->domain,
-			'path' => new WP_UnitTest_Generator_Sequence( $base . 'testpath%s' ),
-			'title' => new WP_UnitTest_Generator_Sequence( 'Site %s' ),
+			'path' => new WP_UnitTest_Generator_Sequence($base . 'testpath%s'),
+			'title' => new WP_UnitTest_Generator_Sequence('Site %s'),
 			'site_id' => $current_site->id,
 		);
 	}
 
-	function create_object( $args ) {
+	function create_object($args) {
 		global $wpdb;
-		$meta = isset( $args['meta'] ) ? $args['meta'] : array();
-		$user_id = isset( $args['user_id'] ) ? $args['user_id'] : get_current_user_id();
+		$meta = isset($args['meta']) ? $args['meta'] : array();
+		$user_id = isset($args['user_id']) ? $args['user_id'] : get_current_user_id();
 		// temp tables will trigger db errors when we attempt to reference them as new temp tables
 		$suppress = $wpdb->suppress_errors();
-		$blog = wpmu_create_blog( $args['domain'], $args['path'], $args['title'], $user_id, $meta, $args['site_id'] );
-		$wpdb->suppress_errors( $suppress );
+		$blog = wpmu_create_blog($args['domain'], $args['path'], $args['title'], $user_id, $meta, $args['site_id']);
+		$wpdb->suppress_errors($suppress);
 
 		// Tell WP we're done installing.
-		wp_installing( false );
+		wp_installing(false);
 
 		return $blog;
 	}
 
-	function update_object( $blog_id, $fields ) {}
+	function update_object($blog_id, $fields) {}
 
-	function get_object_by_id( $blog_id ) {
-		return get_blog_details( $blog_id, false );
+	function get_object_by_id($blog_id) {
+		return get_blog_details($blog_id, false);
 	}
 }
 
 
 class WP_UnitTest_Factory_For_Network extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null) {
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
 			'domain' => WP_TESTS_DOMAIN,
-			'title' => new WP_UnitTest_Generator_Sequence( 'Network %s' ),
-			'path' => new WP_UnitTest_Generator_Sequence( '/testpath%s/' ),
-			'network_id' => new WP_UnitTest_Generator_Sequence( '%s', 2 ),
+			'title' => new WP_UnitTest_Generator_Sequence('Network %s'),
+			'path' => new WP_UnitTest_Generator_Sequence('/testpath%s/'),
+			'network_id' => new WP_UnitTest_Generator_Sequence('%s', 2),
 			'subdomain_install' => false,
 		);
 	}
 
-	function create_object( $args ) {
+	function create_object($args) {
 		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 
-		if ( ! isset( $args['user'] ) ) {
+		if (!isset($args['user'])) {
 			$email = WP_TESTS_EMAIL;
 		} else {
-			$email = get_userdata( $args['user'] )->user_email;
+			$email = get_userdata($args['user'])->user_email;
 		}
 
-		populate_network( $args['network_id'], $args['domain'], $email, $args['title'], $args['path'], $args['subdomain_install'] );
+		populate_network($args['network_id'], $args['domain'], $email, $args['title'], $args['path'], $args['subdomain_install']);
 		return $args['network_id'];
 	}
 
-	function update_object( $network_id, $fields ) {}
+	function update_object($network_id, $fields) {}
 
-	function get_object_by_id( $network_id ) {
-		return wp_get_network( $network_id );
+	function get_object_by_id($network_id) {
+		return wp_get_network($network_id);
 	}
 }
 
@@ -255,44 +255,44 @@ 
 	private $taxonomy;
 	const DEFAULT_TAXONOMY = 'post_tag';
 
-	function __construct( $factory = null, $taxonomy = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null, $taxonomy = null) {
+		parent::__construct($factory);
 		$this->taxonomy = $taxonomy ? $taxonomy : self::DEFAULT_TAXONOMY;
 		$this->default_generation_definitions = array(
-			'name' => new WP_UnitTest_Generator_Sequence( 'Term %s' ),
+			'name' => new WP_UnitTest_Generator_Sequence('Term %s'),
 			'taxonomy' => $this->taxonomy,
-			'description' => new WP_UnitTest_Generator_Sequence( 'Term description %s' ),
+			'description' => new WP_UnitTest_Generator_Sequence('Term description %s'),
 		);
 	}
 
-	function create_object( $args ) {
-		$args = array_merge( array( 'taxonomy' => $this->taxonomy ), $args );
-		$term_id_pair = wp_insert_term( $args['name'], $args['taxonomy'], $args );
-		if ( is_wp_error( $term_id_pair ) )
+	function create_object($args) {
+		$args = array_merge(array('taxonomy' => $this->taxonomy), $args);
+		$term_id_pair = wp_insert_term($args['name'], $args['taxonomy'], $args);
+		if (is_wp_error($term_id_pair))
 			return $term_id_pair;
 		return $term_id_pair['term_id'];
 	}
 
-	function update_object( $term, $fields ) {
-		$fields = array_merge( array( 'taxonomy' => $this->taxonomy ), $fields );
-		if ( is_object( $term ) )
+	function update_object($term, $fields) {
+		$fields = array_merge(array('taxonomy' => $this->taxonomy), $fields);
+		if (is_object($term))
 			$taxonomy = $term->taxonomy;
-		$term_id_pair = wp_update_term( $term, $taxonomy, $fields );
+		$term_id_pair = wp_update_term($term, $taxonomy, $fields);
 		return $term_id_pair['term_id'];
 	}
 
-	function add_post_terms( $post_id, $terms, $taxonomy, $append = true ) {
-		return wp_set_post_terms( $post_id, $terms, $taxonomy, $append );
+	function add_post_terms($post_id, $terms, $taxonomy, $append = true) {
+		return wp_set_post_terms($post_id, $terms, $taxonomy, $append);
 	}
 
-	function create_and_get( $args = array(), $generation_definitions = null ) {
-		$term_id = $this->create( $args, $generation_definitions );
-		$taxonomy = isset( $args['taxonomy'] ) ? $args['taxonomy'] : $this->taxonomy;
-		return get_term( $term_id, $taxonomy );
+	function create_and_get($args = array(), $generation_definitions = null) {
+		$term_id = $this->create($args, $generation_definitions);
+		$taxonomy = isset($args['taxonomy']) ? $args['taxonomy'] : $this->taxonomy;
+		return get_term($term_id, $taxonomy);
 	}
 
-	function get_object_by_id( $term_id ) {
-		return get_term( $term_id, $this->taxonomy );
+	function get_object_by_id($term_id) {
+		return get_term($term_id, $this->taxonomy);
 	}
 }
 
@@ -309,90 +309,90 @@ 
 	 * can be generators -- an object with next() method. There are some default generators: {@link WP_UnitTest_Generator_Sequence},
 	 * {@link WP_UnitTest_Generator_Locale_Name}, {@link WP_UnitTest_Factory_Callback_After_Create}.
 	 */
-	function __construct( $factory, $default_generation_definitions = array() ) {
+	function __construct($factory, $default_generation_definitions = array()) {
 		$this->factory = $factory;
 		$this->default_generation_definitions = $default_generation_definitions;
 	}
 
-	abstract function create_object( $args );
-	abstract function update_object( $object, $fields );
+	abstract function create_object($args);
+	abstract function update_object($object, $fields);
 
-	function create( $args = array(), $generation_definitions = null ) {
-		if ( is_null( $generation_definitions ) )
+	function create($args = array(), $generation_definitions = null) {
+		if (is_null($generation_definitions))
 			$generation_definitions = $this->default_generation_definitions;
 
-		$generated_args = $this->generate_args( $args, $generation_definitions, $callbacks );
-		$created = $this->create_object( $generated_args );
-		if ( !$created || is_wp_error( $created ) )
+		$generated_args = $this->generate_args($args, $generation_definitions, $callbacks);
+		$created = $this->create_object($generated_args);
+		if (!$created || is_wp_error($created))
 			return $created;
 
-		if ( $callbacks ) {
-			$updated_fields = $this->apply_callbacks( $callbacks, $created );
-			$save_result = $this->update_object( $created, $updated_fields );
-			if ( !$save_result || is_wp_error( $save_result ) )
+		if ($callbacks) {
+			$updated_fields = $this->apply_callbacks($callbacks, $created);
+			$save_result = $this->update_object($created, $updated_fields);
+			if (!$save_result || is_wp_error($save_result))
 				return $save_result;
 		}
 		return $created;
 	}
 
-	function create_and_get( $args = array(), $generation_definitions = null ) {
-		$object_id = $this->create( $args, $generation_definitions );
-		return $this->get_object_by_id( $object_id );
+	function create_and_get($args = array(), $generation_definitions = null) {
+		$object_id = $this->create($args, $generation_definitions);
+		return $this->get_object_by_id($object_id);
 	}
 
-	abstract function get_object_by_id( $object_id );
+	abstract function get_object_by_id($object_id);
 
-	function create_many( $count, $args = array(), $generation_definitions = null ) {
+	function create_many($count, $args = array(), $generation_definitions = null) {
 		$results = array();
-		for ( $i = 0; $i < $count; $i++ ) {
-			$results[] = $this->create( $args, $generation_definitions );
+		for ($i = 0; $i < $count; $i++) {
+			$results[] = $this->create($args, $generation_definitions);
 		}
 		return $results;
 	}
 
-	function generate_args( $args = array(), $generation_definitions = null, &$callbacks = null ) {
+	function generate_args($args = array(), $generation_definitions = null, &$callbacks = null) {
 		$callbacks = array();
-		if ( is_null( $generation_definitions ) )
+		if (is_null($generation_definitions))
 			$generation_definitions = $this->default_generation_definitions;
 
-		foreach( array_keys( $generation_definitions ) as $field_name ) {
-			if ( !isset( $args[$field_name] ) ) {
+		foreach (array_keys($generation_definitions) as $field_name) {
+			if (!isset($args[$field_name])) {
 				$generator = $generation_definitions[$field_name];
-				if ( is_scalar( $generator ) )
+				if (is_scalar($generator))
 					$args[$field_name] = $generator;
-				elseif ( is_object( $generator ) && method_exists( $generator, 'call' ) ) {
+				elseif (is_object($generator) && method_exists($generator, 'call')) {
 					$callbacks[$field_name] = $generator;
-				} elseif ( is_object( $generator ) )
+				} elseif (is_object($generator))
 					$args[$field_name] = $generator->next();
 				else
-					return new WP_Error( 'invalid_argument', 'Factory default value should be either a scalar or an generator object.' );
+					return new WP_Error('invalid_argument', 'Factory default value should be either a scalar or an generator object.');
 			}
 		}
 		return $args;
 	}
 
-	function apply_callbacks( $callbacks, $created ) {
+	function apply_callbacks($callbacks, $created) {
 		$updated_fields = array();
-		foreach( $callbacks as $field_name => $generator ) {
-			$updated_fields[$field_name] = $generator->call( $created );
+		foreach ($callbacks as $field_name => $generator) {
+			$updated_fields[$field_name] = $generator->call($created);
 		}
 		return $updated_fields;
 	}
 
-	function callback( $function ) {
-		return new WP_UnitTest_Factory_Callback_After_Create( $function );
+	function callback($function) {
+		return new WP_UnitTest_Factory_Callback_After_Create($function);
 	}
 
 	function addslashes_deep($value) {
-		if ( is_array( $value ) ) {
-			$value = array_map( array( $this, 'addslashes_deep' ), $value );
-		} elseif ( is_object( $value ) ) {
-			$vars = get_object_vars( $value );
+		if (is_array($value)) {
+			$value = array_map(array($this, 'addslashes_deep'), $value);
+		} elseif (is_object($value)) {
+			$vars = get_object_vars($value);
 			foreach ($vars as $key=>$data) {
-				$value->{$key} = $this->addslashes_deep( $data );
+				$value->{$key} = $this->addslashes_deep($data);
 			}
-		} elseif ( is_string( $value ) ) {
-			$value = addslashes( $value );
+		} elseif (is_string($value)) {
+			$value = addslashes($value);
 		}
 
 		return $value;
@@ -405,8 +405,8 @@ 
 	public $next;
 	public $template_string;
 
-	function __construct( $template_string = '%s', $start = null ) {
-		if ( $start ) {
+	function __construct($template_string = '%s', $start = null) {
+		if ($start) {
 			$this->next = $start;
 		} else {
 			self::$incr++;
@@ -416,7 +416,7 @@ 
 	}
 
 	function next() {
-		$generated = sprintf( $this->template_string , $this->next );
+		$generated = sprintf($this->template_string, $this->next);
 		$this->next++;
 		return $generated;
 	}
@@ -425,11 +425,11 @@ 
 class WP_UnitTest_Factory_Callback_After_Create {
 	var $callback;
 
-	function __construct( $callback ) {
+	function __construct($callback) {
 		$this->callback = $callback;
 	}
 
-	function call( $object ) {
-		return call_user_func( $this->callback, $object );
+	function call($object) {
+		return call_user_func($this->callback, $object);
 	}
 }

Braces +29 added lines, -21 removed lines

@@ -104,8 +104,9 @@ 
 			$type = $upload['type'];
 		} else {
 			$mime = wp_check_filetype( $upload['file'] );
-			if ($mime)
-				$type = $mime['type'];
+			if ($mime) {
+							$type = $mime['type'];
+			}
 		}
 
 		$attachment = array(
@@ -268,15 +269,17 @@ 
 	function create_object( $args ) {
 		$args = array_merge( array( 'taxonomy' => $this->taxonomy ), $args );
 		$term_id_pair = wp_insert_term( $args['name'], $args['taxonomy'], $args );
-		if ( is_wp_error( $term_id_pair ) )
-			return $term_id_pair;
+		if ( is_wp_error( $term_id_pair ) ) {
+					return $term_id_pair;
+		}
 		return $term_id_pair['term_id'];
 	}
 
 	function update_object( $term, $fields ) {
 		$fields = array_merge( array( 'taxonomy' => $this->taxonomy ), $fields );
-		if ( is_object( $term ) )
-			$taxonomy = $term->taxonomy;
+		if ( is_object( $term ) ) {
+					$taxonomy = $term->taxonomy;
+		}
 		$term_id_pair = wp_update_term( $term, $taxonomy, $fields );
 		return $term_id_pair['term_id'];
 	}
@@ -318,19 +321,22 @@ 
 	abstract function update_object( $object, $fields );
 
 	function create( $args = array(), $generation_definitions = null ) {
-		if ( is_null( $generation_definitions ) )
-			$generation_definitions = $this->default_generation_definitions;
+		if ( is_null( $generation_definitions ) ) {
+					$generation_definitions = $this->default_generation_definitions;
+		}
 
 		$generated_args = $this->generate_args( $args, $generation_definitions, $callbacks );
 		$created = $this->create_object( $generated_args );
-		if ( !$created || is_wp_error( $created ) )
-			return $created;
+		if ( !$created || is_wp_error( $created ) ) {
+					return $created;
+		}
 
 		if ( $callbacks ) {
 			$updated_fields = $this->apply_callbacks( $callbacks, $created );
 			$save_result = $this->update_object( $created, $updated_fields );
-			if ( !$save_result || is_wp_error( $save_result ) )
-				return $save_result;
+			if ( !$save_result || is_wp_error( $save_result ) ) {
+							return $save_result;
+			}
 		}
 		return $created;
 	}
@@ -352,20 +358,22 @@ 
 
 	function generate_args( $args = array(), $generation_definitions = null, &$callbacks = null ) {
 		$callbacks = array();
-		if ( is_null( $generation_definitions ) )
-			$generation_definitions = $this->default_generation_definitions;
+		if ( is_null( $generation_definitions ) ) {
+					$generation_definitions = $this->default_generation_definitions;
+		}
 
 		foreach( array_keys( $generation_definitions ) as $field_name ) {
 			if ( !isset( $args[$field_name] ) ) {
 				$generator = $generation_definitions[$field_name];
-				if ( is_scalar( $generator ) )
-					$args[$field_name] = $generator;
-				elseif ( is_object( $generator ) && method_exists( $generator, 'call' ) ) {
+				if ( is_scalar( $generator ) ) {
+									$args[$field_name] = $generator;
+				} elseif ( is_object( $generator ) && method_exists( $generator, 'call' ) ) {
 					$callbacks[$field_name] = $generator;
-				} elseif ( is_object( $generator ) )
-					$args[$field_name] = $generator->next();
-				else
-					return new WP_Error( 'invalid_argument', 'Factory default value should be either a scalar or an generator object.' );
+				} elseif ( is_object( $generator ) ) {
+									$args[$field_name] = $generator->next();
+				} else {
+									return new WP_Error( 'invalid_argument', 'Factory default value should be either a scalar or an generator object.' );
+				}
 			}
 		}
 		return $args;

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

Doc Comments +6 added lines

@@ -10,6 +10,9 @@ 
 	return true;
 }
 
+/**
+ * @param integer $priority
+ */
 function _test_filter_build_unique_id($tag, $function, $priority) {
 	global $wp_filter;
 	static $filter_id_count = 0;
@@ -92,6 +95,9 @@ 
 	return '_wp_die_handler';
 }
 
+/**
+ * @param string $title
+ */
 function _wp_die_handler_txt( $message, $title, $args ) {
 	echo "\nwp_die called\n";
 	echo "Message : $message\n";

Braces +6 added lines, -4 removed lines

@@ -14,8 +14,9 @@ 
 	global $wp_filter;
 	static $filter_id_count = 0;
 
-	if ( is_string($function) )
-		return $function;
+	if ( is_string($function) ) {
+			return $function;
+	}
 
 	if ( is_object($function) ) {
 		// Closures are currently implemented as objects
@@ -37,8 +38,9 @@ 
 
 	$all_posts = $wpdb->get_col("SELECT ID from {$wpdb->posts}");
 	if ($all_posts) {
-		foreach ($all_posts as $id)
-			wp_delete_post( $id, true );
+		foreach ($all_posts as $id) {
+					wp_delete_post( $id, true );
+		}
 	}
 }
 

Spacing +23 added lines, -23 removed lines

@@ -6,7 +6,7 @@ 
 
 	$idx = _test_filter_build_unique_id($tag, $function_to_add, $priority);
 	$wp_filter[$tag][$priority][$idx] = array('function' => $function_to_add, 'accepted_args' => $accepted_args);
-	unset( $merged_filters[ $tag ] );
+	unset($merged_filters[$tag]);
 	return true;
 }
 
@@ -14,21 +14,21 @@ 
 	global $wp_filter;
 	static $filter_id_count = 0;
 
-	if ( is_string($function) )
+	if (is_string($function))
 		return $function;
 
-	if ( is_object($function) ) {
+	if (is_object($function)) {
 		// Closures are currently implemented as objects
-		$function = array( $function, '' );
+		$function = array($function, '');
 	} else {
 		$function = (array) $function;
 	}
 
-	if (is_object($function[0]) ) {
+	if (is_object($function[0])) {
 		return spl_object_hash($function[0]) . $function[1];
-	} else if ( is_string($function[0]) ) {
+	} else if (is_string($function[0])) {
 		// Static Calling
-		return $function[0].$function[1];
+		return $function[0] . $function[1];
 	}
 }
 
@@ -38,31 +38,31 @@ 
 	$all_posts = $wpdb->get_col("SELECT ID from {$wpdb->posts}");
 	if ($all_posts) {
 		foreach ($all_posts as $id)
-			wp_delete_post( $id, true );
+			wp_delete_post($id, true);
 	}
 }
 
 class Basic_Object {
 	private $foo = 'bar';
 
-	public function __get( $name ) {
+	public function __get($name) {
 		return $this->{$name};
 	}
 
-	public function __set( $name, $value ) {
+	public function __set($name, $value) {
 		return $this->{$name} = $value;
 	}
 
-	public function __isset( $name ) {
-		return isset( $this->{$name} );
+	public function __isset($name) {
+		return isset($this->{$name} );
 	}
 
-	public function __unset( $name ) {
-		unset( $this->{$name} );
+	public function __unset($name) {
+		unset($this->{$name} );
 	}
 
-	public function __call( $name, $arguments ) {
-		return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		return call_user_func_array(array($this, $name), $arguments);
 	}
 
 	private function callMe() {
@@ -72,9 +72,9 @@ 
 
 class Basic_Subclass extends Basic_Object {}
 
-function _wp_die_handler( $message, $title = '', $args = array() ) {
-	if ( !$GLOBALS['_wp_die_disabled'] ) {
-		_wp_die_handler_txt( $message, $title, $args);
+function _wp_die_handler($message, $title = '', $args = array()) {
+	if (!$GLOBALS['_wp_die_disabled']) {
+		_wp_die_handler_txt($message, $title, $args);
 	} else {
 		//Ignore at our peril
 	}
@@ -92,13 +92,13 @@ 
 	return '_wp_die_handler';
 }
 
-function _wp_die_handler_txt( $message, $title, $args ) {
+function _wp_die_handler_txt($message, $title, $args) {
 	echo "\nwp_die called\n";
 	echo "Message : $message\n";
 	echo "Title : $title\n";
-	if ( ! empty( $args ) ) {
+	if (!empty($args)) {
 		echo "Args: \n";
-		foreach( $args as $k => $v ){
+		foreach ($args as $k => $v) {
 			echo "\t $k : $v\n";
 		}
 	}
@@ -113,5 +113,5 @@ 
  * @since 4.2.0
  */
 function _set_default_permalink_structure_for_tests() {
-	update_option( 'permalink_structure', '/%year%/%monthnum%/%day%/%postname%/' );
+	update_option('permalink_structure', '/%year%/%monthnum%/%day%/%postname%/');
 }