tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 17:25:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9650-GISS-No-funciona-la-opcion-Dia-de-la-Semana-en-cron-de-modulos' into 'develop'

Browse Source 
fixed cron execution of modules with week day setted

See merge request artica/pandorafms!5210
This commit is contained in:
Daniel Rodriguez 2022-11-18 08:35:59 +00:00
commit 18b8d3e0e1
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_console/include/functions_cron.php
View File

@ -89,23 +89,34 @@ function cron_next_execution($cron, $module_interval, $module_id)
'id_agente_modulo', 'id_agente_modulo',
$module_id $module_id
); );
$cron_elems = explode(' ', $cron);
if (isset($cron_elems[4]) === true) {
$cron_elems[4] = '*';
}
$cron = implode(' ', $cron_elems);
$cur_time = ($last_execution !== false) ? $last_execution : time(); $cur_time = ($last_execution !== false) ? $last_execution : time();
$nex_time = cron_next_execution_date($cron, $cur_time, $module_interval); $nex_time = cron_next_execution_date($cron, $cur_time, $module_interval);
$nex_wday = (int) date('w', $nex_time); $nex_wday = (int) date('w', $nex_time);
// Check the wday values to avoid infinite loop. // Check the wday values to avoid infinite loop.
$wday_int = cron_get_interval($wday); $wday_int = cron_get_interval($wday);
if ($wday_int['down'] !== '*' && ($wday_int['down'] > 6 || ($wday_int['up'] !== false && $wday_int['up'] > 6))) { if ($wday_int['down'] !== '*' && ($wday_int['down'] > 6 || ($wday_int['up'] !== false && $wday_int['up'] > 6))) {
$wday = '*'; $wday = '*';
} }
// Check day of the way. // Check week day.
while (!cron_check_interval($nex_wday, $wday)) { while (!cron_check_interval($nex_wday, $wday)) {
// If it does not acomplish the day of the week, go to the next day. // If it does not acomplish the day of the week, go to the next day.
$nex_time += SECONDS_1DAY; $nex_time += SECONDS_1DAY;
$nex_time = cron_next_execution_date($cron, $nex_time, 0);
$nex_wday = (int) date('w', $nex_time); $nex_wday = (int) date('w', $nex_time);
} }
$nex_time = cron_next_execution_date($cron, $nex_time, 0);
return ($nex_time - $cur_time); return ($nex_time - $cur_time);
} }