Merge pull request #200 from MultinetInteractive/master

2.0.20

Author: itssimple

content/template/bookingTemplate/-login-form.php

@@ -58,13 +58,13 @@
 	unset( EDU()->session['eduadmin-forgotPassSent'] );
 	?>
 	<div class="edu-modal warning" style="display: block; clear: both;">
-		<?php esc_html_e( 'A new password has been sent by email.', 'eduadmin-booking' ); ?>
+		<?php esc_html_e( 'An email with instructions how to reset your password has been sent.', 'eduadmin-booking' ); ?>
 	</div>
 	<?php
 } elseif ( isset( EDU()->session['eduadmin-forgotPassSent'] ) && false === EDU()->session['eduadmin-forgotPassSent'] ) {
 	unset( EDU()->session['eduadmin-forgotPassSent'] );
 	?>
 	<div class="edu-modal warning" style="display: block; clear: both;">
-		<?php esc_html_e( 'Could not send a new password by email.', 'eduadmin-booking' ); ?>
+		<?php esc_html_e( 'An email with instructions how to reset your password has been sent.', 'eduadmin-booking' ); ?>
 	</div>
 <?php } ?>

content/template/detailTemplate/blocks/event-item.php

@@ -21,7 +21,7 @@
 <div data-groupid="eduev<?php echo( $group_by_city ? '-' . esc_attr( $ev['City'] ) : '' ); ?>" class="eventItem<?php echo( $show_more > 0 && $i >= $show_more ? ' showMoreHidden' : '' ); ?>">
 	<div class="eventDate<?php echo esc_attr( $group_by_city_class ); ?>">
 		<?php
-		echo isset( $event_dates[ $ev['EventId'] ] ) ? wp_kses_post( get_logical_date_groups( $event_dates[ $ev['EventId'] ] ) ) : wp_kses_post( get_old_start_end_display_date( $ev['StartDate'], $ev['EndDate'] ) );
+		echo isset( $event_dates[ $ev['EventId'] ] ) ? get_logical_date_groups( $event_dates[ $ev['EventId'] ] ) : wp_kses_post( get_old_start_end_display_date( $ev['StartDate'], $ev['EndDate'] ) );
 		echo ! isset( $event_dates[ $ev['EventId'] ] ) || 1 === count( $event_dates[ $ev['EventId'] ] ) ? '<span class="eventTime">, ' . esc_html( date( 'H:i', strtotime( $ev['StartDate'] ) ) ) . ' - ' . esc_html( date( 'H:i', strtotime( $ev['EndDate'] ) ) ) . '</span>' : '';
 		?>
 	</div>

eduadmin.php

@@ -9,7 +9,7 @@
  * Plugin URI:	https://www.eduadmin.se
  * Description:	EduAdmin plugin to allow visitors to book courses at your website
  * Tags:	booking, participants, courses, events, eduadmin, lega online
- * Version:	2.0.19
+ * Version:	2.0.20
  * GitHub Plugin URI: multinetinteractive/eduadmin-wordpress
  * GitHub Plugin URI: https://github.com/multinetinteractive/eduadmin-wordpress
  * Requires at least: 4.7

includes/edu-text-functions.php

@@ -231,36 +231,53 @@ function get_logical_date_groups( $dates, $short = false, $event = null, $show_d
 		$show_days = true;
 	}
 
-	$n_dates = get_range_from_days( $dates, $short, $event, $show_days );
+	$n_dates = edu_get_date_range( $dates, $short, $event, $show_days );
 
 	return join( '<span class="edu-dateSeparator"></span>', $n_dates );
 }
 
