Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Add check if scheduled time is out of MySQL timestamp range

Browse Source 
[MAILPOET-3818]
This commit is contained in:
Jan Lysý
2021-10-20 16:31:12 +02:00
committed by Veljko V
parent 44f08cd068
commit fdd8926991
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Newsletter/Scheduler/Scheduler.php
View File

@@ -7,6 +7,8 @@ use MailPoet\WP\Functions as WPFunctions;
use MailPoetVendor\Carbon\Carbon; use MailPoetVendor\Carbon\Carbon;
class Scheduler { class Scheduler {
const MYSQL_TIMESTAMP_MAX = '2038-01-19 03:14:07';
public static function getNextRunDate($schedule, $fromTimestamp = false) { public static function getNextRunDate($schedule, $fromTimestamp = false) {
$wp = new WPFunctions(); $wp = new WPFunctions();
$fromTimestamp = ($fromTimestamp) ? $fromTimestamp : $wp->currentTime('timestamp'); $fromTimestamp = ($fromTimestamp) ? $fromTimestamp : $wp->currentTime('timestamp');
@@ -38,16 +40,23 @@ class Scheduler {
$currentTime = Carbon::createFromTimestamp($wp->currentTime('timestamp')); $currentTime = Carbon::createFromTimestamp($wp->currentTime('timestamp'));
switch ($afterTimeType) { switch ($afterTimeType) {
case 'minutes': case 'minutes':
return $currentTime->addMinutes($afterTimeNumber); $currentTime->addMinutes($afterTimeNumber);
break;
case 'hours': case 'hours':
return $currentTime->addHours($afterTimeNumber); $currentTime->addHours($afterTimeNumber);
break;
case 'days': case 'days':
return $currentTime->addDays($afterTimeNumber); $currentTime->addDays($afterTimeNumber);
break;
case 'weeks': case 'weeks':
return $currentTime->addWeeks($afterTimeNumber); $currentTime->addWeeks($afterTimeNumber);
default: break;
return $currentTime;
} }
$maxScheduledTime = Carbon::createFromFormat('Y-m-d H:i:s', self::MYSQL_TIMESTAMP_MAX);
if ($maxScheduledTime && $currentTime->format('Y-m-d H:i:s') > $maxScheduledTime) {
return $maxScheduledTime;
}
return $currentTime;
} }
public static function getNewsletters($type, $group = false) { public static function getNewsletters($type, $group = false) {