Inspection of "bug fixes" - GeoDirectory/geodirectory - Measure and Improve Code Quality continuously with Scrutinizer

Test Setup Failed

Pull Request — master (#215)

by Viruthagiri

created 2016-03-12 17:43 UTC

Status

Indentation +288 added lines, -288 removed lines patch added patch discarded remove patch

@@ -1,19 +1,19 @@  discard block
 block discarded – undo
 <?php
 /**
- * Template for the list of places
- *
- * This is used mostly on the listing (category) pages and outputs the actual grid or list of listings.
- * See the link below for info on how to replace the template in your theme.
- *
- * @link http://docs.wpgeodirectory.com/customizing-geodirectory-templates/
- * @since 1.0.0
- * @package GeoDirectory
- * @global object $wpdb WordPress Database object.
- * @global object $post The current post object.
- * @global object $wp_query WordPress Query object.
- * @global string $gridview_columns The girdview style of the listings.
- * @global object $gd_session GeoDirectory Session object.
- */
+		 * Template for the list of places
+		 *
+		 * This is used mostly on the listing (category) pages and outputs the actual grid or list of listings.
+		 * See the link below for info on how to replace the template in your theme.
+		 *
+		 * @link http://docs.wpgeodirectory.com/customizing-geodirectory-templates/
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 * @global object $wpdb WordPress Database object.
+		 * @global object $post The current post object.
+		 * @global object $wp_query WordPress Query object.
+		 * @global string $gridview_columns The girdview style of the listings.
+		 * @global object $gd_session GeoDirectory Session object.
+		 */
 
 /**
  * Called before the listing template used to list listing of places.
@@ -44,57 +44,57 @@  discard block
 block discarded – undo
 
         <?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 @@  discard block
 block discarded – undo
                                     <?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 @@  discard block
 block discarded – undo
                         <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 @@  discard block
 block discarded – undo
                             <!-- .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 @@  discard block
 block discarded – undo
                 </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');

Please login to merge, or discard this patch.

geodirectory-functions/comments_functions.php 1 patch

Indentation +417 added lines, -417 removed lines patch added patch discarded remove patch

@@ -31,14 +31,14 @@  discard block
 block discarded – undo
  */
 function geodir_comment_meta_row_action($a)
 {
-    global $comment;
-
-    $rating = geodir_get_commentoverall($comment->comment_ID);
-    if ($rating != 0) {
-        //echo '<div class="gd_rating_show" data-average="'.$rating.'" data-id="'.$comment->comment_ID.'"></div>';
-        echo geodir_get_rating_stars($rating, $comment->comment_ID);
-    }
-    return $a;
+	global $comment;
+
+	$rating = geodir_get_commentoverall($comment->comment_ID);
+	if ($rating != 0) {
+		//echo '<div class="gd_rating_show" data-average="'.$rating.'" data-id="'.$comment->comment_ID.'"></div>';
+		echo geodir_get_rating_stars($rating, $comment->comment_ID);
+	}
+	return $a;
 }
 
 add_action('add_meta_boxes_comment', 'geodir_comment_add_meta_box');
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
  */
 function geodir_comment_add_meta_box($comment)
 {
-    add_meta_box('gd-comment-rating', __('Comment Rating', 'geodirectory'), 'geodir_comment_rating_meta', 'comment', 'normal', 'high');
+	add_meta_box('gd-comment-rating', __('Comment Rating', 'geodirectory'), 'geodir_comment_rating_meta', 'comment', 'normal', 'high');
 }
 
 /**
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
  */
 function geodir_comment_rating_meta($comment)
 {
-    $post_type = get_post_type($comment->comment_post_ID);
+	$post_type = get_post_type($comment->comment_post_ID);
 	if (in_array($post_type, (array)geodir_get_posttypes()) && (int)$comment->comment_parent == 0) {
 		$rating = geodir_get_commentoverall($comment->comment_ID);
 		
@@ -107,12 +107,12 @@  discard block
 block discarded – undo
  */
 function geodir_comment_rating_fields()
 {
-    global $post;
+	global $post;
 
-    $post_types = geodir_get_posttypes();
+	$post_types = geodir_get_posttypes();
 
-    if (in_array($post->post_type, $post_types)) {
-        $star_texts = array();
+	if (in_array($post->post_type, $post_types)) {
+		$star_texts = array();
 		$star_texts[] = __('Terrible', 'geodirectory');
 		$star_texts[] = __('Poor', 'geodirectory');
 		$star_texts[] = __('Average', 'geodirectory');
@@ -120,10 +120,10 @@  discard block
 block discarded – undo
 		$star_texts[] = __('Excellent', 'geodirectory');
 		
 		$gd_rating_html = apply_filters('gd_rating_form_html', '<div class="gd_rating" data-average="0" data-id="5"></div>', $star_texts);
-        echo $gd_rating_html;
-        ?>
+		echo $gd_rating_html;
+		?>
         <input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="0"/><?php
-    }
+	}
 }
 
 
@@ -139,9 +139,9 @@  discard block
 block discarded – undo
 function geodir_comment_replaylink($link)
 {
 
-    $link = '<div class="gd_comment_replaylink">' . $link . '</div>';
+	$link = '<div class="gd_comment_replaylink">' . $link . '</div>';
 
-    return $link;
+	return $link;
 }
 
 add_filter('cancel_comment_reply_link', 'geodir_cancle_replaylink');
@@ -156,9 +156,9 @@  discard block
 block discarded – undo
 function geodir_cancle_replaylink($link)
 {
 
-    $link = '<span class="gd-cancel-replaylink">' . $link . '</span>';
+	$link = '<span class="gd-cancel-replaylink">' . $link . '</span>';
 
-    return $link;
+	return $link;
 }
 
 add_action('comment_post', 'geodir_save_rating');
@@ -174,29 +174,29 @@  discard block
 block discarded – undo
  */
 function geodir_save_rating($comment = 0)
 {
-    global $wpdb, $user_ID, $plugin_prefix;
+	global $wpdb, $user_ID, $plugin_prefix;
 
-    $comment_info = get_comment($comment);
+	$comment_info = get_comment($comment);
 
-    $post_id = $comment_info->comment_post_ID;
-    $status = $comment_info->comment_approved;
-    $rating_ip = getenv("REMOTE_ADDR");
+	$post_id = $comment_info->comment_post_ID;
+	$status = $comment_info->comment_approved;
+	$rating_ip = getenv("REMOTE_ADDR");
 	
-    $post = geodir_get_post_info($post_id);
+	$post = geodir_get_post_info($post_id);
 
-    if ($post->post_status == 'publish') {
-        $post_status = '1';
-    } else {
-        $post_status = '0';
-    }
+	if ($post->post_status == 'publish') {
+		$post_status = '1';
+	} else {
+		$post_status = '0';
+	}
 	
-    if (isset($_REQUEST['geodir_overallrating'])) {
-        $overall_rating = $_REQUEST['geodir_overallrating'];
+	if (isset($_REQUEST['geodir_overallrating'])) {
+		$overall_rating = $_REQUEST['geodir_overallrating'];
         
 		if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {
-            $overall_rating = $overall_rating > 0 ? $overall_rating : '0';
+			$overall_rating = $overall_rating > 0 ? $overall_rating : '0';
 
-            $sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET
+			$sqlqry = $wpdb->prepare("INSERT INTO " . GEODIR_REVIEW_TABLE . " SET
 					post_id		= %d,
 					post_type = %s,
 					post_title	= %s,
@@ -214,35 +214,35 @@  discard block
 block discarded – undo
 					post_latitude	= %s,
 					comment_content	= %s 
 					",
-                array($post_id, $post->post_type, $post->post_title, $user_ID, $comment, $rating_ip, $overall_rating, $status, $post_status, date_i18n('Y-m-d H:i:s', current_time('timestamp')), $post->post_city, $post->post_region, $post->post_country, $post->post_latitude, $post->post_longitude, $comment_info->comment_content)
-            );
-
-            $wpdb->query($sqlqry);
-
-            /**
-             * Called after saving the comment.
-             *
-             * @since 1.0.0
-             * @package GeoDirectory
-             * @param array $_REQUEST {
-             *    Attributes of the $_REQUEST variable.
-             *
-             *    @type string $geodir_overallrating Overall rating.
-             *    @type string $comment Comment text.
-             *    @type string $submit Submit button text.
-             *    @type string $comment_post_ID Comment post ID.
-             *    @type string $comment_parent Comment Parent ID.
-             *    @type string $_wp_unfiltered_html_comment Unfiltered html comment string.
-             *
-             * }
-             */
-            do_action('geodir_after_save_comment', $_REQUEST, 'Comment Your Post');
-
-            if ($status) {
-                geodir_update_postrating($post_id);
-            }
-        }
-    }
+				array($post_id, $post->post_type, $post->post_title, $user_ID, $comment, $rating_ip, $overall_rating, $status, $post_status, date_i18n('Y-m-d H:i:s', current_time('timestamp')), $post->post_city, $post->post_region, $post->post_country, $post->post_latitude, $post->post_longitude, $comment_info->comment_content)
+			);
+
+			$wpdb->query($sqlqry);
+
+			/**
+			 * Called after saving the comment.
+			 *
+			 * @since 1.0.0
+			 * @package GeoDirectory
+			 * @param array $_REQUEST {
+			 *    Attributes of the $_REQUEST variable.
+			 *
+			 *    @type string $geodir_overallrating Overall rating.
+			 *    @type string $comment Comment text.
+			 *    @type string $submit Submit button text.
+			 *    @type string $comment_post_ID Comment post ID.
+			 *    @type string $comment_parent Comment Parent ID.
+			 *    @type string $_wp_unfiltered_html_comment Unfiltered html comment string.
+			 *
+			 * }
+			 */
+			do_action('geodir_after_save_comment', $_REQUEST, 'Comment Your Post');
+
+			if ($status) {
+				geodir_update_postrating($post_id);
+			}
+		}
+	}
 }
 
 
@@ -260,51 +260,51 @@  discard block
 block discarded – undo
  */
 function geodir_update_rating_status_change($comment_id, $status)
 {
-    if ($status == 'delete') {
-        return;
-    }
-    global $wpdb, $plugin_prefix, $user_ID;
+	if ($status == 'delete') {
+		return;
+	}
+	global $wpdb, $plugin_prefix, $user_ID;
 
-    $comment_info = get_comment($comment_id);
+	$comment_info = get_comment($comment_id);
 
-    $post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : '';
+	$post_id = isset($comment_info->comment_post_ID) ? $comment_info->comment_post_ID : '';
 
-    if (!empty($comment_info))
-        $status = $comment_info->comment_approved;
+	if (!empty($comment_info))
+		$status = $comment_info->comment_approved;
 
-    if ($status == 'approve' || $status == 1) {
-        $status = 1;
-    } else {
-        $status = 0;
-    }
+	if ($status == 'approve' || $status == 1) {
+		$status = 1;
+	} else {
+		$status = 0;
+	}
 
-    $comment_info_ID = isset($comment_info->comment_ID) ? $comment_info->comment_ID : '';
-    $old_rating = geodir_get_commentoverall($comment_info_ID);
+	$comment_info_ID = isset($comment_info->comment_ID) ? $comment_info->comment_ID : '';
+	$old_rating = geodir_get_commentoverall($comment_info_ID);
 
-    $post_type = get_post_type($post_id);
+	$post_type = get_post_type($post_id);
 
-    $detail_table = $plugin_prefix . $post_type . '_detail';
+	$detail_table = $plugin_prefix . $post_type . '_detail';
 
-    if ($comment_id) {
+	if ($comment_id) {
 
-        $overall_rating = $old_rating;
+		$overall_rating = $old_rating;
 
-        if (isset($old_rating)) {
+		if (isset($old_rating)) {
 
-            $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET
+			$sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET
 						overall_rating = %f,
 						status		= %s,
 						comment_content = %s 
 						WHERE comment_id = %d ", array($overall_rating, $status, $comment_info->comment_content, $comment_id));
 
-            $wpdb->query($sqlqry);
+			$wpdb->query($sqlqry);
 
-            //update rating
-            geodir_update_postrating($post_id, $post_type);
+			//update rating
+			geodir_update_postrating($post_id, $post_type);
 
-        }
+		}
 
-    }
+	}
 
 }
 
@@ -323,41 +323,41 @@  discard block
 block discarded – undo
 function geodir_update_rating($comment_id = 0)
 {
 
-    global $wpdb, $plugin_prefix, $user_ID;
+	global $wpdb, $plugin_prefix, $user_ID;
 
-    $comment_info = get_comment($comment_id);
+	$comment_info = get_comment($comment_id);
 
-    $post_id = $comment_info->comment_post_ID;
-    $status = $comment_info->comment_approved;
-    $old_rating = geodir_get_commentoverall($comment_info->comment_ID);
+	$post_id = $comment_info->comment_post_ID;
+	$status = $comment_info->comment_approved;
+	$old_rating = geodir_get_commentoverall($comment_info->comment_ID);
 
-    $post_type = get_post_type($post_id);
+	$post_type = get_post_type($post_id);
 
-    $detail_table = $plugin_prefix . $post_type . '_detail';
+	$detail_table = $plugin_prefix . $post_type . '_detail';
 
-    if (isset($_REQUEST['geodir_overallrating'])) {
+	if (isset($_REQUEST['geodir_overallrating'])) {
 
-        $overall_rating = $_REQUEST['geodir_overallrating'];
+		$overall_rating = $_REQUEST['geodir_overallrating'];
 
-        if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {
-            $overall_rating = $overall_rating > 0 ? $overall_rating : '0';
+		if (isset($comment_info->comment_parent) && (int)$comment_info->comment_parent == 0) {
+			$overall_rating = $overall_rating > 0 ? $overall_rating : '0';
 
-            if (isset($old_rating)) {
+			if (isset($old_rating)) {
 
-                $sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET
+				$sqlqry = $wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET
 						overall_rating = %f,
 						status		= %s,
 						comment_content	= %s 
 						WHERE comment_id = %d ", array($overall_rating, $status, $comment_info->comment_content, $comment_id));
 
-                $wpdb->query($sqlqry);
+				$wpdb->query($sqlqry);
 
-                //update rating
-                geodir_update_postrating($post_id, $post_type);
+				//update rating
+				geodir_update_postrating($post_id, $post_type);
 
-            }
-        }
-    }
+			}
+		}
+	}
 
 
 }
@@ -373,19 +373,19 @@  discard block
 block discarded – undo
  */
 function geodir_comment_delete_comment($comment_id)
 {
-    global $wpdb;
+	global $wpdb;
 
-    $review_info = geodir_get_review($comment_id);
-    if ($review_info) {
-        geodir_update_postrating($review_info->post_id);
-    }
+	$review_info = geodir_get_review($comment_id);
+	if ($review_info) {
+		geodir_update_postrating($review_info->post_id);
+	}
 
-    $wpdb->query(
-        $wpdb->prepare(
-            "DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d",
-            array($comment_id)
-        )
-    );
+	$wpdb->query(
+		$wpdb->prepare(
+			"DELETE FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d",
+			array($comment_id)
+		)
+	);
 
 }
 
@@ -401,13 +401,13 @@  discard block
 block discarded – undo
  */
 function geodir_wrap_comment_text($content, $comment = '')
 {
-    $rating = 0;
-    if (!empty($comment))
-        $rating = geodir_get_commentoverall($comment->comment_ID);
-    if ($rating != 0 && !is_admin()) {
-        return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';
-    } else
-        return $content;
+	$rating = 0;
+	if (!empty($comment))
+		$rating = geodir_get_commentoverall($comment->comment_ID);
+	if ($rating != 0 && !is_admin()) {
+		return '<div><div class="gd-rating-text">' . __('Overall Rating', 'geodirectory') . ': <div class="rating">' . $rating . '</div></div>' . geodir_get_rating_stars($rating, $comment->comment_ID) . '</div><div class="description">' . $content . '</div>';
+	} else
+		return $content;
 
 }
 
@@ -425,41 +425,41 @@  discard block
 block discarded – undo
  */
 function geodir_update_postrating($post_id = 0, $post_type = '', $delete = false)
 {
-    global $wpdb, $plugin_prefix, $comment;
-    if (!$post_type) {
-        $post_type = get_post_type($post_id);
-    }
-    $detail_table = $plugin_prefix . $post_type . '_detail';
-    $post_newrating = geodir_get_post_rating($post_id, 1);
-    $post_newrating_count = geodir_get_review_count_total($post_id);
+	global $wpdb, $plugin_prefix, $comment;
+	if (!$post_type) {
+		$post_type = get_post_type($post_id);
+	}
+	$detail_table = $plugin_prefix . $post_type . '_detail';
+	$post_newrating = geodir_get_post_rating($post_id, 1);
+	$post_newrating_count = geodir_get_review_count_total($post_id);
 
 
-    //$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ;
+	//$post_newrating = ( (float)$post_oldrating - (float)$old_rating ) + (float)$overall_rating ;
 
-    if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {
+	if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {
 
-        $wpdb->query(
-            $wpdb->prepare(
-                "UPDATE " . $detail_table . " SET
+		$wpdb->query(
+			$wpdb->prepare(
+				"UPDATE " . $detail_table . " SET
 						overall_rating = %f,
 						rating_count = %f
 						where post_id = %d",
-                array($post_newrating, $post_newrating_count, $post_id)
-            )
-        );
-
-        update_post_meta($post_id, 'overall_rating', $post_newrating);
-        update_post_meta($post_id, 'rating_count', $post_newrating_count);
-    }
-    /**
-     * Called after Updating post overall rating and rating count.
-     *
-     * @since 1.0.0
-     * @since 1.4.3 Added `$post_id` param.
-     * @package GeoDirectory
-     * @param int $post_id The post ID.
-     */
-    do_action('geodir_update_postrating',$post_id);
+				array($post_newrating, $post_newrating_count, $post_id)
+			)
+		);
+
+		update_post_meta($post_id, 'overall_rating', $post_newrating);
+		update_post_meta($post_id, 'rating_count', $post_newrating_count);
+	}
+	/**
+	 * Called after Updating post overall rating and rating count.
+	 *
+	 * @since 1.0.0
+	 * @since 1.4.3 Added `$post_id` param.
+	 * @package GeoDirectory
+	 * @param int $post_id The post ID.
+	 */
+	do_action('geodir_update_postrating',$post_id);
 
 }
 
@@ -477,29 +477,29 @@  discard block
 block discarded – undo
  */
 function geodir_get_postoverall($post_id = 0)
 {
-    global $wpdb, $plugin_prefix;
+	global $wpdb, $plugin_prefix;
 
-    $post_type = get_post_type($post_id);
-    $detail_table = $plugin_prefix . $post_type . '_detail';
+	$post_type = get_post_type($post_id);
+	$detail_table = $plugin_prefix . $post_type . '_detail';
 
-    if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {
+	if ($wpdb->get_var("SHOW TABLES LIKE '" . $detail_table . "'") == $detail_table) {
 
-        $post_ratings = $wpdb->get_var(
-            $wpdb->prepare(
-                "SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d",
-                array($post_id)
-            )
-        );
+		$post_ratings = $wpdb->get_var(
+			$wpdb->prepare(
+				"SELECT overall_rating FROM " . $detail_table . " WHERE post_id = %d",
+				array($post_id)
+			)
+		);
 
 
-    } else {
-        $post_ratings = get_post_meta($post_id, 'overall_rating');
-    }
+	} else {
+		$post_ratings = get_post_meta($post_id, 'overall_rating');
+	}
 
-    if ($post_ratings)
-        return $post_ratings;
-    else
-        return false;
+	if ($post_ratings)
+		return $post_ratings;
+	else
+		return false;
 }
 
 
@@ -516,19 +516,19 @@  discard block
 block discarded – undo
  */
 function geodir_get_review($comment_id = 0)
 {
-    global $wpdb;
-
-    $reatings = $wpdb->get_row(
-        $wpdb->prepare(
-            "SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",
-            array($comment_id)
-        )
-    );
-
-    if (!empty($reatings))
-        return $reatings;
-    else
-        return false;
+	global $wpdb;
+
+	$reatings = $wpdb->get_row(
+		$wpdb->prepare(
+			"SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",
+			array($comment_id)
+		)
+	);
+
+	if (!empty($reatings))
+		return $reatings;
+	else
+		return false;
 }
 
 /**
@@ -544,19 +544,19 @@  discard block
 block discarded – undo
  */
 function geodir_get_review_total($post_id = 0)
 {
-    global $wpdb;
-
-    $results = $wpdb->get_var(
-        $wpdb->prepare(
-            "SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",
-            array($post_id)
-        )
-    );
-
-    if (!empty($results))
-        return $results;
-    else
-        return false;
+	global $wpdb;
+
+	$results = $wpdb->get_var(
+		$wpdb->prepare(
+			"SELECT SUM(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",
+			array($post_id)
+		)
+	);
+
+	if (!empty($results))
+		return $results;
+	else
+		return false;
 }
 
 /**
@@ -572,18 +572,18 @@  discard block
 block discarded – undo
  */
 function geodir_get_review_count_by_user_id($user_id = 0)
 {
-    global $wpdb;
-    $results = $wpdb->get_var(
-        $wpdb->prepare(
-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0",
-            array($user_id)
-        )
-    );
-
-    if (!empty($results))
-        return $results;
-    else
-        return false;
+	global $wpdb;
+	$results = $wpdb->get_var(
+		$wpdb->prepare(
+			"SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE user_id = %d AND status=1 AND overall_rating>0",
+			array($user_id)
+		)
+	);
+
+	if (!empty($results))
+		return $results;
+	else
+		return false;
 }
 
 /**
@@ -601,27 +601,27 @@  discard block
 block discarded – undo
  */
 function geodir_get_post_rating($post_id = 0, $force_query = 0)
 {
-    global $wpdb, $post;
-
-    if (isset($post->ID) && $post->ID == $post_id && !$force_query) {
-        if (isset($post->rating_count) && $post->rating_count > 0 && isset($post->overall_rating) && $post->overall_rating > 0) {
-            return $post->overall_rating;
-        } else {
-            return 0;
-        }
-    }
-
-    $results = $wpdb->get_var(
-        $wpdb->prepare(
-            "SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",
-            array($post_id)
-        )
-    );
-
-    if (!empty($results))
-        return $results;
-    else
-        return false;
+	global $wpdb, $post;
+
+	if (isset($post->ID) && $post->ID == $post_id && !$force_query) {
+		if (isset($post->rating_count) && $post->rating_count > 0 && isset($post->overall_rating) && $post->overall_rating > 0) {
+			return $post->overall_rating;
+		} else {
+			return 0;
+		}
+	}
+
+	$results = $wpdb->get_var(
+		$wpdb->prepare(
+			"SELECT COALESCE(avg(overall_rating),0) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",
+			array($post_id)
+		)
+	);
+
+	if (!empty($results))
+		return $results;
+	else
+		return false;
 }
 
 /**
@@ -637,19 +637,19 @@  discard block
 block discarded – undo
  */
 function geodir_get_review_count_total($post_id = 0)
 {
-    global $wpdb;
-
-    $results = $wpdb->get_var(
-        $wpdb->prepare(
-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",
-            array($post_id)
-        )
-    );
-
-    if (!empty($results))
-        return $results;
-    else
-        return false;
+	global $wpdb;
+
+	$results = $wpdb->get_var(
+		$wpdb->prepare(
+			"SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",
+			array($post_id)
+		)
+	);
+
+	if (!empty($results))
+		return $results;
+	else
+		return false;
 }
 
 /**
@@ -666,20 +666,20 @@  discard block
 block discarded – undo
  */
 function geodir_get_comments_number($post_id = 0)
 {
-    global $wpdb;
+	global $wpdb;
 
-    $results = $wpdb->get_var(
-        $wpdb->prepare(
-            "SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",
-            array($post_id)
-        )
-    );
+	$results = $wpdb->get_var(
+		$wpdb->prepare(
+			"SELECT COUNT(overall_rating) FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id = %d AND status=1 AND overall_rating>0",
+			array($post_id)
+		)
+	);
 
 
-    if (!empty($results))
-        return $results;
-    else
-        return false;
+	if (!empty($results))
+		return $results;
+	else
+		return false;
 }
 
 /**
@@ -695,19 +695,19 @@  discard block
 block discarded – undo
  */
 function geodir_get_commentoverall($comment_id = 0)
 {
-    global $wpdb;
-
-    $reatings = $wpdb->get_var(
-        $wpdb->prepare(
-            "SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",
-            array($comment_id)
-        )
-    );
-
-    if ($reatings)
-        return $reatings;
-    else
-        return false;
+	global $wpdb;
+
+	$reatings = $wpdb->get_var(
+		$wpdb->prepare(
+			"SELECT overall_rating FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id = %d",
+			array($comment_id)
+		)
+	);
+
+	if ($reatings)
+		return $reatings;
+	else
+		return false;
 }
 
 /**
@@ -721,7 +721,7 @@  discard block
 block discarded – undo
  */
 function geodir_get_commentoverall_number($post_id = 0)
 {
-    return geodir_get_post_rating($post_id);
+	return geodir_get_post_rating($post_id);
 }
 
 
@@ -739,98 +739,98 @@  discard block
 block discarded – undo
  */
 function geodir_comment_template($comment_template)
 {
-    global $post;
-
-    $post_types = geodir_get_posttypes();
-
-    if (!(is_singular() && (have_comments() || (isset($post->comment_status) && 'open' == $post->comment_status)))) {
-        return;
-    }
-    if (in_array($post->post_type, $post_types)) { // assuming there is a post type called business
-        $template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available
-        if (!$template) {
-            $template = dirname(__FILE__) . '/reviews.php';
-        }
-        return $template;
-    }
+	global $post;
+
+	$post_types = geodir_get_posttypes();
+
+	if (!(is_singular() && (have_comments() || (isset($post->comment_status) && 'open' == $post->comment_status)))) {
+		return;
+	}
+	if (in_array($post->post_type, $post_types)) { // assuming there is a post type called business
+		$template = locate_template(array("geodirectory/reviews.php")); // Use theme template if available
+		if (!$template) {
+			$template = dirname(__FILE__) . '/reviews.php';
+		}
+		return $template;
+	}
 }
 
 add_filter("comments_template", "geodir_comment_template");
 
 
 if (!function_exists('geodir_comment')) {
-    /**
-     * Comment HTML markup.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @global object $post The current post object.
-     * @param object $comment The comment object.
-     * @param string|array $args {
-     *     Optional. Formatting options.
-     *
-     *     @type object $walker            Instance of a Walker class to list comments. Default null.
-     *     @type int    $max_depth         The maximum comments depth. Default empty.
-     *     @type string $style             The style of list ordering. Default 'ul'. Accepts 'ul', 'ol'.
-     *     @type string $callback          Callback function to use. Default null.
-     *     @type string $end-callback      Callback function to use at the end. Default null.
-     *     @type string $type              Type of comments to list.
-     *                                     Default 'all'. Accepts 'all', 'comment', 'pingback', 'trackback', 'pings'.
-     *     @type int    $page              Page ID to list comments for. Default empty.
-     *     @type int    $per_page          Number of comments to list per page. Default empty.
-     *     @type int    $avatar_size       Height and width dimensions of the avatar size. Default 32.
-     *     @type string $reverse_top_level Ordering of the listed comments. Default null. Accepts 'desc', 'asc'.
-     *     @type bool   $reverse_children  Whether to reverse child comments in the list. Default null.
-     *     @type string $format            How to format the comments list.
-     *                                     Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'.
-     *     @type bool   $short_ping        Whether to output short pings. Default false.
-     *     @type bool   $echo              Whether to echo the output or return it. Default true.
-     * }
-     * @param int $depth Depth of comment.
-     */
-    function geodir_comment($comment, $args, $depth)
-    {
-        $GLOBALS['comment'] = $comment;
-        switch ($comment->comment_type) :
-            case 'pingback' :
-            case 'trackback' :
-                // Display trackbacks differently than normal comments.
-                ?>
+	/**
+	 * Comment HTML markup.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @global object $post The current post object.
+	 * @param object $comment The comment object.
+	 * @param string|array $args {
+	 *     Optional. Formatting options.
+	 *
+	 *     @type object $walker            Instance of a Walker class to list comments. Default null.
+	 *     @type int    $max_depth         The maximum comments depth. Default empty.
+	 *     @type string $style             The style of list ordering. Default 'ul'. Accepts 'ul', 'ol'.
+	 *     @type string $callback          Callback function to use. Default null.
+	 *     @type string $end-callback      Callback function to use at the end. Default null.
+	 *     @type string $type              Type of comments to list.
+	 *                                     Default 'all'. Accepts 'all', 'comment', 'pingback', 'trackback', 'pings'.
+	 *     @type int    $page              Page ID to list comments for. Default empty.
+	 *     @type int    $per_page          Number of comments to list per page. Default empty.
+	 *     @type int    $avatar_size       Height and width dimensions of the avatar size. Default 32.
+	 *     @type string $reverse_top_level Ordering of the listed comments. Default null. Accepts 'desc', 'asc'.
+	 *     @type bool   $reverse_children  Whether to reverse child comments in the list. Default null.
+	 *     @type string $format            How to format the comments list.
+	 *                                     Default 'html5' if the theme supports it. Accepts 'html5', 'xhtml'.
+	 *     @type bool   $short_ping        Whether to output short pings. Default false.
+	 *     @type bool   $echo              Whether to echo the output or return it. Default true.
+	 * }
+	 * @param int $depth Depth of comment.
+	 */
+	function geodir_comment($comment, $args, $depth)
+	{
+		$GLOBALS['comment'] = $comment;
+		switch ($comment->comment_type) :
+			case 'pingback' :
+			case 'trackback' :
+				// Display trackbacks differently than normal comments.
+				?>
                 <li <?php comment_class('geodir-comment'); ?> id="comment-<?php comment_ID(); ?>">
                 <p><?php _e('Pingback:', 'geodirectory'); ?> <?php comment_author_link(); ?> <?php edit_comment_link(__('(Edit)', 'geodirectory'), '<span class="edit-link">', '</span>'); ?></p>
                 <?php
-                break;
-            default :
-                // Proceed with normal comments.
-                global $post;
-                ?>
+				break;
+			default :
+				// Proceed with normal comments.
+				global $post;
+				?>
             <li <?php comment_class('geodir-comment'); ?> id="li-comment-<?php comment_ID(); ?>">
                 <article id="comment-<?php comment_ID(); ?>" class="comment hreview">
                     <header class="comment-meta comment-author vcard">
                         <?php
-                        /**
-                         * Filter to modify comment avatar size
-                         *
-                         * You can use this filter to change comment avatar size.
-                         *
-                         * @since 1.0.0
-                         * @package GeoDirectory
-                         */
-                        $avatar_size = apply_filters('geodir_comment_avatar_size', 44);
-                        echo get_avatar($comment, $avatar_size);
-                        printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',
-                            get_comment_author_link(),
-                            // If current post author is also comment author, make it known visually.
-                            ($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''
-                        );
-                        echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>";
-                        printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',
-                            esc_url(get_comment_link($comment->comment_ID)),
-                            get_comment_time('c'),
-                            /* translators: 1: date, 2: time */
-                            sprintf(__('%1$s at %2$s', 'geodirectory'), get_comment_date(), get_comment_time())
-                        );
-                        ?>
+						/**
+						 * Filter to modify comment avatar size
+						 *
+						 * You can use this filter to change comment avatar size.
+						 *
+						 * @since 1.0.0
+						 * @package GeoDirectory
+						 */
+						$avatar_size = apply_filters('geodir_comment_avatar_size', 44);
+						echo get_avatar($comment, $avatar_size);
+						printf('<cite><b class="reviewer">%1$s</b> %2$s</cite>',
+							get_comment_author_link(),
+							// If current post author is also comment author, make it known visually.
+							($comment->user_id === $post->post_author) ? '<span>' . __('Post author', 'geodirectory') . '</span>' : ''
+						);
+						echo "<span class='item'><small><span class='fn'>$post->post_title</span></small></span>";
+						printf('<a href="%1$s"><time datetime="%2$s" class="dtreviewed">%3$s<span class="value-title" title="%2$s"></span></time></a>',
+							esc_url(get_comment_link($comment->comment_ID)),
+							get_comment_time('c'),
+							/* translators: 1: date, 2: time */
+							sprintf(__('%1$s at %2$s', 'geodirectory'), get_comment_date(), get_comment_time())
+						);
+						?>
                     </header>
                     <!-- .comment-meta -->
 
@@ -854,47 +854,47 @@  discard block
 block discarded – undo
                 </article>
                 <!-- #comment-## -->
                 <?php
-                break;
-        endswitch; // end comment_type check
-    }
+				break;
+		endswitch; // end comment_type check
+	}
 }
 
 
 add_filter('get_comments_number', 'geodir_fix_comment_count', 10, 2);
 if (!function_exists('geodir_fix_comment_count')) {
-    /**
-     * Fix comment count by not listing replies as reviews
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @global object $post The current post object.
-     * @param int $count The comment count.
-     * @param int $post_id The post ID.
-     * @todo $post is unreachable since the function return the count before that variable.
-     * @return bool|null|string The comment count.
-     */
-    function geodir_fix_comment_count($count, $post_id)
-    {
-        if (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) {
-            global $post;
-            $post_types = geodir_get_posttypes();
-
-            if (in_array(get_post_type($post_id), $post_types)) {
-                $review_count = geodir_get_review_count_total($post_id);
-                return $review_count;
-
-                if ($post && isset($post->rating_count)) {
-                    return $post->rating_count;
-                } else {
-                    return geodir_get_comments_number($post_id);
-                }
-            } else {
-                return $count;
-            }
-        } else {
-            return $count;
-        }
-    }
+	/**
+	 * Fix comment count by not listing replies as reviews
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @global object $post The current post object.
+	 * @param int $count The comment count.
+	 * @param int $post_id The post ID.
+	 * @todo $post is unreachable since the function return the count before that variable.
+	 * @return bool|null|string The comment count.
+	 */
+	function geodir_fix_comment_count($count, $post_id)
+	{
+		if (!is_admin() || strpos($_SERVER['REQUEST_URI'], 'admin-ajax.php')) {
+			global $post;
+			$post_types = geodir_get_posttypes();
+
+			if (in_array(get_post_type($post_id), $post_types)) {
+				$review_count = geodir_get_review_count_total($post_id);
+				return $review_count;
+
+				if ($post && isset($post->rating_count)) {
+					return $post->rating_count;
+				} else {
+					return geodir_get_comments_number($post_id);
+				}
+			} else {
+				return $count;
+			}
+		} else {
+			return $count;
+		}
+	}
 }
 
 /**
@@ -911,11 +911,11 @@  discard block
 block discarded – undo
  */
 function geodir_get_rating_stars($rating, $post_id, $small = false)
 {
-    $a_rating = $rating / 5 * 100;
+	$a_rating = $rating / 5 * 100;
 
-    if ($small) {
-        $r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>';
-    } else {
+	if ($small) {
+		$r_html = '<div class="rating"><div class="gd_rating_map" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingColor" ></div><div class="geodir_RatingAverage_small" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star_small"></div></div></div>';
+	} else {
 		if (function_exists('geodir_reviewrating_draw_overall_rating')) {
 			// Show rating stars from review rating manager
 			$r_html = geodir_reviewrating_draw_overall_rating($rating);
@@ -933,8 +933,8 @@  discard block
 block discarded – undo
 			}
 			$r_html = '<div class="geodir-rating" style="' . $attach_style . '"><div class="gd_rating_show" data-average="' . $rating . '" data-id="' . $post_id . '"><div class="geodir_RatingAverage" style="width: ' . $a_rating . '%;"></div><div class="geodir_Star">' . $rating_img . $rating_img . $rating_img . $rating_img . $rating_img . '</div></div></div>';
 		}
-    }
-    return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);
+	}
+	return apply_filters('geodir_get_rating_stars_html', $r_html, $rating, 5);
 }
 
 /**
@@ -948,23 +948,23 @@  discard block
 block discarded – undo
 function geodir_is_reviews_show($pageview = '')
 {
 
-    $active_tabs = get_option('geodir_detail_page_tabs_excluded');
-
-    $is_display = true;
-    if (!empty($active_tabs) && in_array('reviews', $active_tabs))
-        $is_display = false;
-
-    /**
-     * Filter to change display value.
-     *
-     * You can use this filter to change the is_display value.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @param bool $is_display Display ratings when set to true.
-     * @param string $pageview The view template. Ex: listview, gridview etc.
-     */
-    return apply_filters('geodir_is_reviews_show', $is_display, $pageview);
+	$active_tabs = get_option('geodir_detail_page_tabs_excluded');
+
+	$is_display = true;
+	if (!empty($active_tabs) && in_array('reviews', $active_tabs))
+		$is_display = false;
+
+	/**
+	 * Filter to change display value.
+	 *
+	 * You can use this filter to change the is_display value.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @param bool $is_display Display ratings when set to true.
+	 * @param string $pageview The view template. Ex: listview, gridview etc.
+	 */
+	return apply_filters('geodir_is_reviews_show', $is_display, $pageview);
 }
 
 
