From 79b248fc67d7c33de207681da928b2586bdaf2f9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Sep 2018 23:25:38 +0200
Subject: [PATCH] FIX warning picto when next run date passed

---
 htdocs/cron/card.php | 4 ++--
 htdocs/cron/list.php | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 855620756a7..35935be009d 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -684,8 +684,8 @@ else
 	elseif (!empty($object->datenextrun)) { print img_picto('','object_calendarday').' '.dol_print_date($object->datenextrun,'dayhoursec');}
 	else {print $langs->trans('CronNone');}
 	//print '</strong>';
-	if ($object->maxnbrun && $object->nbrun >= $object->maxrun) print img_warning($langs->trans("Finished"));
-	if ($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 '</table>';
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index eb326673d25..a8f4ade8b4d 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -242,6 +242,7 @@ $sql.= " t.status,";
 $sql.= " t.fk_user_author,";
 $sql.= " t.fk_user_mod,";
 $sql.= " t.note,";
+$sql.= " t.maxrun,";
 $sql.= " t.nbrun,";
 $sql.= " t.libname,";
 $sql.= " t.test";
@@ -252,12 +253,12 @@ if ($search_status == 2) $sql.= " AND t.status = 2";
 //Manage filter
 if (is_array($filter) && count($filter)>0) {
 	foreach($filter as $key => $value) {
-		$sql.= ' AND '.$key.' LIKE \'%'.$value.'%\'';
+		$sql.= ' AND '.$key.' LIKE \'%'.$db->escape($value).'%\'';
 	}
 }
 $sqlwhere = array();
 if (!empty($module_name)) {
-	$sqlwhere[]='(t.module_name='.$module_name.')';
+	$sqlwhere[]='(t.module_name='.$db->escape($module_name).')';
 }
 if (count($sqlwhere)>0) {
 	$sql.= " WHERE ".implode(' AND ',$sqlwhere);
@@ -523,6 +524,8 @@ if ($num > 0)
 			if (empty($obj->status)) print '<span class="opacitymedium">';
 			print dol_print_date($db->jdate($obj->datenextrun),'dayhour');
 			if (empty($obj->status)) print '</span>';
+			if ($obj->maxrun && $obj->nbrun >= $obj->maxrun) print img_warning($langs->trans("MaxRunReached"));
+			elseif ($obj->datenextrun && $obj->datenextrun < $now) print img_warning($langs->trans("Late"));
 		}
 		print '</td>';