Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

correct weekend calculation

Browse Source
This commit is contained in:
HB9HIL
2024-05-10 10:40:50 +02:00
parent d26d4cc358
commit e4feeca972
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
application/controllers/Contestcalendar.php
View File

@@ -148,24 +148,30 @@ class Contestcalendar extends CI_Controller {
private function contestsNextWeekend($rss) {
$contestsNextWeekend = array();
$today = date('Y-m-d');
$nextFriday = date('Y-m-d', strtotime('next friday', strtotime($today)));
$nextSunday = date('Y-m-d', strtotime('next sunday', strtotime($today)));
$currentDayOfWeek = date('N', strtotime($today));
if ($currentDayOfWeek >= 1 && $currentDayOfWeek <= 4) {
$nextFriday = date('Y-m-d', strtotime('next friday', strtotime($today)));
$nextSunday = date('Y-m-d', strtotime('next sunday', strtotime($today)));
} else {
$nextFriday = date('Y-m-d', strtotime('friday this week', strtotime($today)));
$nextSunday = date('Y-m-d', strtotime('sunday this week', strtotime($today)));
}
foreach ($rss as $contest) {
if (!($contest['start'] instanceof DateTime)) {
log_message('debug',"Invalid Time format for contest: " . $contest['title']);
continue;
}
$start = date('Y-m-d', strtotime($contest['start']->format('Y-m-d')));
if ($start >= $nextFriday && $start <= $nextSunday) {
if ($start >= $nextFriday && $start <= $nextSunday && $start >= $today) {
$contestsNextWeekend[] = $contest;
}
}
return $contestsNextWeekend;
}