@@ -972,9 +972,9 @@  discard block
 block discarded – undo
  * If Disqus plugin is active, do some fixes to show on blogs but no on GD post types
  */
 if(function_exists('dsq_can_replace')) {
-    remove_filter('comments_template', 'dsq_comments_template');
-    add_filter('comments_template', 'dsq_comments_template', 100);
-    add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);
+	remove_filter('comments_template', 'dsq_comments_template');
+	add_filter('comments_template', 'dsq_comments_template', 100);
+	add_filter('pre_option_disqus_active', 'geodir_option_disqus_active',10,1);
 }
 
 
@@ -988,13 +988,13 @@  discard block
 block discarded – undo
  * @return string `1` if active `0` if disabled.
  */
 function geodir_option_disqus_active($disqus_active){
-    global $post;
-    $all_postypes = geodir_get_posttypes();
+	global $post;
+	$all_postypes = geodir_get_posttypes();
 
-    if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){
-        $disqus_active = '0';
-    }
+	if(isset($post->post_type) && is_array($all_postypes) && in_array($post->post_type,$all_postypes)){
+		$disqus_active = '0';
+	}
 
-    return $disqus_active;
+	return $disqus_active;
 }
 

Please login to merge, or discard this patch.

tests/test-Check_Maps.php 2 patches

