From 86bc1c813c8222de848ff7a5cdf7c941c7aca66d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 18 Sep 2018 23:45:22 +0200 Subject: [PATCH] Fix warnings --- htdocs/cron/card.php | 11 ++++++----- htdocs/cron/list.php | 9 ++++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php index 7824feb5773b6..2d4b74a3b5aa4 100644 --- a/htdocs/cron/card.php +++ b/htdocs/cron/card.php @@ -680,13 +680,14 @@ function initfields() print $langs->trans('CronDtNextLaunch'); print ' ('.$langs->trans('CronFrom').')'; print ""; - //print ''; if (! $object->status) print $langs->trans("Disabled"); elseif (!empty($object->datenextrun)) { print img_picto('','object_calendarday').' '.dol_print_date($object->datenextrun,'dayhoursec');} - else {print $langs->trans('CronNone');} - //print ''; - if ($object->maxrun && $object->nbrun >= $object->maxrun) print img_warning($langs->trans("MaxRunReached")); - elseif ($object->datenextrun && $object->datenextrun < $now) print img_warning($langs->trans("Late")); + else { print $langs->trans('CronNone'); } + if ($object->status == Cronjob::STATUS_ENABLED) + { + if ($object->maxrun && $object->nbrun >= $object->maxrun) print img_warning($langs->trans("MaxRunReached")); + elseif ($object->datenextrun && $object->datenextrun < $now) print img_warning($langs->trans("Late")); + } print ""; print ''; diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index d556804e3178e..1f8101322234b 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -523,9 +523,12 @@ if (!empty($obj->datenextrun)) { $datenextrun = $db->jdate($obj->datenextrun); if (empty($obj->status)) print ''; - print dol_print_date($datenextrun,'dayhour'); - if ($obj->maxrun && $obj->nbrun >= $obj->maxrun) print img_warning($langs->trans("MaxRunReached")); - elseif ($datenextrun && $datenextrun < $now) print img_warning($langs->trans("Late")); + print dol_print_date($datenextrun,'dayhoursec'); + if ($obj->status == Cronjob::STATUS_ENABLED) + { + if ($obj->maxrun && $obj->nbrun >= $obj->maxrun) print img_warning($langs->trans("MaxRunReached")); + elseif ($datenextrun && $datenextrun < $now) print img_warning($langs->trans("Late")); + } if (empty($obj->status)) print ''; } print '';