-// Copied from http://codereview.stackexchange.com/a/83095/27610
-function get_range_from_days( $days, $short, $event, $show_days ) {
+function edu_get_date_range( $days, $short, $event, $show_days ) {
 	usort( $days, "DateComparer" );
-	$start_date  = $days[0];
-	$finish_date = $days[ count( $days ) - 1 ];
-	$result      = array();
-	// walk through the dates, breaking at gaps
-	foreach ( $days as $key => $date ) {
-		if ( ( $key > 0 ) && ( strtotime( $date['StartDate'] ) - strtotime( $days[ $key - 1 ]['StartDate'] ) > 99999 ) ) {
-			$result[]   = get_start_end_display_date( $start_date, $days[ $key - 1 ], $short, $event, $show_days );
-			$start_date = $date;
+
+	if ( 1 === count( $days ) ) {
+		return array( get_start_end_display_date( $days[0], $days[0], $short, $event, $show_days ) );
+	}
+
+	$added_dates = array();
+
+	$total_days = count( $days );
+
+	for ( $x = 0; $x < $total_days; $x++ ) {
+		$day = $days[ $x ];
+
+		$added_dates[ date( 'H:i', strtotime( $day['StartDate'] ) ) . '-' . date( 'H:i', strtotime( $day['EndDate'] ) ) ][] = $day;
+	}
+
+	$ordered_dategroups = array();
+
+	foreach ( $added_dates as $time => $_days ) {
+		$start_date  = $_days[0];
+		$finish_date = $_days[ count( $_days ) - 1 ];
+		foreach ( $_days as $key => $date ) {
+			if ( $key > 0 && ( strtotime( $date['StartDate'] ) - strtotime( $_days[ $key - 1 ]['StartDate'] ) > 99999 ) ) {
+				$ordered_dategroups[ $start_date['StartDate'] ] = get_start_end_display_date( $start_date, $_days[ $key - 1 ], $short, $event, $show_days );
+				$start_date                                     = $date;
+			}
 		}
+		$ordered_dategroups[ $start_date['StartDate'] ] = get_start_end_display_date( $start_date, $finish_date, $short, $event, $show_days );
 	}
-	// force the end
-	$result[] = get_start_end_display_date( $start_date, $finish_date, $short, $event, $show_days );
 
-	if ( count( $result ) > 3 ) {
+	ksort( $ordered_dategroups );
+
+	if ( count( $ordered_dategroups ) > 3 ) {
 		$n_res = array();
 		$ret   =
 			'<span class="edu-manyDays" title="' . esc_attr__( 'Show schedule', 'eduadmin-booking' ) . '" onclick="edu_openDatePopup(this);">' .
 			/* translators: 1: Number of days 2: Date range */
 			wp_kses_post( sprintf( __( '%1$d days between %2$s', 'eduadmin-booking' ), count( $days ), get_start_end_display_date( $days[0], end( $days ), $short, $show_days ) ) ) .
 			'</span><div class="edu-DayPopup">
 <b>' . esc_html__( 'Schedule', 'eduadmin-booking' ) . '</b><br />
-' . join( "<br />\n", $result ) . '
+' . join( "<br />\n", $ordered_dategroups ) . '
 <br />
 <a href="javascript://" onclick="edu_closeDatePopup(event, this);">' . esc_html__( 'Close', 'eduadmin-booking' ) . '</a>
 </div>';
@@ -270,7 +287,7 @@ function get_range_from_days( $days, $short, $event, $show_days ) {
 		return $n_res;
 	}
 
-	return $result;
+	return $ordered_dategroups;
 }
 
 function get_start_end_display_date( $start_date, $end_date, $short = false, $event, $show_days = false ) {

readme.md

@@ -3,7 +3,7 @@ Contributors: mnchga
 Tags: booking, participants, courses, events, eduadmin, lega online
 Requires at least: 4.7
 Tested up to: 4.9
-Stable tag: 2.0.19
+Stable tag: 2.0.20
 Requires PHP: 5.2
 License: GPL3
 License-URI: https://www.gnu.org/licenses/gpl-3.0.en.html
@@ -37,6 +37,10 @@ If you notice that your API key doesn't work any more, you have to contact us.
 
 == Changelog ==
 
+### 2.0.20
+- chg: Altered the info text you get when you request a password reset.
+- chg: Made a new function to group dates, that works better.
+
 ### 2.0.19
 - add: Added `get_transient` in `eduadmin.php` (`EDU()->get_transient($name, $action, $expiration, ..$args)`)