diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php index 13bc2624966..fc845f24585 100644 --- a/htdocs/cron/card.php +++ b/htdocs/cron/card.php @@ -284,7 +284,7 @@ if ($action == 'delete') } if ($action == 'execute'){ - print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("CronExecute"),$langs->trans("CronConfirmExecute"),"confirm_execute",'','',1); + print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id.(empty($conf->global->CRON_KEY)?'':'&securitykey='.$conf->global->CRON_KEY),$langs->trans("CronExecute"),$langs->trans("CronConfirmExecute"),"confirm_execute",'','',1); $action=''; } @@ -316,7 +316,7 @@ if (($action=="create") || ($action=="edit")) print ''; - print '"; print ""; @@ -324,7 +324,7 @@ if (($action=="create") || ($action=="edit")) print ""; print "\n"; - print ""; @@ -395,7 +395,7 @@ if (($action=="create") || ($action=="edit")) print ""; print "\n"; - print ""; print ""; print "\n"; - print '
'; + print '
'; print $langs->trans('CronLabel')."label."\" /> "; print "
"; + print '
'; print $langs->trans('CronType').""; print $formCron->select_typejob('jobtype',$object->jobtype); print "
"; + print '
'; print $langs->trans('CronEvery').""; print "
'; + print '
'; $maxrun=''; if (!empty($object->maxrun)) { $maxrun=$object->maxrun; @@ -552,7 +552,7 @@ else // box add_jobs_box print ''; - print '"; print "\n"; @@ -614,7 +614,7 @@ else print '
'; + print '
'; print $langs->trans('CronId')."".$form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'id', '', '', 0); print "
'; - print ""; print ""; - print '"; @@ -640,7 +640,8 @@ else print ""; - print ""; print "
"; + print '
'; print $langs->trans('CronEvery').""; if($object->unitfrequency == "60") print $langs->trans('CronEach')." ".($object->frequency)." ".$langs->trans('Minutes'); @@ -623,7 +623,7 @@ else if($object->unitfrequency == "604800") print $langs->trans('CronEach')." ".($object->frequency)." ".$langs->trans('Weeks'); print "
'; + print '
'; print $langs->trans('CronDtStart').""; if(!empty($object->datestart)) {print dol_print_date($object->datestart,'dayhoursec');} print "
"; print $langs->trans('CronMaxRun')."".$object->maxrun; + print ""; + print $object->maxrun>0?$object->maxrun:''; print "
"; @@ -666,7 +667,7 @@ else print ''; - print '"; @@ -707,7 +708,7 @@ else print ''.$langs->trans("CronExecute").''; } else { - print ''.$langs->trans("CronExecute").''; + print ''.$langs->trans("CronExecute").''; } if (! $user->rights->cron->create) { diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php index e3f6f548cea..1f06bb81612 100644 --- a/htdocs/cron/class/cronjob.class.php +++ b/htdocs/cron/class/cronjob.class.php @@ -191,7 +191,7 @@ class Cronjob extends CommonObject $sql.= " ".(! isset($this->params)?'NULL':"'".$this->db->escape($this->params)."'").","; $sql.= " ".(! isset($this->md5params)?'NULL':"'".$this->db->escape($this->md5params)."'").","; $sql.= " ".(! isset($this->module_name)?'NULL':"'".$this->db->escape($this->module_name)."'").","; - $sql.= " ".(! isset($this->priority)?'NULL':"'".$this->priority."'").","; + $sql.= " ".(! isset($this->priority)?'0':$this->priority).","; $sql.= " ".(! isset($this->datelastrun) || dol_strlen($this->datelastrun)==0?'NULL':$this->db->idate($this->datelastrun)).","; $sql.= " ".(! isset($this->datenextrun) || dol_strlen($this->datenextrun)==0?'NULL':$this->db->idate($this->datenextrun)).","; $sql.= " ".(! isset($this->dateend) || dol_strlen($this->dateend)==0?'NULL':$this->db->idate($this->dateend)).","; @@ -200,13 +200,13 @@ class Cronjob extends CommonObject $sql.= " ".(! isset($this->datelastresult) || dol_strlen($this->datelastresult)==0?'NULL':$this->db->idate($this->datelastresult)).","; $sql.= " ".(! isset($this->lastoutput)?'NULL':"'".$this->db->escape($this->lastoutput)."'").","; $sql.= " ".(! isset($this->unitfrequency)?'NULL':"'".$this->unitfrequency."'").","; - $sql.= " ".(! isset($this->frequency)?'NULL':"'".$this->frequency."'").","; - $sql.= " ".(! isset($this->status)?'0':"'".$this->status."'").","; + $sql.= " ".(! isset($this->frequency)?'0':$this->frequency).","; + $sql.= " ".(! isset($this->status)?'0':$this->status).","; $sql.= " ".$user->id.","; $sql.= " ".$user->id.","; $sql.= " ".(! isset($this->note)?'NULL':"'".$this->db->escape($this->note)."'").","; - $sql.= " ".(! isset($this->nbrun)?'0':"'".$this->db->escape($this->nbrun)."'").","; - $sql.= " ".(empty($this->maxrun)?'null':"'".$this->db->escape($this->maxrun)."'").","; + $sql.= " ".(! isset($this->nbrun)?'0':$this->db->escape($this->nbrun)).","; + $sql.= " ".(empty($this->maxrun)?'0':$this->db->escape($this->maxrun)).","; $sql.= " ".(! isset($this->libname)?'NULL':"'".$this->db->escape($this->libname)."'").","; $sql.= " ".(! isset($this->test)?'NULL':"'".$this->db->escape($this->test)."'").""; $sql.= ")"; @@ -518,7 +518,7 @@ class Cronjob extends CommonObject if (isset($this->status)) $this->status=trim($this->status); if (isset($this->note)) $this->note=trim($this->note); if (isset($this->nbrun)) $this->nbrun=trim($this->nbrun); - if (isset($this->maxrun)) $this->maxrun=trim($this->maxrun); + if (empty($this->maxrun)) $this->maxrun=0; if (isset($this->libname)) $this->libname = trim($this->libname); if (isset($this->test)) $this->test = trim($this->test); @@ -589,7 +589,7 @@ class Cronjob extends CommonObject $sql.= " fk_user_mod=".$user->id.","; $sql.= " note=".(isset($this->note)?"'".$this->db->escape($this->note)."'":"null").","; $sql.= " nbrun=".((isset($this->nbrun) && $this->nbrun >0)?$this->nbrun:"null").","; - $sql.= " maxrun=".((isset($this->maxrun) && $this->maxrun > 0)?$this->maxrun:"null").","; + $sql.= " maxrun=".((isset($this->maxrun) && $this->maxrun > 0)?$this->maxrun:"0").","; $sql.= " libname=".(isset($this->libname)?"'".$this->db->escape($this->libname)."'":"null").","; $sql.= " test=".(isset($this->test)?"'".$this->db->escape($this->test)."'":"null"); $sql.= " WHERE rowid=".$this->id; diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index b6ad4a8d2aa..618af2c1778 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -350,7 +350,7 @@ if ($num > 0) } if ($user->rights->cron->execute) { - if (!empty($line->status)) print "id."&action=execute".($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param."\" title=\"".dol_escape_htmltag($langs->trans('CronExecute'))."\">".img_picto($langs->trans('CronExecute'),"play").""; + if (!empty($line->status)) print "id."&action=execute".(empty($conf->global->CRON_KEY)?'':'&securitykey='.$conf->global->CRON_KEY).($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param."\" title=\"".dol_escape_htmltag($langs->trans('CronExecute'))."\">".img_picto($langs->trans('CronExecute'),"play").""; else print "trans('JobDisabled'))."\">".img_picto($langs->trans('JobDisabled'),"play").""; } else { print "trans('NotEnoughPermissions'))."\">".img_picto($langs->trans('NotEnoughPermissions'),"play")."";
'; + print '
'; print $langs->trans('CronDtLastLaunch').""; if(!empty($object->datelastrun)) {print dol_print_date($object->datelastrun,'dayhoursec');} else {print $langs->trans('CronNone');} print "