Indentation +55 added lines, -55 removed lines patch added patch discarded remove patch

@@ -1,69 +1,69 @@
 block discarded – undo
 <?php
 class CheckMaps extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
 
-    public function testCheckHomeMap()
-    {
-        $output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
-        $this->assertContains( 'geodir-map-home-page', $output );
-    }
+	public function testCheckHomeMap()
+	{
+		$output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
+		$this->assertContains( 'geodir-map-home-page', $output );
+	}
 
-    public function testListingsPageMap()
-    {
-        $output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
-        $this->assertContains( 'geodir-map-listing-page', $output );
-    }
+	public function testListingsPageMap()
+	{
+		$output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
+		$this->assertContains( 'geodir-map-listing-page', $output );
+	}
 
-    public function testDetailPageMap()
-    {
+	public function testDetailPageMap()
+	{
 
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
 
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-            global $post;
-            $post =  geodir_get_post_info($post_id);
-            setup_postdata($post);
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+			global $post;
+			$post =  geodir_get_post_info($post_id);
+			setup_postdata($post);
 
-            $map_args = array();
-            $map_args['map_canvas_name'] = 'detail_page_map_canvas';
-            $map_args['width'] = '600';
-            $map_args['height'] = '300';
-            if ($post->post_mapzoom) {
-                $map_args['zoom'] = '' . $post->post_mapzoom . '';
-            }
-            $map_args['autozoom'] = false;
-            $map_args['child_collapse'] = '0';
-            $map_args['enable_cat_filters'] = false;
-            $map_args['enable_text_search'] = false;
-            $map_args['enable_post_type_filters'] = false;
-            $map_args['enable_location_filters'] = false;
-            $map_args['enable_jason_on_load'] = true;
-            $map_args['enable_map_direction'] = true;
-            $map_args['map_class_name'] = 'geodir-map-detail-page';
-            $map_args['maptype'] = (!empty($post->post_mapview)) ? $post->post_mapview : 'ROADMAP';
-            ob_start();
-            geodir_draw_map($map_args);
-            $output = ob_get_clean();
-            $this->assertContains( 'geodir-map-detail-page', $output );
-        endwhile;
+			$map_args = array();
+			$map_args['map_canvas_name'] = 'detail_page_map_canvas';
+			$map_args['width'] = '600';
+			$map_args['height'] = '300';
+			if ($post->post_mapzoom) {
+				$map_args['zoom'] = '' . $post->post_mapzoom . '';
+			}
+			$map_args['autozoom'] = false;
+			$map_args['child_collapse'] = '0';
+			$map_args['enable_cat_filters'] = false;
+			$map_args['enable_text_search'] = false;
+			$map_args['enable_post_type_filters'] = false;
+			$map_args['enable_location_filters'] = false;
+			$map_args['enable_jason_on_load'] = true;
+			$map_args['enable_map_direction'] = true;
+			$map_args['map_class_name'] = 'geodir-map-detail-page';
+			$map_args['maptype'] = (!empty($post->post_mapview)) ? $post->post_mapview : 'ROADMAP';
+			ob_start();
+			geodir_draw_map($map_args);
+			$output = ob_get_clean();
+			$this->assertContains( 'geodir-map-detail-page', $output );
+		endwhile;
 
 
-    }
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -9,13 +9,13 @@  discard block
 block discarded – undo
     public function testCheckHomeMap()
     {
         $output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
-        $this->assertContains( 'geodir-map-home-page', $output );
+        $this->assertContains('geodir-map-home-page', $output);
     }
 
     public function testListingsPageMap()
     {
         $output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
-        $this->assertContains( 'geodir-map-listing-page', $output );
+        $this->assertContains('geodir-map-listing-page', $output);
     }
 
     public function testDetailPageMap()
@@ -27,12 +27,12 @@  discard block
 block discarded – undo
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
             global $post;
-            $post =  geodir_get_post_info($post_id);
+            $post = geodir_get_post_info($post_id);
             setup_postdata($post);
 
             $map_args = array();
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
             ob_start();
             geodir_draw_map($map_args);
             $output = ob_get_clean();
-            $this->assertContains( 'geodir-map-detail-page', $output );
+            $this->assertContains('geodir-map-detail-page', $output);
         endwhile;
 
 

Please login to merge, or discard this patch.

tests/test-Favourites.php 2 patches

Indentation +59 added lines, -59 removed lines patch added patch discarded remove patch

@@ -1,87 +1,87 @@
 block discarded – undo
 <?php
 class Favourites extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        wp_set_current_user(1);
-    }
+	public function setUp()
+	{
+		parent::setUp();
+		wp_set_current_user(1);
+	}
 
