Fix #36

Author: kimbtech

core/InputParser.php

@@ -47,7 +47,9 @@ public static function getEndTimestamp(string $t) : int {
 				}
 			}
 
-			$timestamp = strtotime($plusOneDay ? "tomorrow" : "today") + 3600 * $hs + 60 * $mins;
+			$timestamp = strtotime($plusOneDay ? "tomorrow" : "today")
+				+ 3600 * ($hs + Time::getTimeChangeDifference())
+				+ 60 * $mins;
 		}
 		else if( isset($matches[2]) ){ // Gruppe 2, d.h. Minuten- und/oder Stundenangabe
 			$hs = 0;

core/Time.php

@@ -85,5 +85,29 @@ public static function secToTime(int $t) : string {
 		}
 		return self::$time->getDurationString($t);
 	}
+
+	public static function isSummertime(int $now = null) : bool {
+		return date('I', is_null($now) ? time() : $now) === '1';
+	}
+
+	public static function getTimeChangeDifference(int $now = null) : int {
+		$now = is_null($now) ? time() : $now;
+		$todayNight = self::isSummertime(strtotime("today 00:00", $now));
+		$todayMid = self::isSummertime(strtotime("today 12:00", $now));
+		if( $todayMid === $todayNight || intval(date('G', $now)) < 3 ){
+			return 0;
+		}
+		else {
+			if( !$todayNight && $todayMid ){
+				return -1;
+			}
+			if( $todayNight && !$todayMid ){
+				return +1;
+			}
+			else{
+				return 0;
+			}
+		}
+	}
 }
 ?>

core/Utilities.php

@@ -4,7 +4,7 @@
  */
 class Utilities {
 
-	const VERSION = 'v1.0.15';
+	const VERSION = 'v1.0.16';
 
 	const DEFAULT_LINE_LENGTH = 125;