From 67ca6e2c58d146ce078293d7f67e496b4293ca36 Mon Sep 17 00:00:00 2001 From: Luca Tacconi Date: Wed, 6 Mar 2024 17:29:57 +0100 Subject: [PATCH] Fix HFT round per day calculation in case of , expression --- composer.json | 3 ++- routes/api/task.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index e46d954..6524f7b 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,8 @@ "twig/twig": "^3", "crunzphp/crunz": ">=3.6.0 ^3", - "lorisleiva/cron-translator": "^0" + "lorisleiva/cron-translator": "^0", + "dragonmantank/cron-expression": "^3.1" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3" diff --git a/routes/api/task.php b/routes/api/task.php index 2d09241..55458bb 100644 --- a/routes/api/task.php +++ b/routes/api/task.php @@ -335,7 +335,7 @@ static function (array $file) { }else if(strpos($aFREQ_M, "/") !== false){ $round_hour = round(60 / str_replace("*/", "", $aFREQ_M)); }else if(strpos($aFREQ_M, ",") !== false){ - $aINT = explode("-", $aFREQ_M); + $aINT = explode(",", $aFREQ_M); $round_hour = count($aINT); } @@ -350,7 +350,7 @@ static function (array $file) { }else if(strpos($aFREQ_H, "/") !== false){ $round_day = round(24 / str_replace("*/", "", $aFREQ_H)) * $round_hour; }else if(strpos($aFREQ_H, ",") !== false){ - $aINT = explode("-", $aFREQ_H); + $aINT = explode(",", $aFREQ_H); $round_day = count($aINT) * $round_hour; }