diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 0ae8f71b3a5..09e1f2fb1a8 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -1,6 +1,7 @@ + * Copyright (C) 2013 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,9 +34,11 @@ $langs->load("cron"); if (!$user->rights->cron->read) accessforbidden(); + /* * Actions */ + $action=GETPOST('action','alpha'); $confirm=GETPOST('confirm','alpha'); $id=GETPOST('id','int'); @@ -51,7 +54,6 @@ $search_label=GETPOST("search_label",'alpha'); if (empty($sortorder)) $sortorder="DESC"; if (empty($sortfield)) $sortfield="t.datenextrun"; if (empty($arch)) $arch = 0; - if ($page == -1) { $page = 0 ; } @@ -62,13 +64,15 @@ $pageprev = $page - 1; $pagenext = $page + 1; // Do we click on purge search criteria ? -if (GETPOST("button_removefilter_x")) +if (GETPOST("button_removefilter")) { $search_label=''; + $status=-1; } $filter=array(); -if (!empty($search_label)) { +if (!empty($search_label)) +{ $filter['t.label']=$search_label; } @@ -108,8 +112,6 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex $form = new Form($db); -//if (! empty($status)) $pagetitle=$langs->trans("CronListActive"); -//else $pagetitle=$langs->trans("CronListInactive"); $pagetitle=$langs->trans("CronList"); llxHeader('',$pagetitle); @@ -118,81 +120,79 @@ print_fiche_titre($pagetitle,'','setup'); print $langs->trans('CronInfo'); - if ($action == 'delete') { $ret=$form->form_confirm($_SERVER['PHP_SELF']."?id=".$id.'&status='.$status,$langs->trans("CronDelete"),$langs->trans("CronConfirmDelete"),"confirm_delete",'','',1); if ($ret == 'html') print '
'; } -if ($action == 'execute'){ +if ($action == 'execute') +{ $ret=$form->form_confirm($_SERVER['PHP_SELF']."?id=".$id.'&status='.$status,$langs->trans("CronExecute"),$langs->trans("CronConfirmExecute"),"confirm_execute",'','',1); if ($ret == 'html') print '
'; } - // liste des jobs creer $object = new Cronjob($db); $result=$object->fetch_all($sortorder, $sortfield, $limit, $offset, $status, $filter); -if ($result < 0) { +if ($result < 0) +{ setEventMessage($object->error,'errors'); } print "

"; -if (count($object->lines)>0) -{ - print ''; - print ''; - $arg_url='&page='.$page.'&status='.$status.'&search_label='.$search_label; - print_liste_field_titre($langs->trans("CronLabel"),$_SERVEUR['PHP_SELF'],"t.label","",$arg_url,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("CronTask"),'','',"",$arg_url,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("CronDtStart"),$_SERVEUR['PHP_SELF'],"t.datestart","",$arg_url,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("CronDtEnd"),$_SERVEUR['PHP_SELF'],"t.dateend","",$arg_url,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("CronDtLastLaunch"),$_SERVEUR['PHP_SELF'],"t.datelastrun","",$arg_url,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("CronDtNextLaunch"),$_SERVEUR['PHP_SELF'],"t.datenextrun","",$arg_url,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("CronFrequency"),'',"","",$arg_url,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("CronNbRun"),$_SERVEUR['PHP_SELF'],"t.nbrun","",$arg_url,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("CronLastResult"),$_SERVEUR['PHP_SELF'],"t.lastresult","",$arg_url,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("CronLastOutput"),$_SERVEUR['PHP_SELF'],"t.lastoutput","",$arg_url,'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Enabled"),$_SERVEUR['PHP_SELF'],"t.status","",$arg_url,'align="center"',$sortfield,$sortorder); - print ''; - print ''; - print ''."\n"; - print ''; - print ''; +print ''."\n"; +print ''; + +print '
'; +print ''; +$arg_url='&page='.$page.'&status='.$status.'&search_label='.$search_label; +print_liste_field_titre($langs->trans("CronLabel"),$_SERVEUR['PHP_SELF'],"t.label","",$arg_url,'',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("CronTask"),'','',"",$arg_url,'',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("CronDtStart"),$_SERVEUR['PHP_SELF'],"t.datestart","",$arg_url,'',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("CronDtEnd"),$_SERVEUR['PHP_SELF'],"t.dateend","",$arg_url,'',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("CronDtLastLaunch"),$_SERVEUR['PHP_SELF'],"t.datelastrun","",$arg_url,'',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("CronDtNextLaunch"),$_SERVEUR['PHP_SELF'],"t.datenextrun","",$arg_url,'',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("CronFrequency"),'',"","",$arg_url,'',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("CronNbRun"),$_SERVEUR['PHP_SELF'],"t.nbrun","",$arg_url,'',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("CronLastResult"),$_SERVEUR['PHP_SELF'],"t.lastresult","",$arg_url,'',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("CronLastOutput"),$_SERVEUR['PHP_SELF'],"t.lastoutput","",$arg_url,'',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("Enabled"),$_SERVEUR['PHP_SELF'],"t.status","",$arg_url,'align="center"',$sortfield,$sortorder); +print ''; +print ''; + +print ''; + +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; + +print ''; - - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - - print ''; - print ''; - - - - // Boucler sur chaque job +if (count($object->lines) > 0) +{ + // Loop on each active job $style='impair'; foreach($object->lines as $line) { @@ -283,10 +283,17 @@ if (count($object->lines)>0) print ''; } - print '
'; +print ''; +print '         '; +print $form->selectarray('status', array('0'=>$langs->trans("No"),'1'=>$langs->trans("Yes")), $status, 1); +print ''; +print ' '; +print ''; +print '  '; +print ''; +print '
'; - print ''; - print '         '; - print $form->selectarray('status', array('0'=>$langs->trans("No"),'1'=>$langs->trans("Yes")), GETPOST('status'), 1); - print ''; - print ' '; - print ''; - print '  '; - print ''; - print '
'; -} else { - print $langs->trans('CronNoJobs'); } +else +{ + print ''.$langs->trans('CronNoJobs').''; +} + +print ''; + +print ''; + + print "\n
\n";