-    public function testAddFavourite()
-    {
-        global $current_user;
+	public function testAddFavourite()
+	{
+		global $current_user;
 
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
 
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
 
-        $this->assertTrue(is_int($post_id));
+		$this->assertTrue(is_int($post_id));
 
-        ob_start();
-        geodir_add_to_favorite($post_id);
-        $output = ob_get_clean();
-        $this->assertContains( 'Remove from Favorites', $output );
+		ob_start();
+		geodir_add_to_favorite($post_id);
+		$output = ob_get_clean();
+		$this->assertContains( 'Remove from Favorites', $output );
 
-        $user_id = $current_user->ID;
+		$user_id = $current_user->ID;
 
-        $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);
+		$user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);
 
-        $this->assertContains( $post_id, $user_fav_posts );
+		$this->assertContains( $post_id, $user_fav_posts );
 
 
-    }
+	}
 
-    public function testRemoveFavourite()
-    {
-        global $current_user;
+	public function testRemoveFavourite()
+	{
+		global $current_user;
 
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
 
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
 
-        $this->assertTrue(is_int($post_id));
+		$this->assertTrue(is_int($post_id));
 
-        ob_start();
-        geodir_add_to_favorite($post_id);
-        $output = ob_get_clean();
-        $this->assertContains( 'Remove from Favorites', $output );
+		ob_start();
+		geodir_add_to_favorite($post_id);
+		$output = ob_get_clean();
+		$this->assertContains( 'Remove from Favorites', $output );
 
-        $user_id = $current_user->ID;
+		$user_id = $current_user->ID;
 
-        $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);
+		$user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);
 
-        $this->assertContains( $post_id, $user_fav_posts );
+		$this->assertContains( $post_id, $user_fav_posts );
 
-        ob_start();
-        geodir_remove_from_favorite($post_id);
-        $output = ob_get_clean();
-        $this->assertContains( 'Add to Favorites', $output );
+		ob_start();
+		geodir_remove_from_favorite($post_id);
+		$output = ob_get_clean();
+		$this->assertContains( 'Add to Favorites', $output );
 
-        $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);
+		$user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);
 
-        $this->assertNotContains( $post_id, $user_fav_posts );
-    }
+		$this->assertNotContains( $post_id, $user_fav_posts );
+	}
 
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -17,9 +17,9 @@  discard block
 block discarded – undo
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -28,13 +28,13 @@  discard block
 block discarded – undo
         ob_start();
         geodir_add_to_favorite($post_id);
         $output = ob_get_clean();
-        $this->assertContains( 'Remove from Favorites', $output );
+        $this->assertContains('Remove from Favorites', $output);
 
         $user_id = $current_user->ID;
 
         $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);
 
-        $this->assertContains( $post_id, $user_fav_posts );
+        $this->assertContains($post_id, $user_fav_posts);
 
 
     }
@@ -49,9 +49,9 @@  discard block
 block discarded – undo
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -60,22 +60,22 @@  discard block
 block discarded – undo
         ob_start();
         geodir_add_to_favorite($post_id);
         $output = ob_get_clean();
-        $this->assertContains( 'Remove from Favorites', $output );
+        $this->assertContains('Remove from Favorites', $output);
 
         $user_id = $current_user->ID;
 
         $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);
 
-        $this->assertContains( $post_id, $user_fav_posts );
+        $this->assertContains($post_id, $user_fav_posts);
 
         ob_start();
         geodir_remove_from_favorite($post_id);
         $output = ob_get_clean();
-        $this->assertContains( 'Add to Favorites', $output );
+        $this->assertContains('Add to Favorites', $output);
 
         $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);
 
-        $this->assertNotContains( $post_id, $user_fav_posts );
+        $this->assertNotContains($post_id, $user_fav_posts);
     }
 
 

Please login to merge, or discard this patch.

tests/test-Check_PinPoint.php 1 patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -1,19 +1,19 @@
 block discarded – undo
 <?php
 class CheckPinpoint extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
 
-    public function testCheckPinpoint()
-    {
+	public function testCheckPinpoint()
+	{
 
-    }
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

tests/test-Add_A_Review.php 1 patch

Indentation +51 added lines, -51 removed lines patch added patch discarded remove patch

@@ -1,63 +1,63 @@
 block discarded – undo
 <?php
 class AddReview extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-        wp_set_current_user(1);
-    }
+	public function setUp()
+	{
+		parent::setUp();
+		wp_set_current_user(1);
+	}
 
