diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index a73ba1bdd55..5c045b56243 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -29,9 +29,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
require_once DOL_DOCUMENT_ROOT."/cron/class/cronjob.class.php";
require_once DOL_DOCUMENT_ROOT.'/core/lib/cron.lib.php';
-$langs->load("admin");
-$langs->load("cron");
-$langs->load("bills");
+$langs->loadLangs(array("admin","cron","bills"));
if (!$user->rights->cron->read) accessforbidden();
@@ -51,8 +49,8 @@ $pagenext = $page + 1;
if (! $sortfield) $sortfield='t.status,t.priority';
if (! $sortorder) $sortorder='DESC,ASC';
-$status=GETPOST('status','int');
-if ($status == '') $status=-2;
+$search_status=GETPOST('search_status','int')?GETPOST('search_status','int'):GETPOST('status','int');
+if ($search_status == '') $search_status=-2;
//Search criteria
$search_label=GETPOST("search_label",'alpha');
@@ -75,80 +73,93 @@ $object = new Cronjob($db);
* Actions
*/
-// Do we click on purge search criteria ?
-if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
-{
- $search_label='';
- $status=-1;
-}
+if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
-$filter=array();
-if (!empty($search_label))
-{
- $filter['t.label']=$search_label;
-}
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-// Delete jobs
-if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->delete)
+if (empty($reshook))
{
- //Delete cron task
- $object = new Cronjob($db);
- $object->id=$id;
- $result = $object->delete($user);
+ // Selection of new fields
+ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
- if ($result < 0) {
- setEventMessages($object->error, $object->errors, 'errors');
+ // Purge search criteria
+ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+ {
+ $search_label='';
+ $search_status=-1;
}
-}
-// Execute jobs
-if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->execute)
-{
- if (! empty($conf->global->CRON_KEY) && $conf->global->CRON_KEY != $securitykey)
- {
- setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
- $action='';
- }
- else
- {
- $object = new Cronjob($db);
- $job = $object->fetch($id);
+ $filter=array();
+ if (!empty($search_label))
+ {
+ $filter['t.label']=$search_label;
+ }
- $now = dol_now(); // Date we start
+ // Delete jobs
+ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->delete)
+ {
+ //Delete cron task
+ $object = new Cronjob($db);
+ $object->id=$id;
+ $result = $object->delete($user);
- $resrunjob = $object->run_jobs($user->login); // Return -1 if KO, 1 if OK
- if ($resrunjob < 0) {
- setEventMessages($object->error, $object->errors, 'errors');
- }
+ if ($result < 0) {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ }
- // Programm next run
- $res = $object->reprogram_jobs($user->login, $now);
- if ($res > 0)
- {
- if ($resrunjob >= 0) // We show the result of reprogram only if no error message already reported
- {
- if ($object->lastresult >= 0) setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
- else setEventMessages($langs->trans("JobFinished"), null, 'errors');
- }
- $action='';
- }
- else
- {
- setEventMessages($object->error, $object->errors, 'errors');
- $action='';
- }
+ // Execute jobs
+ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->execute)
+ {
+ if (! empty($conf->global->CRON_KEY) && $conf->global->CRON_KEY != $securitykey)
+ {
+ setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
+ $action='';
+ }
+ else
+ {
+ $object = new Cronjob($db);
+ $job = $object->fetch($id);
- $param='&status='.$status;
- if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
- if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
- if ($search_label) $param.='&search_label='.$search_label;
- if ($optioncss != '') $param.='&optioncss='.$optioncss;
- // Add $param from extra fields
- include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+ $now = dol_now(); // Date we start
- header("Location: ".DOL_URL_ROOT.'/cron/list.php?'.$param.($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'')); // Make a redirect to avoid to run twice the job when using back
- exit;
- }
+ $resrunjob = $object->run_jobs($user->login); // Return -1 if KO, 1 if OK
+ if ($resrunjob < 0) {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+
+ // Programm next run
+ $res = $object->reprogram_jobs($user->login, $now);
+ if ($res > 0)
+ {
+ if ($resrunjob >= 0) // We show the result of reprogram only if no error message already reported
+ {
+ if ($object->lastresult >= 0) setEventMessages($langs->trans("JobFinished"), null, 'mesgs');
+ else setEventMessages($langs->trans("JobFinished"), null, 'errors');
+ }
+ $action='';
+ }
+ else
+ {
+ setEventMessages($object->error, $object->errors, 'errors');
+ $action='';
+ }
+
+ $param='&search_status='.urlencode($search_status);
+ if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+ if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+ if ($search_label) $param.='&search_label='.urlencode($search_label);
+ if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss);
+ // Add $param from extra fields
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+ header("Location: ".DOL_URL_ROOT.'/cron/list.php?'.$param.($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'')); // Make a redirect to avoid to run twice the job when using back
+ exit;
+ }
+ }
}
@@ -196,8 +207,8 @@ $sql.= " t.libname,";
$sql.= " t.test";
$sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t";
$sql.= " WHERE 1 = 1";
-if ($status >= 0 && $status < 2) $sql.= " AND t.status = ".(empty($status)?'0':'1');
-if ($status == 2) $sql.= " AND t.status = 2";
+if ($search_status >= 0 && $search_status < 2) $sql.= " AND t.status = ".(empty($search_status)?'0':'1');
+if ($search_status == 2) $sql.= " AND t.status = 2";
//Manage filter
if (is_array($filter) && count($filter)>0) {
foreach($filter as $key => $value) {
@@ -235,7 +246,7 @@ if (! $result) dol_print_error($db);
$num = $db->num_rows($result);
-$param='&status='.$status;
+$param='&search_status='.$search_status;
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
if ($search_label) $param.='&search_label='.$search_label;
@@ -256,15 +267,28 @@ if ($action == 'execute')
print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.'&securitykey='.$securitykey.$param, $langs->trans("CronExecute"),$langs->trans("CronConfirmExecute"),"confirm_execute",'','',1);
}
+// List of mass actions available
+$arrayofmassactions = array(
+//'presend'=>$langs->trans("SendByMail"),
+//'builddoc'=>$langs->trans("PDFMerge"),
+ 'enable'=>$langs->trans("Enable"),
+ 'disable'=>$langs->trans("Disable"),
+);
+if ($user->rights->mymodule->delete) $arrayofmassactions['predelete']=$langs->trans("Delete");
+if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
+$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
-print '