diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php index fc89f6eb3cf..a371069d7cf 100644 --- a/htdocs/cron/card.php +++ b/htdocs/cron/card.php @@ -109,9 +109,9 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex else { $now = dol_now(); // Date we start - + $result=$object->run_jobs($user->login); - + if ($result < 0) { setEventMessages($object->error, $object->errors, 'errors'); @@ -155,7 +155,7 @@ if ($action=='add') $object->unitfrequency=GETPOST('unitfrequency','int'); $object->frequency=GETPOST('nbfrequency','int'); $object->maxrun=GETPOST('maxrun','int'); - + // Add cron task $result = $object->create($user); @@ -191,7 +191,7 @@ if ($action=='update') $object->unitfrequency=GETPOST('unitfrequency','int'); $object->frequency=GETPOST('nbfrequency','int'); $object->maxrun=GETPOST('maxrun','int'); - + // Add cron task $result = $object->update($user); @@ -353,7 +353,7 @@ if (($action=="create") || ($action=="edit")) print ''; print $langs->trans('CronClassFile').""; - print "classesname."\" /> "; + print ' '; print ""; print ""; print $form->textwithpicto('',$langs->trans("CronClassFileHelp"),1,'help'); @@ -371,7 +371,7 @@ if (($action=="create") || ($action=="edit")) print ''; print $langs->trans('CronMethod').""; - print "methodename."\" /> "; + print ' '; print ""; print ""; print $form->textwithpicto('',$langs->trans("CronMethodHelp"),1,'help'); @@ -431,7 +431,7 @@ if (($action=="create") || ($action=="edit")) } $input .= ""; print $input; - + $input = " unitfrequency=="3600"){ $input .= ' checked />'; @@ -441,7 +441,7 @@ if (($action=="create") || ($action=="edit")) } $input .= ""; print $input; - + $input = " unitfrequency=="86400"){ $input .= ' checked />'; @@ -451,7 +451,7 @@ if (($action=="create") || ($action=="edit")) } $input .= ""; print $input; - + $input = " unitfrequency=="604800"){ $input .= ' checked />'; @@ -465,7 +465,7 @@ if (($action=="create") || ($action=="edit")) print ""; print ""; print "\n"; - + print ""; print $langs->trans('CronDtStart').""; if(!empty($object->datestart)) @@ -480,7 +480,7 @@ if (($action=="create") || ($action=="edit")) print ""; print ""; print "\n"; - + print ""; print $langs->trans('CronDtEnd').""; if(!empty($object->dateend)){ @@ -493,7 +493,7 @@ if (($action=="create") || ($action=="edit")) print ""; print ""; print "\n"; - + print ""; print $langs->trans('CronPriority').""; $priority=0; @@ -505,7 +505,7 @@ if (($action=="create") || ($action=="edit")) print ""; print ""; print "\n"; - + print ''; $maxrun=''; if (!empty($object->maxrun)) { @@ -517,7 +517,7 @@ if (($action=="create") || ($action=="edit")) print ""; print ""; print "\n"; - + print ''; print $langs->trans('CronDtNextLaunch'); print ' ('.$langs->trans('CronFrom').')'; @@ -529,14 +529,14 @@ if (($action=="create") || ($action=="edit")) else { $form->select_date(-1,'datenextrun',1,1,'',"cronform"); - } + } print ""; print ""; print ""; print ""; - + print ''; - + dol_fiche_end(); print '
'; @@ -554,24 +554,22 @@ else * view card */ $now = dol_now(); - + dol_fiche_head($head, 'card', $langs->trans("CronTask"), -1, 'cron'); $linkback = '' . $langs->trans("BackToList") . ''; - // TODO Use dol_banner - + $morehtmlref='
'; + $morehtmlref.='
'; + + dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref); + // box add_jobs_box print '
'; print '
'; print ''; print '"; - print "\n"; - - print '"; print ""; @@ -616,21 +614,16 @@ else print $langs->trans($object->note); print ""; - print '"; - print '
'; - print $langs->trans('CronId')."".$form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'id', '', '', 0); - print "
'; print $langs->trans('CronLabel')."".$langs->trans($object->label); print "
'; - print $langs->trans('Active').""; - print $object->getLibStatut(4); - print "
'; print '
'; - + print '
'; - + print '
'; print '
'; print ''; - + print '"; print ""; - + print '"; - + print ""; - + print ""; print ""; - + print ""; print ""; - + print ""; print ""; - + // Date next run (from) print '"; - + print '
'; print $langs->trans('CronEvery').""; @@ -639,33 +632,33 @@ else if($object->unitfrequency == "86400") print $langs->trans('CronEach')." ".($object->frequency)." ".$langs->trans('Days'); if($object->unitfrequency == "604800") print $langs->trans('CronEach')." ".($object->frequency)." ".$langs->trans('Weeks'); print "
'; print $langs->trans('CronDtStart').""; if(!empty($object->datestart)) {print dol_print_date($object->datestart,'dayhoursec');} print "
"; print $langs->trans('CronDtEnd').""; if(!empty($object->dateend)) {print dol_print_date($object->dateend,'dayhoursec');} print "
"; print $langs->trans('CronPriority')."".$object->priority; print "
"; print $langs->trans('CronMaxRun').""; print $object->maxrun>0?$object->maxrun:''; print "
"; print $langs->trans('CronNbRun')."".$object->nbrun; print "
'; print $langs->trans('CronDtNextLaunch'); @@ -673,18 +666,18 @@ else print ""; //print ''; 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');} //print ''; 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")); print "
'; print '
'; - + print '
'; - + print '
'; print '
'; print ''; @@ -711,7 +704,7 @@ else print '
'; print '
'; - + dol_fiche_end(); @@ -733,7 +726,7 @@ else else { print ''.$langs->trans("CronExecute").''; } - + if (! $user->rights->cron->create) { print ''.$langs->trans("CronStatusActiveBtn").'/'.$langs->trans("CronStatusInactiveBtn").''; } else { @@ -743,7 +736,7 @@ else print ''.$langs->trans("CronStatusInactiveBtn").''; } } - + if (! $user->rights->cron->delete) { print ''.$langs->trans("Delete").''; } else { diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php index 9d01ec888f0..f9b4ac67f03 100644 --- a/htdocs/cron/class/cronjob.class.php +++ b/htdocs/cron/class/cronjob.class.php @@ -30,36 +30,37 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"); */ class Cronjob extends CommonObject { - var $element='cronjob'; //!< Id that identify managed objects - var $table_element='cronjob'; //!< Name of table without prefix where object is stored + public $element='cronjob'; //!< Id that identify managed objects + public $table_element='cronjob'; //!< Name of table without prefix where object is stored + public $picto = 'cron'; - var $jobtype; - var $tms=''; - var $datec=''; - var $label; - var $command; - var $classesname; - var $objectname; - var $methodename; - var $params; - var $md5params; - var $module_name; - var $priority; - var $datelastrun=''; - var $datenextrun=''; - var $dateend=''; - var $datestart=''; - var $datelastresult=''; - var $lastresult; - var $lastoutput; - var $unitfrequency; - var $frequency; - var $status; - var $processing; - var $fk_user_author; - var $fk_user_mod; - var $nbrun; - var $libname; + public $jobtype; + public $tms=''; + public $datec=''; + public $label; + public $command; + public $classesname; + public $objectname; + public $methodename; + public $params; + public $md5params; + public $module_name; + public $priority; + public $datelastrun=''; + public $datenextrun=''; + public $dateend=''; + public $datestart=''; + public $datelastresult=''; + public $lastresult; + public $lastoutput; + public $unitfrequency; + public $frequency; + public $status; + public $processing; + public $fk_user_author; + public $fk_user_mod; + public $nbrun; + public $libname; /** @@ -1265,35 +1266,35 @@ class Cronjob extends CommonObject class Cronjobline { - var $id; - var $ref; + public $id; + public $ref; - var $tms=''; - var $datec=''; - var $label; - var $jobtype; - var $command; - var $classesname; - var $objectname; - var $methodename; - var $params; - var $md5params; - var $module_name; - var $priority; - var $datelastrun=''; - var $datenextrun=''; - var $dateend=''; - var $datestart=''; - var $lastresult=''; - var $lastoutput; - var $unitfrequency; - var $frequency; - var $status; - var $fk_user_author; - var $fk_user_mod; - var $note; - var $nbrun; - var $libname; + public $tms=''; + public $datec=''; + public $label; + public $jobtype; + public $command; + public $classesname; + public $objectname; + public $methodename; + public $params; + public $md5params; + public $module_name; + public $priority; + public $datelastrun=''; + public $datenextrun=''; + public $dateend=''; + public $datestart=''; + public $lastresult=''; + public $lastoutput; + public $unitfrequency; + public $frequency; + public $status; + public $fk_user_author; + public $fk_user_mod; + public $note; + public $nbrun; + public $libname; /** * Constructor diff --git a/htdocs/cron/info.php b/htdocs/cron/info.php index 18ab50adeaa..d3365abb90b 100644 --- a/htdocs/cron/info.php +++ b/htdocs/cron/info.php @@ -50,6 +50,17 @@ $head = cron_prepare_head($object); dol_fiche_head($head, 'info', $langs->trans("CronTask"), -1, 'cron'); +$linkback = '' . $langs->trans("BackToList") . ''; + +$morehtmlref='
'; +$morehtmlref.='
'; + +dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref); + +print '
'; + +print '
'; + print '
'; dol_print_object_info($object); print '
'; diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang index a1d3c6a9986..8eb03114c64 100644 --- a/htdocs/langs/en_US/cron.lang +++ b/htdocs/langs/en_US/cron.lang @@ -57,9 +57,9 @@ CronStatusActiveBtn=Enable CronStatusInactiveBtn=Disable CronTaskInactive=This job is disabled CronId=Id -CronClassFile=Classes (filename.class.php) +CronClassFile=Filename with class CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for module is product -CronClassFileHelp=The file name to load.
For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is product.class.php +CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory).
For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/product.class.php, the value for class file name is product/class/product.class.php CronObjectHelp=The object name to load.
For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is Product CronMethodHelp=The object method to launch.
For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is fecth CronArgsHelp=The method arguments.
For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be 0, ProductRef