-    public function testAddReview()
-    {
-        $time = current_time('mysql');
+	public function testAddReview()
+	{
+		$time = current_time('mysql');
 
-        $args = array(
-            'listing_type' => 'gd_place',
-            'post_title' => 'Test Listing Title',
-            'post_desc' => 'Test Desc',
-            'post_tags' => 'test1,test2',
-            'post_address' => 'New York City Hall',
-            'post_zip' => '10007',
-            'post_latitude' => '40.7127837',
-            'post_longitude' => '-74.00594130000002',
-            'post_mapview' => 'ROADMAP',
-            'post_mapzoom' => '10',
-            'geodir_timing' => '10.00 am to 6 pm every day',
-            'geodir_contact' => '1234567890',
-            'geodir_email' => '[email protected]',
-            'geodir_website' => 'http://test.com',
-            'geodir_twitter' => 'http://twitter.com/test',
-            'geodir_facebook' => 'http://facebook.com/test',
-            'geodir_special_offers' => 'Test offer'
-        );
-        $post_id = geodir_save_listing($args, true);
+		$args = array(
+			'listing_type' => 'gd_place',
+			'post_title' => 'Test Listing Title',
+			'post_desc' => 'Test Desc',
+			'post_tags' => 'test1,test2',
+			'post_address' => 'New York City Hall',
+			'post_zip' => '10007',
+			'post_latitude' => '40.7127837',
+			'post_longitude' => '-74.00594130000002',
+			'post_mapview' => 'ROADMAP',
+			'post_mapzoom' => '10',
+			'geodir_timing' => '10.00 am to 6 pm every day',
+			'geodir_contact' => '1234567890',
+			'geodir_email' => '[email protected]',
+			'geodir_website' => 'http://test.com',
+			'geodir_twitter' => 'http://twitter.com/test',
+			'geodir_facebook' => 'http://facebook.com/test',
+			'geodir_special_offers' => 'Test offer'
+		);
+		$post_id = geodir_save_listing($args, true);
 
-        $data = array(
-            'comment_post_ID' => $post_id,
-            'comment_author' => 'admin',
-            'comment_author_email' => '[email protected]',
-            'comment_author_url' => 'http://wpgeodirectory.com',
-            'comment_content' => 'content here',
-            'comment_type' => '',
-            'comment_parent' => 0,
-            'user_id' => 1,
-            'comment_author_IP' => '127.0.0.1',
-            'comment_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)',
-            'comment_date' => $time,
-            'comment_approved' => 1,
-        );
+		$data = array(
+			'comment_post_ID' => $post_id,
+			'comment_author' => 'admin',
+			'comment_author_email' => '[email protected]',
+			'comment_author_url' => 'http://wpgeodirectory.com',
+			'comment_content' => 'content here',
+			'comment_type' => '',
+			'comment_parent' => 0,
+			'user_id' => 1,
+			'comment_author_IP' => '127.0.0.1',
+			'comment_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)',
+			'comment_date' => $time,
+			'comment_approved' => 1,
+		);
 
-        $comment_id = wp_insert_comment($data);
+		$comment_id = wp_insert_comment($data);
 
-        $_REQUEST['geodir_overallrating'] = 5.0;
-        geodir_save_rating($comment_id);
+		$_REQUEST['geodir_overallrating'] = 5.0;
+		geodir_save_rating($comment_id);
 
-        $this->assertTrue(is_int($comment_id));
-    }
+		$this->assertTrue(is_int($comment_id));
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

tests/test-Send_Enquiry.php 2 patches

Indentation +111 added lines, -111 removed lines patch added patch discarded remove patch

@@ -1,116 +1,116 @@
 block discarded – undo
 <?php
 class SendEnquiry extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
-
-    public function testSendEnquiry()
-    {
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $data = array(
-            'sendact' => 'send_inqury',
-            'pid' => (string) $post_id,
-            'inq_name' => 'Test User',
-            'inq_email' => '[email protected]',
-            'inq_phone' => 'Test',
-            'inq_msg' => 'Hi there, I would like to enquire about this place. I would like to ask more info about...',
-            'Send' => 'Send'
-        );
-
-        add_filter('wp_redirect', '__return_false');
-        geodir_send_inquiry($data);
-        remove_filter('wp_redirect', '__return_false');
-    }
-
-    public function testSendToFriend()
-    {
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $data = array(
-            'sendact' => 'email_frnd',
-            'pid' => (string) $post_id,
-            'yourname' => 'Test User',
-            'youremail' => '[email protected]',
-            'frnd_subject' => 'Test',
-            'frnd_comments' => 'Hi there, This is a comment',
-            'to_email' => '[email protected]',
-            'to_name' => 'Test User 2',
-            'Send' => 'Send'
-        );
-
-        add_filter('wp_redirect', '__return_false');
-        geodir_send_friend($data);
-        remove_filter('wp_redirect', '__return_false');
-    }
-
-    public function texstSendToFriendFailure()
-    {
-        $query_args = array(
-            'post_status' => 'publish',
-            'post_type' => 'gd_place',
-            'posts_per_page' => 1,
-        );
-
-        $all_posts = new WP_Query( $query_args );
-        $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
-            $post_id = get_the_ID();
-        endwhile;
-
-        $this->assertTrue(is_int($post_id));
-
-        $data = array(
-            'sendact' => 'email_frnd',
-            'pid' => (string) $post_id,
-            'yourname' => 'Test User',
-            'youremail' => '[email protected]',
-            'frnd_subject' => 'Test',
-            'frnd_comments' => 'Hi there, This is a comment',
-            'to_email' => 'Test User 2', //incorrect email
-            'to_name' => '[email protected]',
-            'Send' => 'Send'
-        );
-
-        add_filter('wp_redirect', '__return_false');
-        add_filter('wp_mail', 'print_mail');
-        ob_start();
-        geodir_send_friend($data);
-        $output = ob_get_clean();
-        $this->assertContains( 'Email from GeoDirectory failed to send', $output );
-        remove_filter('wp_mail', 'print_mail');
-        remove_filter('wp_redirect', '__return_false');
-    }
-
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
+
+	public function testSendEnquiry()
+	{
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$data = array(
+			'sendact' => 'send_inqury',
+			'pid' => (string) $post_id,
+			'inq_name' => 'Test User',
+			'inq_email' => '[email protected]',
+			'inq_phone' => 'Test',
+			'inq_msg' => 'Hi there, I would like to enquire about this place. I would like to ask more info about...',
+			'Send' => 'Send'
+		);
+
+		add_filter('wp_redirect', '__return_false');
+		geodir_send_inquiry($data);
+		remove_filter('wp_redirect', '__return_false');
+	}
+
+	public function testSendToFriend()
+	{
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$data = array(
+			'sendact' => 'email_frnd',
+			'pid' => (string) $post_id,
+			'yourname' => 'Test User',
+			'youremail' => '[email protected]',
+			'frnd_subject' => 'Test',
+			'frnd_comments' => 'Hi there, This is a comment',
+			'to_email' => '[email protected]',
+			'to_name' => 'Test User 2',
+			'Send' => 'Send'
+		);
+
+		add_filter('wp_redirect', '__return_false');
+		geodir_send_friend($data);
+		remove_filter('wp_redirect', '__return_false');
+	}
+
+	public function texstSendToFriendFailure()
+	{
+		$query_args = array(
+			'post_status' => 'publish',
+			'post_type' => 'gd_place',
+			'posts_per_page' => 1,
+		);
+
+		$all_posts = new WP_Query( $query_args );
+		$post_id = null;
+		while ( $all_posts->have_posts() ) : $all_posts->the_post();
+			$post_id = get_the_ID();
+		endwhile;
+
+		$this->assertTrue(is_int($post_id));
+
+		$data = array(
+			'sendact' => 'email_frnd',
+			'pid' => (string) $post_id,
+			'yourname' => 'Test User',
+			'youremail' => '[email protected]',
+			'frnd_subject' => 'Test',
+			'frnd_comments' => 'Hi there, This is a comment',
+			'to_email' => 'Test User 2', //incorrect email
+			'to_name' => '[email protected]',
+			'Send' => 'Send'
+		);
+
+		add_filter('wp_redirect', '__return_false');
+		add_filter('wp_mail', 'print_mail');
+		ob_start();
+		geodir_send_friend($data);
+		$output = ob_get_clean();
+		$this->assertContains( 'Email from GeoDirectory failed to send', $output );
+		remove_filter('wp_mail', 'print_mail');
+		remove_filter('wp_redirect', '__return_false');
+	}
+
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -14,9 +14,9 @@  discard block
 block discarded – undo
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -78,9 +78,9 @@  discard block
 block discarded – undo
             'posts_per_page' => 1,
         );
 
-        $all_posts = new WP_Query( $query_args );
+        $all_posts = new WP_Query($query_args);
         $post_id = null;
-        while ( $all_posts->have_posts() ) : $all_posts->the_post();
+        while ($all_posts->have_posts()) : $all_posts->the_post();
             $post_id = get_the_ID();
         endwhile;
 
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
         ob_start();
         geodir_send_friend($data);
         $output = ob_get_clean();
-        $this->assertContains( 'Email from GeoDirectory failed to send', $output );
+        $this->assertContains('Email from GeoDirectory failed to send', $output);
         remove_filter('wp_mail', 'print_mail');
         remove_filter('wp_redirect', '__return_false');
     }

Please login to merge, or discard this patch.

tests/bootstrap.php 1 patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -3,41 +3,41 @@  discard block
 block discarded – undo
 $_SERVER['SERVER_NAME'] = '';
 $PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
 
-define( 'GD_USE_PHP_SESSIONS', false );
-define( 'GD_TESTING_MODE', true );
+define('GD_USE_PHP_SESSIONS', false);
+define('GD_TESTING_MODE', true);
 
-$_tests_dir = getenv( 'WP_TESTS_DIR' );
+$_tests_dir = getenv('WP_TESTS_DIR');
 
