lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
Laurent Destailleur 2018-09-18 23:45:22 +02:00
parent 7dba51c9a8
commit 86bc1c813c
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/cron/card.php
View File

@ -680,13 +680,14 @@ else
print $langs->trans('CronDtNextLaunch'); print $langs->trans('CronDtNextLaunch');
print ' ('.$langs->trans('CronFrom').')'; print ' ('.$langs->trans('CronFrom').')';
print "</td><td>"; print "</td><td>";
//print '<strong>';
if (! $object->status) print $langs->trans("Disabled"); if (! $object->status) print $langs->trans("Disabled");
elseif (!empty($object->datenextrun)) { print img_picto('','object_calendarday').' '.dol_print_date($object->datenextrun,'dayhoursec');} elseif (!empty($object->datenextrun)) { print img_picto('','object_calendarday').' '.dol_print_date($object->datenextrun,'dayhoursec');}
else {print $langs->trans('CronNone');} else { print $langs->trans('CronNone'); }
//print '</strong>'; 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")); 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 "</td></tr>"; print "</td></tr>";
print '</table>'; print '</table>';

9
htdocs/cron/list.php
View File

@ -523,9 +523,12 @@ if ($num > 0)
if (!empty($obj->datenextrun)) { if (!empty($obj->datenextrun)) {
$datenextrun = $db->jdate($obj->datenextrun); $datenextrun = $db->jdate($obj->datenextrun);
if (empty($obj->status)) print '<span class="opacitymedium">'; if (empty($obj->status)) print '<span class="opacitymedium">';
print dol_print_date($datenextrun,'dayhour'); print dol_print_date($datenextrun,'dayhoursec');
if ($obj->maxrun && $obj->nbrun >= $obj->maxrun) print img_warning($langs->trans("MaxRunReached")); if ($obj->status == Cronjob::STATUS_ENABLED)
elseif ($datenextrun && $datenextrun < $now) print img_warning($langs->trans("Late")); {
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 '</span>'; if (empty($obj->status)) print '</span>';
} }
print '</td>'; print '</td>';