-if ( ! $_tests_dir ) {
-	$_tests_dir = dirname( __FILE__ )  . '/lib/wordpress-tests-lib';
+if (!$_tests_dir) {
+	$_tests_dir = dirname(__FILE__) . '/lib/wordpress-tests-lib';
 }
 
 require_once $_tests_dir . '/includes/functions.php';
 
 function _manually_load_plugin() {
-	require dirname( __FILE__ ) . '/../geodirectory.php';
+	require dirname(__FILE__) . '/../geodirectory.php';
 }
-tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
+tests_add_filter('muplugins_loaded', '_manually_load_plugin');
 
 function place_dummy_image_url($url) {
-	$gd_dummy_base_url = getenv( 'GD_DUMMY_BASE_URL' );
+	$gd_dummy_base_url = getenv('GD_DUMMY_BASE_URL');
 	if ($gd_dummy_base_url) {
 		return $gd_dummy_base_url;
 	} else {
 		return $url;
 	}
 }
-tests_add_filter( 'place_dummy_image_url', 'place_dummy_image_url' );
+tests_add_filter('place_dummy_image_url', 'place_dummy_image_url');
 
 function place_dummy_cat_image_url($url) {
-	$gd_dummy_base_url = getenv( 'GD_DUMMY_BASE_URL' );
+	$gd_dummy_base_url = getenv('GD_DUMMY_BASE_URL');
 	if ($gd_dummy_base_url) {
-		return $gd_dummy_base_url."/cat_icon";
+		return $gd_dummy_base_url . "/cat_icon";
 	} else {
 		return $url;
 	}
 }
-tests_add_filter( 'place_dummy_cat_image_url', 'place_dummy_cat_image_url' );
+tests_add_filter('place_dummy_cat_image_url', 'place_dummy_cat_image_url');
 
 
 require $_tests_dir . '/includes/bootstrap.php';
@@ -45,12 +45,12 @@  discard block
 block discarded – undo
 global $current_user;
 $current_user = new WP_User(1);
 $current_user->set_role('administrator');
-wp_update_user( array( 'ID' => 1, 'first_name' => 'Admin', 'last_name' => 'User' ) );
+wp_update_user(array('ID' => 1, 'first_name' => 'Admin', 'last_name' => 'User'));
 //Add subscriber
-wp_create_user( 'testuser', '12345', '[email protected]' );
+wp_create_user('testuser', '12345', '[email protected]');
 
 echo "Activating GeoDirectory...\n";
-activate_plugin( 'geodirectory/geodirectory.php' );
+activate_plugin('geodirectory/geodirectory.php');
 
 echo "Installing GeoDirectory...\n";
 geodir_install();
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
 //	unset($_REQUEST['_wpnonce']);
 
 	$i = 2;
-	while($i <= $max) {
+	while ($i <= $max) {
 		global $dummy_post_index, $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
 
 		$dummy_post_index = $i;
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
 		$city_bound_lat2 = 40.91525559999999;
 		$city_bound_lng2 = -73.7002721;
 
-		include dirname( __FILE__ ) . '/../geodirectory-admin/place_dummy_post.php';
+		include dirname(__FILE__) . '/../geodirectory-admin/place_dummy_post.php';
 		$i++;
 	}
 }

Please login to merge, or discard this patch.

tests/test-Author_Page.php 1 patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -1,19 +1,19 @@
 block discarded – undo
 <?php
 class AuthorPage extends WP_UnitTestCase
 {
-    public function setUp()
-    {
-        parent::setUp();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+	}
 
-    public function testAuthorPage()
-    {
+	public function testAuthorPage()
+	{
 
-    }
+	}
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
+	public function tearDown()
+	{
+		parent::tearDown();
+	}
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

		@@ -1,69 +1,69 @@
		block discarded – undo
1	1	<?php
2	2	class CheckMaps extends WP_UnitTestCase
3	3	{
4		- public function setUp()
5		- {
6		- parent::setUp();
7		- }
	4	+ public function setUp()
	5	+ {
	6	+ parent::setUp();
	7	+ }
8	8
9		- public function testCheckHomeMap()
10		- {
11		- $output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
12		- $this->assertContains( 'geodir-map-home-page', $output );
13		- }
	9	+ public function testCheckHomeMap()
	10	+ {
	11	+ $output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
	12	+ $this->assertContains( 'geodir-map-home-page', $output );
	13	+ }
14	14
15		- public function testListingsPageMap()
16		- {
17		- $output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
18		- $this->assertContains( 'geodir-map-listing-page', $output );
19		- }
	15	+ public function testListingsPageMap()
	16	+ {
	17	+ $output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
	18	+ $this->assertContains( 'geodir-map-listing-page', $output );
	19	+ }
20	20
21		- public function testDetailPageMap()
22		- {
	21	+ public function testDetailPageMap()
	22	+ {
23	23
24		- $query_args = array(
25		- 'post_status' => 'publish',
26		- 'post_type' => 'gd_place',
27		- 'posts_per_page' => 1,
28		- );
	24	+ $query_args = array(
	25	+ 'post_status' => 'publish',
	26	+ 'post_type' => 'gd_place',
	27	+ 'posts_per_page' => 1,
	28	+ );
29	29
30		- $all_posts = new WP_Query( $query_args );
31		- $post_id = null;
32		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
33		- $post_id = get_the_ID();
34		- global $post;
35		- $post = geodir_get_post_info($post_id);
36		- setup_postdata($post);
	30	+ $all_posts = new WP_Query( $query_args );
	31	+ $post_id = null;
	32	+ while ( $all_posts->have_posts() ) : $all_posts->the_post();
	33	+ $post_id = get_the_ID();
	34	+ global $post;
	35	+ $post = geodir_get_post_info($post_id);
	36	+ setup_postdata($post);
37	37
38		- $map_args = array();
39		- $map_args['map_canvas_name'] = 'detail_page_map_canvas';
40		- $map_args['width'] = '600';
41		- $map_args['height'] = '300';
42		- if ($post->post_mapzoom) {
43		- $map_args['zoom'] = '' . $post->post_mapzoom . '';
44		- }
45		- $map_args['autozoom'] = false;
46		- $map_args['child_collapse'] = '0';
47		- $map_args['enable_cat_filters'] = false;
48		- $map_args['enable_text_search'] = false;
49		- $map_args['enable_post_type_filters'] = false;
50		- $map_args['enable_location_filters'] = false;
51		- $map_args['enable_jason_on_load'] = true;
52		- $map_args['enable_map_direction'] = true;
53		- $map_args['map_class_name'] = 'geodir-map-detail-page';
54		- $map_args['maptype'] = (!empty($post->post_mapview)) ? $post->post_mapview : 'ROADMAP';
55		- ob_start();
56		- geodir_draw_map($map_args);
57		- $output = ob_get_clean();
58		- $this->assertContains( 'geodir-map-detail-page', $output );
59		- endwhile;
	38	+ $map_args = array();
	39	+ $map_args['map_canvas_name'] = 'detail_page_map_canvas';
	40	+ $map_args['width'] = '600';
	41	+ $map_args['height'] = '300';
	42	+ if ($post->post_mapzoom) {
	43	+ $map_args['zoom'] = '' . $post->post_mapzoom . '';
	44	+ }
	45	+ $map_args['autozoom'] = false;
	46	+ $map_args['child_collapse'] = '0';
	47	+ $map_args['enable_cat_filters'] = false;
	48	+ $map_args['enable_text_search'] = false;
	49	+ $map_args['enable_post_type_filters'] = false;
	50	+ $map_args['enable_location_filters'] = false;
	51	+ $map_args['enable_jason_on_load'] = true;
	52	+ $map_args['enable_map_direction'] = true;
	53	+ $map_args['map_class_name'] = 'geodir-map-detail-page';
	54	+ $map_args['maptype'] = (!empty($post->post_mapview)) ? $post->post_mapview : 'ROADMAP';
	55	+ ob_start();
	56	+ geodir_draw_map($map_args);
	57	+ $output = ob_get_clean();
	58	+ $this->assertContains( 'geodir-map-detail-page', $output );
	59	+ endwhile;
60	60
61	61
62		- }
	62	+ }
63	63
64		- public function tearDown()
65		- {
66		- parent::tearDown();
67		- }
	64	+ public function tearDown()
	65	+ {
	66	+ parent::tearDown();
	67	+ }
68	68	}
69	69	?>
70	70	\ No newline at end of file

		@@ -9,13 +9,13 @@ discard block
		block discarded – undo
9	9	public function testCheckHomeMap()
10	10	{
11	11	$output = do_shortcode('[gd_homepage_map width=100% height=300 scrollwheel=false]');
12		- $this->assertContains( 'geodir-map-home-page', $output );
	12	+ $this->assertContains('geodir-map-home-page', $output);
13	13	}
14	14
15	15	public function testListingsPageMap()
16	16	{
17	17	$output = do_shortcode('[gd_listing_map width=100% height=300 scrollwheel=false sticky=true]');
18		- $this->assertContains( 'geodir-map-listing-page', $output );
	18	+ $this->assertContains('geodir-map-listing-page', $output);
19	19	}
20	20
21	21	public function testDetailPageMap()
		@@ -27,12 +27,12 @@ discard block
		block discarded – undo
27	27	'posts_per_page' => 1,
28	28	);
29	29
30		- $all_posts = new WP_Query( $query_args );
	30	+ $all_posts = new WP_Query($query_args);
31	31	$post_id = null;
32		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
	32	+ while ($all_posts->have_posts()) : $all_posts->the_post();
33	33	$post_id = get_the_ID();
34	34	global $post;
35		- $post = geodir_get_post_info($post_id);
	35	+ $post = geodir_get_post_info($post_id);
36	36	setup_postdata($post);
37	37
38	38	$map_args = array();
		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55	ob_start();
56	56	geodir_draw_map($map_args);
57	57	$output = ob_get_clean();
58		- $this->assertContains( 'geodir-map-detail-page', $output );
	58	+ $this->assertContains('geodir-map-detail-page', $output);
59	59	endwhile;
60	60
61	61

		@@ -1,87 +1,87 @@
		block discarded – undo
1	1	<?php
2	2	class Favourites extends WP_UnitTestCase
3	3	{
4		- public function setUp()
5		- {
6		- parent::setUp();
7		- wp_set_current_user(1);
8		- }
	4	+ public function setUp()
	5	+ {
	6	+ parent::setUp();
	7	+ wp_set_current_user(1);
	8	+ }
9	9
10		- public function testAddFavourite()
11		- {
12		- global $current_user;
	10	+ public function testAddFavourite()
	11	+ {
	12	+ global $current_user;
13	13
14		- $query_args = array(
15		- 'post_status' => 'publish',
16		- 'post_type' => 'gd_place',
17		- 'posts_per_page' => 1,
18		- );
	14	+ $query_args = array(
	15	+ 'post_status' => 'publish',
	16	+ 'post_type' => 'gd_place',
	17	+ 'posts_per_page' => 1,
	18	+ );
19	19
20		- $all_posts = new WP_Query( $query_args );
21		- $post_id = null;
22		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
23		- $post_id = get_the_ID();
24		- endwhile;
	20	+ $all_posts = new WP_Query( $query_args );
	21	+ $post_id = null;
	22	+ while ( $all_posts->have_posts() ) : $all_posts->the_post();
	23	+ $post_id = get_the_ID();
	24	+ endwhile;
25	25
26		- $this->assertTrue(is_int($post_id));
	26	+ $this->assertTrue(is_int($post_id));
27	27
28		- ob_start();
29		- geodir_add_to_favorite($post_id);
30		- $output = ob_get_clean();
31		- $this->assertContains( 'Remove from Favorites', $output );
	28	+ ob_start();
	29	+ geodir_add_to_favorite($post_id);
	30	+ $output = ob_get_clean();
	31	+ $this->assertContains( 'Remove from Favorites', $output );
32	32
33		- $user_id = $current_user->ID;
	33	+ $user_id = $current_user->ID;
34	34
35		- $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);
	35	+ $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);
36	36
37		- $this->assertContains( $post_id, $user_fav_posts );
	37	+ $this->assertContains( $post_id, $user_fav_posts );
38	38
39	39
40		- }
	40	+ }
41	41
42		- public function testRemoveFavourite()
43		- {
44		- global $current_user;
	42	+ public function testRemoveFavourite()
	43	+ {
	44	+ global $current_user;
45	45
46		- $query_args = array(
47		- 'post_status' => 'publish',
48		- 'post_type' => 'gd_place',
49		- 'posts_per_page' => 1,
50		- );
	46	+ $query_args = array(
	47	+ 'post_status' => 'publish',
	48	+ 'post_type' => 'gd_place',
	49	+ 'posts_per_page' => 1,
	50	+ );
51	51
52		- $all_posts = new WP_Query( $query_args );
53		- $post_id = null;
54		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
55		- $post_id = get_the_ID();
56		- endwhile;
	52	+ $all_posts = new WP_Query( $query_args );
	53	+ $post_id = null;
	54	+ while ( $all_posts->have_posts() ) : $all_posts->the_post();
	55	+ $post_id = get_the_ID();
	56	+ endwhile;
57	57
58		- $this->assertTrue(is_int($post_id));
	58	+ $this->assertTrue(is_int($post_id));
59	59
60		- ob_start();
61		- geodir_add_to_favorite($post_id);
62		- $output = ob_get_clean();
63		- $this->assertContains( 'Remove from Favorites', $output );
	60	+ ob_start();
	61	+ geodir_add_to_favorite($post_id);
	62	+ $output = ob_get_clean();
	63	+ $this->assertContains( 'Remove from Favorites', $output );
64	64
65		- $user_id = $current_user->ID;
	65	+ $user_id = $current_user->ID;
66	66
67		- $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);
	67	+ $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);
68	68
69		- $this->assertContains( $post_id, $user_fav_posts );
	69	+ $this->assertContains( $post_id, $user_fav_posts );
70	70
71		- ob_start();
72		- geodir_remove_from_favorite($post_id);
73		- $output = ob_get_clean();
74		- $this->assertContains( 'Add to Favorites', $output );
	71	+ ob_start();
	72	+ geodir_remove_from_favorite($post_id);
	73	+ $output = ob_get_clean();
	74	+ $this->assertContains( 'Add to Favorites', $output );
75	75
76		- $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);
	76	+ $user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);
77	77
78		- $this->assertNotContains( $post_id, $user_fav_posts );
79		- }
	78	+ $this->assertNotContains( $post_id, $user_fav_posts );
	79	+ }
80	80
81	81
82		- public function tearDown()
83		- {
84		- parent::tearDown();
85		- }
	82	+ public function tearDown()
	83	+ {
	84	+ parent::tearDown();
	85	+ }
86	86	}
87	87	?>
88	88	\ No newline at end of file

		@@ -17,9 +17,9 @@ discard block
		block discarded – undo
17	17	'posts_per_page' => 1,
18	18	);
19	19
20		- $all_posts = new WP_Query( $query_args );
	20	+ $all_posts = new WP_Query($query_args);
21	21	$post_id = null;
22		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
	22	+ while ($all_posts->have_posts()) : $all_posts->the_post();
23	23	$post_id = get_the_ID();
24	24	endwhile;
25	25
		@@ -28,13 +28,13 @@ discard block
		block discarded – undo
28	28	ob_start();
29	29	geodir_add_to_favorite($post_id);
30	30	$output = ob_get_clean();
31		- $this->assertContains( 'Remove from Favorites', $output );
	31	+ $this->assertContains('Remove from Favorites', $output);
32	32
33	33	$user_id = $current_user->ID;
34	34
35	35	$user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);
36	36
37		- $this->assertContains( $post_id, $user_fav_posts );
	37	+ $this->assertContains($post_id, $user_fav_posts);
38	38
39	39
40	40	}
		@@ -49,9 +49,9 @@ discard block
		block discarded – undo
49	49	'posts_per_page' => 1,
50	50	);
51	51
52		- $all_posts = new WP_Query( $query_args );
	52	+ $all_posts = new WP_Query($query_args);
53	53	$post_id = null;
54		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
	54	+ while ($all_posts->have_posts()) : $all_posts->the_post();
55	55	$post_id = get_the_ID();
56	56	endwhile;
57	57
		@@ -60,22 +60,22 @@ discard block
		block discarded – undo
60	60	ob_start();
61	61	geodir_add_to_favorite($post_id);
62	62	$output = ob_get_clean();
63		- $this->assertContains( 'Remove from Favorites', $output );
	63	+ $this->assertContains('Remove from Favorites', $output);
64	64
65	65	$user_id = $current_user->ID;
66	66
67	67	$user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);
68	68
69		- $this->assertContains( $post_id, $user_fav_posts );
	69	+ $this->assertContains($post_id, $user_fav_posts);
70	70
71	71	ob_start();
72	72	geodir_remove_from_favorite($post_id);
73	73	$output = ob_get_clean();
74		- $this->assertContains( 'Add to Favorites', $output );
	74	+ $this->assertContains('Add to Favorites', $output);
75	75
76	76	$user_fav_posts = get_user_meta($user_id, 'gd_user_favourite_post', true);
77	77
78		- $this->assertNotContains( $post_id, $user_fav_posts );
	78	+ $this->assertNotContains($post_id, $user_fav_posts);
79	79	}
80	80
81	81

		@@ -1,19 +1,19 @@
		block discarded – undo
1	1	<?php
2	2	class CheckPinpoint extends WP_UnitTestCase
3	3	{
4		- public function setUp()
5		- {
6		- parent::setUp();
7		- }
	4	+ public function setUp()
	5	+ {
	6	+ parent::setUp();
	7	+ }
8	8
9		- public function testCheckPinpoint()
10		- {
	9	+ public function testCheckPinpoint()
	10	+ {
11	11
12		- }
	12	+ }
13	13
14		- public function tearDown()
15		- {
16		- parent::tearDown();
17		- }
	14	+ public function tearDown()
	15	+ {
	16	+ parent::tearDown();
	17	+ }
18	18	}
19	19	?>
20	20	\ No newline at end of file

		@@ -1,63 +1,63 @@
		block discarded – undo
1	1	<?php
2	2	class AddReview extends WP_UnitTestCase
3	3	{
4		- public function setUp()
5		- {
6		- parent::setUp();
7		- wp_set_current_user(1);
8		- }
	4	+ public function setUp()
	5	+ {
	6	+ parent::setUp();
	7	+ wp_set_current_user(1);
	8	+ }
9	9
10		- public function testAddReview()
11		- {
12		- $time = current_time('mysql');
	10	+ public function testAddReview()
	11	+ {
	12	+ $time = current_time('mysql');
13	13
14		- $args = array(
15		- 'listing_type' => 'gd_place',
16		- 'post_title' => 'Test Listing Title',
17		- 'post_desc' => 'Test Desc',
18		- 'post_tags' => 'test1,test2',
19		- 'post_address' => 'New York City Hall',
20		- 'post_zip' => '10007',
21		- 'post_latitude' => '40.7127837',
22		- 'post_longitude' => '-74.00594130000002',
23		- 'post_mapview' => 'ROADMAP',
24		- 'post_mapzoom' => '10',
25		- 'geodir_timing' => '10.00 am to 6 pm every day',
26		- 'geodir_contact' => '1234567890',
27		- 'geodir_email' => '[email protected]',
28		- 'geodir_website' => 'http://test.com',
29		- 'geodir_twitter' => 'http://twitter.com/test',
30		- 'geodir_facebook' => 'http://facebook.com/test',
31		- 'geodir_special_offers' => 'Test offer'
32		- );
33		- $post_id = geodir_save_listing($args, true);
	14	+ $args = array(
	15	+ 'listing_type' => 'gd_place',
	16	+ 'post_title' => 'Test Listing Title',
	17	+ 'post_desc' => 'Test Desc',
	18	+ 'post_tags' => 'test1,test2',
	19	+ 'post_address' => 'New York City Hall',
	20	+ 'post_zip' => '10007',
	21	+ 'post_latitude' => '40.7127837',
	22	+ 'post_longitude' => '-74.00594130000002',
	23	+ 'post_mapview' => 'ROADMAP',
	24	+ 'post_mapzoom' => '10',
	25	+ 'geodir_timing' => '10.00 am to 6 pm every day',
	26	+ 'geodir_contact' => '1234567890',
	27	+ 'geodir_email' => '[email protected]',
	28	+ 'geodir_website' => 'http://test.com',
	29	+ 'geodir_twitter' => 'http://twitter.com/test',
	30	+ 'geodir_facebook' => 'http://facebook.com/test',
	31	+ 'geodir_special_offers' => 'Test offer'
	32	+ );
	33	+ $post_id = geodir_save_listing($args, true);
34	34
35		- $data = array(
36		- 'comment_post_ID' => $post_id,
37		- 'comment_author' => 'admin',
38		- 'comment_author_email' => '[email protected]',
39		- 'comment_author_url' => 'http://wpgeodirectory.com',
40		- 'comment_content' => 'content here',
41		- 'comment_type' => '',
42		- 'comment_parent' => 0,
43		- 'user_id' => 1,
44		- 'comment_author_IP' => '127.0.0.1',
45		- 'comment_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)',
46		- 'comment_date' => $time,
47		- 'comment_approved' => 1,
48		- );
	35	+ $data = array(
	36	+ 'comment_post_ID' => $post_id,
	37	+ 'comment_author' => 'admin',
	38	+ 'comment_author_email' => '[email protected]',
	39	+ 'comment_author_url' => 'http://wpgeodirectory.com',
	40	+ 'comment_content' => 'content here',
	41	+ 'comment_type' => '',
	42	+ 'comment_parent' => 0,
	43	+ 'user_id' => 1,
	44	+ 'comment_author_IP' => '127.0.0.1',
	45	+ 'comment_agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10 (.NET CLR 3.5.30729)',
	46	+ 'comment_date' => $time,
	47	+ 'comment_approved' => 1,
	48	+ );
49	49
50		- $comment_id = wp_insert_comment($data);
	50	+ $comment_id = wp_insert_comment($data);
51	51
52		- $_REQUEST['geodir_overallrating'] = 5.0;
53		- geodir_save_rating($comment_id);
	52	+ $_REQUEST['geodir_overallrating'] = 5.0;
	53	+ geodir_save_rating($comment_id);
54	54
55		- $this->assertTrue(is_int($comment_id));
56		- }
	55	+ $this->assertTrue(is_int($comment_id));
	56	+ }
57	57
58		- public function tearDown()
59		- {
60		- parent::tearDown();
61		- }
	58	+ public function tearDown()
	59	+ {
	60	+ parent::tearDown();
	61	+ }
62	62	}
63	63	?>
64	64	\ No newline at end of file

		@@ -1,116 +1,116 @@
		block discarded – undo
1	1	<?php
2	2	class SendEnquiry extends WP_UnitTestCase
3	3	{
4		- public function setUp()
5		- {
6		- parent::setUp();
7		- }
8		-
9		- public function testSendEnquiry()
10		- {
11		- $query_args = array(
12		- 'post_status' => 'publish',
13		- 'post_type' => 'gd_place',
14		- 'posts_per_page' => 1,
15		- );
16		-
17		- $all_posts = new WP_Query( $query_args );
18		- $post_id = null;
19		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
20		- $post_id = get_the_ID();
21		- endwhile;
22		-
23		- $this->assertTrue(is_int($post_id));
24		-
25		- $data = array(
26		- 'sendact' => 'send_inqury',
27		- 'pid' => (string) $post_id,
28		- 'inq_name' => 'Test User',
29		- 'inq_email' => '[email protected]',
30		- 'inq_phone' => 'Test',
31		- 'inq_msg' => 'Hi there, I would like to enquire about this place. I would like to ask more info about...',
32		- 'Send' => 'Send'
33		- );
34		-
35		- add_filter('wp_redirect', '__return_false');
36		- geodir_send_inquiry($data);
37		- remove_filter('wp_redirect', '__return_false');
38		- }
39		-
40		- public function testSendToFriend()
41		- {
42		- $query_args = array(
43		- 'post_status' => 'publish',
44		- 'post_type' => 'gd_place',
45		- 'posts_per_page' => 1,
46		- );
47		-
48		- $all_posts = new WP_Query( $query_args );
49		- $post_id = null;
50		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
51		- $post_id = get_the_ID();
52		- endwhile;
53		-
54		- $this->assertTrue(is_int($post_id));
55		-
56		- $data = array(
57		- 'sendact' => 'email_frnd',
58		- 'pid' => (string) $post_id,
59		- 'yourname' => 'Test User',
60		- 'youremail' => '[email protected]',
61		- 'frnd_subject' => 'Test',
62		- 'frnd_comments' => 'Hi there, This is a comment',
63		- 'to_email' => '[email protected]',
64		- 'to_name' => 'Test User 2',
65		- 'Send' => 'Send'
66		- );
67		-
68		- add_filter('wp_redirect', '__return_false');
69		- geodir_send_friend($data);
70		- remove_filter('wp_redirect', '__return_false');
71		- }
72		-
73		- public function texstSendToFriendFailure()
74		- {
75		- $query_args = array(
76		- 'post_status' => 'publish',
77		- 'post_type' => 'gd_place',
78		- 'posts_per_page' => 1,
79		- );
80		-
81		- $all_posts = new WP_Query( $query_args );
82		- $post_id = null;
83		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
84		- $post_id = get_the_ID();
85		- endwhile;
86		-
87		- $this->assertTrue(is_int($post_id));
88		-
89		- $data = array(
90		- 'sendact' => 'email_frnd',
91		- 'pid' => (string) $post_id,
92		- 'yourname' => 'Test User',
93		- 'youremail' => '[email protected]',
94		- 'frnd_subject' => 'Test',
95		- 'frnd_comments' => 'Hi there, This is a comment',
96		- 'to_email' => 'Test User 2', //incorrect email
97		- 'to_name' => '[email protected]',
98		- 'Send' => 'Send'
99		- );
100		-
101		- add_filter('wp_redirect', '__return_false');
102		- add_filter('wp_mail', 'print_mail');
103		- ob_start();
104		- geodir_send_friend($data);
105		- $output = ob_get_clean();
106		- $this->assertContains( 'Email from GeoDirectory failed to send', $output );
107		- remove_filter('wp_mail', 'print_mail');
108		- remove_filter('wp_redirect', '__return_false');
109		- }
110		-
111		- public function tearDown()
112		- {
113		- parent::tearDown();
114		- }
	4	+ public function setUp()
	5	+ {
	6	+ parent::setUp();
	7	+ }
	8	+
	9	+ public function testSendEnquiry()
	10	+ {
	11	+ $query_args = array(
	12	+ 'post_status' => 'publish',
	13	+ 'post_type' => 'gd_place',
	14	+ 'posts_per_page' => 1,
	15	+ );
	16	+
	17	+ $all_posts = new WP_Query( $query_args );
	18	+ $post_id = null;
	19	+ while ( $all_posts->have_posts() ) : $all_posts->the_post();
	20	+ $post_id = get_the_ID();
	21	+ endwhile;
	22	+
	23	+ $this->assertTrue(is_int($post_id));
	24	+
	25	+ $data = array(
	26	+ 'sendact' => 'send_inqury',
	27	+ 'pid' => (string) $post_id,
	28	+ 'inq_name' => 'Test User',
	29	+ 'inq_email' => '[email protected]',
	30	+ 'inq_phone' => 'Test',
	31	+ 'inq_msg' => 'Hi there, I would like to enquire about this place. I would like to ask more info about...',
	32	+ 'Send' => 'Send'
	33	+ );
	34	+
	35	+ add_filter('wp_redirect', '__return_false');
	36	+ geodir_send_inquiry($data);
	37	+ remove_filter('wp_redirect', '__return_false');
	38	+ }
	39	+
	40	+ public function testSendToFriend()
	41	+ {
	42	+ $query_args = array(
	43	+ 'post_status' => 'publish',
	44	+ 'post_type' => 'gd_place',
	45	+ 'posts_per_page' => 1,
	46	+ );
	47	+
	48	+ $all_posts = new WP_Query( $query_args );
	49	+ $post_id = null;
	50	+ while ( $all_posts->have_posts() ) : $all_posts->the_post();
	51	+ $post_id = get_the_ID();
	52	+ endwhile;
	53	+
	54	+ $this->assertTrue(is_int($post_id));
	55	+
	56	+ $data = array(
	57	+ 'sendact' => 'email_frnd',
	58	+ 'pid' => (string) $post_id,
	59	+ 'yourname' => 'Test User',
	60	+ 'youremail' => '[email protected]',
	61	+ 'frnd_subject' => 'Test',
	62	+ 'frnd_comments' => 'Hi there, This is a comment',
	63	+ 'to_email' => '[email protected]',
	64	+ 'to_name' => 'Test User 2',
	65	+ 'Send' => 'Send'
	66	+ );
	67	+
	68	+ add_filter('wp_redirect', '__return_false');
	69	+ geodir_send_friend($data);
	70	+ remove_filter('wp_redirect', '__return_false');
	71	+ }
	72	+
	73	+ public function texstSendToFriendFailure()
	74	+ {
	75	+ $query_args = array(
	76	+ 'post_status' => 'publish',
	77	+ 'post_type' => 'gd_place',
	78	+ 'posts_per_page' => 1,
	79	+ );
	80	+
	81	+ $all_posts = new WP_Query( $query_args );
	82	+ $post_id = null;
	83	+ while ( $all_posts->have_posts() ) : $all_posts->the_post();
	84	+ $post_id = get_the_ID();
	85	+ endwhile;
	86	+
	87	+ $this->assertTrue(is_int($post_id));
	88	+
	89	+ $data = array(
	90	+ 'sendact' => 'email_frnd',
	91	+ 'pid' => (string) $post_id,
	92	+ 'yourname' => 'Test User',
	93	+ 'youremail' => '[email protected]',
	94	+ 'frnd_subject' => 'Test',
	95	+ 'frnd_comments' => 'Hi there, This is a comment',
	96	+ 'to_email' => 'Test User 2', //incorrect email
	97	+ 'to_name' => '[email protected]',
	98	+ 'Send' => 'Send'
	99	+ );
	100	+
	101	+ add_filter('wp_redirect', '__return_false');
	102	+ add_filter('wp_mail', 'print_mail');
	103	+ ob_start();
	104	+ geodir_send_friend($data);
	105	+ $output = ob_get_clean();
	106	+ $this->assertContains( 'Email from GeoDirectory failed to send', $output );
	107	+ remove_filter('wp_mail', 'print_mail');
	108	+ remove_filter('wp_redirect', '__return_false');
	109	+ }
	110	+
	111	+ public function tearDown()
	112	+ {
	113	+ parent::tearDown();
	114	+ }
115	115	}
116	116	?>
117	117	\ No newline at end of file

		@@ -14,9 +14,9 @@ discard block
		block discarded – undo
14	14	'posts_per_page' => 1,
15	15	);
16	16
17		- $all_posts = new WP_Query( $query_args );
	17	+ $all_posts = new WP_Query($query_args);
18	18	$post_id = null;
19		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
	19	+ while ($all_posts->have_posts()) : $all_posts->the_post();
20	20	$post_id = get_the_ID();
21	21	endwhile;
22	22
		@@ -45,9 +45,9 @@ discard block
		block discarded – undo
45	45	'posts_per_page' => 1,
46	46	);
47	47
48		- $all_posts = new WP_Query( $query_args );
	48	+ $all_posts = new WP_Query($query_args);
49	49	$post_id = null;
50		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
	50	+ while ($all_posts->have_posts()) : $all_posts->the_post();
51	51	$post_id = get_the_ID();
52	52	endwhile;
53	53
		@@ -78,9 +78,9 @@ discard block
		block discarded – undo
78	78	'posts_per_page' => 1,
79	79	);
80	80
81		- $all_posts = new WP_Query( $query_args );
	81	+ $all_posts = new WP_Query($query_args);
82	82	$post_id = null;
83		- while ( $all_posts->have_posts() ) : $all_posts->the_post();
	83	+ while ($all_posts->have_posts()) : $all_posts->the_post();
84	84	$post_id = get_the_ID();
85	85	endwhile;
86	86
		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103	ob_start();
104	104	geodir_send_friend($data);
105	105	$output = ob_get_clean();
106		- $this->assertContains( 'Email from GeoDirectory failed to send', $output );
	106	+ $this->assertContains('Email from GeoDirectory failed to send', $output);
107	107	remove_filter('wp_mail', 'print_mail');
108	108	remove_filter('wp_redirect', '__return_false');
109	109	}

		@@ -3,41 +3,41 @@ discard block
		block discarded – undo
3	3	$_SERVER['SERVER_NAME'] = '';
4	4	$PHP_SELF = $GLOBALS['PHP_SELF'] = $_SERVER['PHP_SELF'] = '/index.php';
5	5
6		-define( 'GD_USE_PHP_SESSIONS', false );
7		-define( 'GD_TESTING_MODE', true );
	6	+define('GD_USE_PHP_SESSIONS', false);
	7	+define('GD_TESTING_MODE', true);
8	8
9		-$_tests_dir = getenv( 'WP_TESTS_DIR' );
	9	+$_tests_dir = getenv('WP_TESTS_DIR');
10	10
11		-if ( ! $_tests_dir ) {
12		- $_tests_dir = dirname( __FILE__ ) . '/lib/wordpress-tests-lib';
	11	+if (!$_tests_dir) {
	12	+ $_tests_dir = dirname(__FILE__) . '/lib/wordpress-tests-lib';
13	13	}
14	14
15	15	require_once $_tests_dir . '/includes/functions.php';
16	16
17	17	function _manually_load_plugin() {
18		- require dirname( __FILE__ ) . '/../geodirectory.php';
	18	+ require dirname(__FILE__) . '/../geodirectory.php';
19	19	}
20		-tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );
	20	+tests_add_filter('muplugins_loaded', '_manually_load_plugin');
21	21
22	22	function place_dummy_image_url($url) {
23		- $gd_dummy_base_url = getenv( 'GD_DUMMY_BASE_URL' );
	23	+ $gd_dummy_base_url = getenv('GD_DUMMY_BASE_URL');
24	24	if ($gd_dummy_base_url) {
25	25	return $gd_dummy_base_url;
26	26	} else {
27	27	return $url;
28	28	}
29	29	}
30		-tests_add_filter( 'place_dummy_image_url', 'place_dummy_image_url' );
	30	+tests_add_filter('place_dummy_image_url', 'place_dummy_image_url');
31	31
32	32	function place_dummy_cat_image_url($url) {
33		- $gd_dummy_base_url = getenv( 'GD_DUMMY_BASE_URL' );
	33	+ $gd_dummy_base_url = getenv('GD_DUMMY_BASE_URL');
34	34	if ($gd_dummy_base_url) {
35		- return $gd_dummy_base_url."/cat_icon";
	35	+ return $gd_dummy_base_url . "/cat_icon";
36	36	} else {
37	37	return $url;
38	38	}
39	39	}
40		-tests_add_filter( 'place_dummy_cat_image_url', 'place_dummy_cat_image_url' );
	40	+tests_add_filter('place_dummy_cat_image_url', 'place_dummy_cat_image_url');
41	41
42	42
43	43	require $_tests_dir . '/includes/bootstrap.php';
		@@ -45,12 +45,12 @@ discard block
		block discarded – undo
45	45	global $current_user;
46	46	$current_user = new WP_User(1);
47	47	$current_user->set_role('administrator');
48		-wp_update_user( array( 'ID' => 1, 'first_name' => 'Admin', 'last_name' => 'User' ) );
	48	+wp_update_user(array('ID' => 1, 'first_name' => 'Admin', 'last_name' => 'User'));
49	49	//Add subscriber
50		-wp_create_user( 'testuser', '12345', '[email protected]' );
	50	+wp_create_user('testuser', '12345', '[email protected]');
51	51
52	52	echo "Activating GeoDirectory...\n";
53		-activate_plugin( 'geodirectory/geodirectory.php' );
	53	+activate_plugin('geodirectory/geodirectory.php');
54	54
55	55	echo "Installing GeoDirectory...\n";
56	56	geodir_install();
		@@ -121,7 +121,7 @@ discard block
		block discarded – undo
121	121	// unset($_REQUEST['_wpnonce']);
122	122
123	123	$i = 2;
124		- while($i <= $max) {
	124	+ while ($i <= $max) {
125	125	global $dummy_post_index, $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
126	126
127	127	$dummy_post_index = $i;
		@@ -130,7 +130,7 @@ discard block
		block discarded – undo
130	130	$city_bound_lat2 = 40.91525559999999;
131	131	$city_bound_lng2 = -73.7002721;
132	132
133		- include dirname( __FILE__ ) . '/../geodirectory-admin/place_dummy_post.php';
	133	+ include dirname(__FILE__) . '/../geodirectory-admin/place_dummy_post.php';
134	134	$i++;
135	135	}
136	136	}

GeoDirectory / geodirectory

Pull Request — master (#215)

Status

Category

Indentation +288 added lines, -288 removed lines patch added patch discarded remove patch

Indentation +417 added lines, -417 removed lines patch added patch discarded remove patch

Indentation +55 added lines, -55 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Indentation +59 added lines, -59 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +51 added lines, -51 removed lines patch added patch discarded remove patch

Indentation +111 added lines, -111 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch