diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index 00e2a419e98..fbc14945f02 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -84,6 +84,20 @@ class modCron extends DolibarrModules
$this->rights = array();
$this->rights_class = 'cron';
$r=0;
+
+ // Main menu entries
+ $r=0;
+ $this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+ 'type'=>'left', // This is a Left menu entry
+ 'titre'=>'CronJobs',
+ 'url'=>'/cron/index.php',
+ 'langs'=>'cron@cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+ 'position'=>100,
+ 'enabled'=>'$leftmenu==\'modulesadmintools\'', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+ 'perms'=>'$user->admin', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+ 'target'=>'',
+ 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+ $r++;
}
diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php
index 887f914dbe9..fd77bcc6851 100644
--- a/htdocs/cron/admin/cron.php
+++ b/htdocs/cron/admin/cron.php
@@ -102,8 +102,11 @@ print '
';
// Cron launch
print ''.$langs->trans("URLToLaunchCronJobs").':
';
-$url=DOL_MAIN_URL_ROOT.'/cron/cron_run_jobs.php'.(empty($conf->global->CRON_KEY)?'':'?securitykey='.$conf->global->CRON_KEY);
+$url=DOL_MAIN_URL_ROOT.'/public/cron/cron_run_jobs.php'.(empty($conf->global->CRON_KEY)?'':'?securitykey='.$conf->global->CRON_KEY);
print img_picto('','object_globe.png').' '.$url."
\n";
+print ' '.$langs->trans("OrToLaunchASpecificJob").'
';
+$url=DOL_MAIN_URL_ROOT.'/public/cron/cron_run_jobs.php?'.(empty($conf->global->CRON_KEY)?'':'securitykey='.$conf->global->CRON_KEY.'&').'id=cronjobid';
+print img_picto('','object_globe.png').' '.$url."
\n";
print '
';
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
new file mode 100644
index 00000000000..b2b5fcddd1a
--- /dev/null
+++ b/htdocs/cron/class/cronjob.class.php
@@ -0,0 +1,446 @@
+
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+/**
+ * \file dev/skeletons/cronjob.class.php
+ * \ingroup cron
+ * \brief CRUD class file (Create/Read/Update/Delete) for cronjob table
+ * Initialy built by build_class_from_table on 2013-03-17 18:50
+ */
+
+// Put here all includes required by your class file
+require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
+//require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
+//require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
+
+
+/**
+ * Put here description of your class
+ */
+class Cronjob extends CommonObject
+{
+ var $db; //!< To store db handler
+ var $error; //!< To return error code (or message)
+ var $errors=array(); //!< To return several error codes (or messages)
+ var $element='cronjob'; //!< Id that identify managed objects
+ var $table_element='cronjob'; //!< Name of table without prefix where object is stored
+
+ var $id;
+
+ var $tms='';
+ var $datec='';
+ var $command;
+ var $params;
+ var $datelastrun='';
+ var $lastresult='';
+ var $lastoutput;
+ var $fk_user;
+ var $note;
+
+
+
+
+ /**
+ * Constructor
+ *
+ * @param DoliDb $db Database handler
+ */
+ function __construct($db)
+ {
+ $this->db = $db;
+ return 1;
+ }
+
+
+ /**
+ * Create object into database
+ *
+ * @param User $user User that creates
+ * @param int $notrigger 0=launch triggers after, 1=disable triggers
+ * @return int <0 if KO, Id of created object if OK
+ */
+ function create($user, $notrigger=0)
+ {
+ global $conf, $langs;
+ $error=0;
+
+ // Clean parameters
+
+ if (isset($this->command)) $this->command=trim($this->command);
+ if (isset($this->params)) $this->params=trim($this->params);
+ if (isset($this->lastoutput)) $this->lastoutput=trim($this->lastoutput);
+ if (isset($this->fk_user)) $this->fk_user=trim($this->fk_user);
+ if (isset($this->note)) $this->note=trim($this->note);
+
+
+
+ // Check parameters
+ // Put here code to add control on parameters values
+
+ // Insert request
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."cronjob(";
+
+ $sql.= "datec,";
+ $sql.= "command,";
+ $sql.= "params,";
+ $sql.= "datelastrun,";
+ $sql.= "lastresult,";
+ $sql.= "lastoutput,";
+ $sql.= "fk_user,";
+ $sql.= "note";
+
+
+ $sql.= ") VALUES (";
+
+ $sql.= " ".(! isset($this->datec) || dol_strlen($this->datec)==0?'NULL':$this->db->idate($this->datec)).",";
+ $sql.= " ".(! isset($this->command)?'NULL':"'".$this->db->escape($this->command)."'").",";
+ $sql.= " ".(! isset($this->params)?'NULL':"'".$this->db->escape($this->params)."'").",";
+ $sql.= " ".(! isset($this->datelastrun) || dol_strlen($this->datelastrun)==0?'NULL':$this->db->idate($this->datelastrun)).",";
+ $sql.= " ".(! isset($this->lastresult) || dol_strlen($this->lastresult)==0?'NULL':$this->db->idate($this->lastresult)).",";
+ $sql.= " ".(! isset($this->lastoutput)?'NULL':"'".$this->db->escape($this->lastoutput)."'").",";
+ $sql.= " ".(! isset($this->fk_user)?'NULL':"'".$this->fk_user."'").",";
+ $sql.= " ".(! isset($this->note)?'NULL':"'".$this->db->escape($this->note)."'")."";
+
+
+ $sql.= ")";
+
+ $this->db->begin();
+
+ dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+ if (! $error)
+ {
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."cronjob");
+
+ if (! $notrigger)
+ {
+ // Uncomment this and change MYOBJECT to your own tag if you
+ // want this action calls a trigger.
+
+ //// Call triggers
+ //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+ //$interface=new Interfaces($this->db);
+ //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+ //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+ //// End call triggers
+ }
+ }
+
+ // Commit or rollback
+ if ($error)
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ else
+ {
+ $this->db->commit();
+ return $this->id;
+ }
+ }
+
+
+ /**
+ * Load object in memory from the database
+ *
+ * @param int $id Id object
+ * @return int <0 if KO, >0 if OK
+ */
+ function fetch($id)
+ {
+ global $langs;
+ $sql = "SELECT";
+ $sql.= " t.rowid,";
+
+ $sql.= " t.tms,";
+ $sql.= " t.datec,";
+ $sql.= " t.command,";
+ $sql.= " t.params,";
+ $sql.= " t.datelastrun,";
+ $sql.= " t.lastresult,";
+ $sql.= " t.lastoutput,";
+ $sql.= " t.fk_user,";
+ $sql.= " t.note";
+
+
+ $sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t";
+ $sql.= " WHERE t.rowid = ".$id;
+
+ dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+ $resql=$this->db->query($sql);
+ if ($resql)
+ {
+ if ($this->db->num_rows($resql))
+ {
+ $obj = $this->db->fetch_object($resql);
+
+ $this->id = $obj->rowid;
+
+ $this->tms = $this->db->jdate($obj->tms);
+ $this->datec = $this->db->jdate($obj->datec);
+ $this->command = $obj->command;
+ $this->params = $obj->params;
+ $this->datelastrun = $this->db->jdate($obj->datelastrun);
+ $this->lastresult = $this->db->jdate($obj->lastresult);
+ $this->lastoutput = $obj->lastoutput;
+ $this->fk_user = $obj->fk_user;
+ $this->note = $obj->note;
+
+
+ }
+ $this->db->free($resql);
+
+ return 1;
+ }
+ else
+ {
+ $this->error="Error ".$this->db->lasterror();
+ dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
+ return -1;
+ }
+ }
+
+
+ /**
+ * Update object into database
+ *
+ * @param User $user User that modifies
+ * @param int $notrigger 0=launch triggers after, 1=disable triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ function update($user=0, $notrigger=0)
+ {
+ global $conf, $langs;
+ $error=0;
+
+ // Clean parameters
+
+ if (isset($this->command)) $this->command=trim($this->command);
+ if (isset($this->params)) $this->params=trim($this->params);
+ if (isset($this->lastoutput)) $this->lastoutput=trim($this->lastoutput);
+ if (isset($this->fk_user)) $this->fk_user=trim($this->fk_user);
+ if (isset($this->note)) $this->note=trim($this->note);
+
+
+
+ // Check parameters
+ // Put here code to add a control on parameters values
+
+ // Update request
+ $sql = "UPDATE ".MAIN_DB_PREFIX."cronjob SET";
+
+ $sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+ $sql.= " datec=".(dol_strlen($this->datec)!=0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
+ $sql.= " command=".(isset($this->command)?"'".$this->db->escape($this->command)."'":"null").",";
+ $sql.= " params=".(isset($this->params)?"'".$this->db->escape($this->params)."'":"null").",";
+ $sql.= " datelastrun=".(dol_strlen($this->datelastrun)!=0 ? "'".$this->db->idate($this->datelastrun)."'" : 'null').",";
+ $sql.= " lastresult=".(dol_strlen($this->lastresult)!=0 ? "'".$this->db->idate($this->lastresult)."'" : 'null').",";
+ $sql.= " lastoutput=".(isset($this->lastoutput)?"'".$this->db->escape($this->lastoutput)."'":"null").",";
+ $sql.= " fk_user=".(isset($this->fk_user)?$this->fk_user:"null").",";
+ $sql.= " note=".(isset($this->note)?"'".$this->db->escape($this->note)."'":"null")."";
+
+
+ $sql.= " WHERE rowid=".$this->id;
+
+ $this->db->begin();
+
+ dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+ $resql = $this->db->query($sql);
+ if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+ if (! $error)
+ {
+ if (! $notrigger)
+ {
+ // Uncomment this and change MYOBJECT to your own tag if you
+ // want this action calls a trigger.
+
+ //// Call triggers
+ //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+ //$interface=new Interfaces($this->db);
+ //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+ //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+ //// End call triggers
+ }
+ }
+
+ // Commit or rollback
+ if ($error)
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ else
+ {
+ $this->db->commit();
+ return 1;
+ }
+ }
+
+
+ /**
+ * Delete object in database
+ *
+ * @param User $user User that deletes
+ * @param int $notrigger 0=launch triggers after, 1=disable triggers
+ * @return int <0 if KO, >0 if OK
+ */
+ function delete($user, $notrigger=0)
+ {
+ global $conf, $langs;
+ $error=0;
+
+ $this->db->begin();
+
+ if (! $error)
+ {
+ if (! $notrigger)
+ {
+ // Uncomment this and change MYOBJECT to your own tag if you
+ // want this action calls a trigger.
+
+ //// Call triggers
+ //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+ //$interface=new Interfaces($this->db);
+ //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+ //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+ //// End call triggers
+ }
+ }
+
+ if (! $error)
+ {
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."cronjob";
+ $sql.= " WHERE rowid=".$this->id;
+
+ dol_syslog(get_class($this)."::delete sql=".$sql);
+ $resql = $this->db->query($sql);
+ if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+ }
+
+ // Commit or rollback
+ if ($error)
+ {
+ foreach($this->errors as $errmsg)
+ {
+ dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+ $this->error.=($this->error?', '.$errmsg:$errmsg);
+ }
+ $this->db->rollback();
+ return -1*$error;
+ }
+ else
+ {
+ $this->db->commit();
+ return 1;
+ }
+ }
+
+
+
+ /**
+ * Load an object from its id and create a new one in database
+ *
+ * @param int $fromid Id of object to clone
+ * @return int New id of clone
+ */
+ function createFromClone($fromid)
+ {
+ global $user,$langs;
+
+ $error=0;
+
+ $object=new Cronjobs($this->db);
+
+ $this->db->begin();
+
+ // Load source object
+ $object->fetch($fromid);
+ $object->id=0;
+ $object->statut=0;
+
+ // Clear fields
+ // ...
+
+ // Create clone
+ $result=$object->create($user);
+
+ // Other options
+ if ($result < 0)
+ {
+ $this->error=$object->error;
+ $error++;
+ }
+
+ if (! $error)
+ {
+
+
+ }
+
+ // End
+ if (! $error)
+ {
+ $this->db->commit();
+ return $object->id;
+ }
+ else
+ {
+ $this->db->rollback();
+ return -1;
+ }
+ }
+
+
+ /**
+ * Initialise object with example values
+ * Id must be 0 if object instance is a specimen
+ *
+ * @return void
+ */
+ function initAsSpecimen()
+ {
+ $this->id=0;
+
+ $this->tms='';
+ $this->datec='';
+ $this->command='';
+ $this->params='';
+ $this->datelastrun='';
+ $this->lastresult='';
+ $this->lastoutput='';
+ $this->fk_user='';
+ $this->note='';
+
+
+ }
+
+}
+?>
diff --git a/htdocs/cron/index.php b/htdocs/cron/index.php
index 7db0dd9ebf9..3d7ef46ad77 100644
--- a/htdocs/cron/index.php
+++ b/htdocs/cron/index.php
@@ -1 +1,219 @@
-Url not available
\ No newline at end of file
+
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+/**
+ * \file dev/Cronjobss/Cronjobs_page.php
+ * \ingroup mymodule othermodule1 othermodule2
+ * \brief This file is an example of a php page
+ * Initialy built by build_class_from_table on 2013-03-17 18:50
+ */
+
+//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');
+//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');
+//if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
+//if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1');
+//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
+//if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); // If there is no menu to show
+//if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+//if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // If this page is public (can be called outside logged session)
+
+// Change this following line to use the correct relative path (../, ../../, etc)
+$res=0;
+if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';
+if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';
+if (! $res && file_exists("../../../main.inc.php")) $res=@include '../../../main.inc.php';
+if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php'; // Used on dev env only
+if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php'; // Used on dev env only
+if (! $res && file_exists("../../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../../dolibarr/htdocs/main.inc.php'; // Used on dev env only
+if (! $res) die("Include of main fails");
+// Change this following line to use the correct relative path from htdocs
+dol_include_once('/module/class/cronjob.class.php');
+
+// Load traductions files requiredby by page
+$langs->load("companies");
+$langs->load("other");
+$langs->load("cron");
+
+// Get parameters
+$id = GETPOST('id','int');
+$action = GETPOST('action','alpha');
+$myparam = GETPOST('myparam','alpha');
+$action='list';
+
+// Protection if external user
+if ($user->societe_id > 0) accessforbidden();
+if (! $user->admin) accessforbidden();
+
+
+/*******************************************************************
+* ACTIONS
+*
+* Put here all code to do according to value of "action" parameter
+********************************************************************/
+
+if ($action == 'add')
+{
+ $object=new Cronjobs($db);
+ $object->prop1=$_POST["field1"];
+ $object->prop2=$_POST["field2"];
+ $result=$object->create($user);
+ if ($result > 0)
+ {
+ // Creation OK
+ }
+ {
+ // Creation KO
+ $mesg=$object->error;
+ }
+}
+
+
+
+
+
+/***************************************************
+* VIEW
+*
+* Put here all code to build page
+****************************************************/
+
+llxHeader('','MyPageName','');
+
+$form=new Form($db);
+
+
+//print '
';
+//print '| ';
+print ' | ';
+print '';
+
+
+
+// Example 1 : Adding jquery code
+print '';
+
+
+// Example 2 : Adding links to objects
+// The class must extends CommonObject class to have this method available
+//$somethingshown=$object->showLinkedObjectBlock();
+
+
+// Example 3 : List of data
+if ($action == 'list')
+{
+ $sql = "SELECT";
+ $sql.= " t.rowid,";
+
+ $sql.= " t.tms,";
+ $sql.= " t.datec,";
+ $sql.= " t.command,";
+ $sql.= " t.params,";
+ $sql.= " t.datelastrun,";
+ $sql.= " t.lastresult,";
+ $sql.= " t.lastoutput,";
+ $sql.= " t.fk_user,";
+ $sql.= " t.note";
+
+
+ $sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t";
+ //$sql.= " WHERE field3 = 'xxx'";
+ //$sql.= " ORDER BY field1 ASC";
+
+
+ print_fiche_titre($langs->trans("ListOfCronJobs"),'','').' ';
+
+
+ print ' '."\n";
+ print '';
+ print_liste_field_titre($langs->trans('Id'),$_SERVER['PHP_SELF'],'t.rowid','',$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans('Command'),$_SERVER['PHP_SELF'],'t.command','',$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans('DateCreation'),$_SERVER['PHP_SELF'],'t.datec','align="center"',$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans('LastOutput'),$_SERVER['PHP_SELF'],'','',$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans('DateLastRun'),$_SERVER['PHP_SELF'],'t.datelastrun','align="center"',$param,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans('LastResult'),$_SERVER['PHP_SELF'],'t.lastresult','align="right"',$param,'',$sortfield,$sortorder);
+ print ' ';
+
+ dol_syslog($script_file." sql=".$sql, LOG_DEBUG);
+ $resql=$db->query($sql);
+ if ($resql)
+ {
+ $num = $db->num_rows($resql);
+ $i = 0;
+ if ($num)
+ {
+ while ($i < $num)
+ {
+ $obj = $db->fetch_object($resql);
+ if ($obj)
+ {
+ // You can use here results
+ print '| ';
+ print $obj->rowid;
+ print ' | ';
+ print $obj->command;
+ print ' | ';
+ print $db->jdate($obj->datec);
+ print ' | ';
+ print '';
+ print ' | ';
+ print $db->jdate($obj->datelastrun);
+ print ' | ';
+ print $obj->lastresult;
+ print ' | ';
+ }
+ $i++;
+ }
+ }
+ }
+ else
+ {
+ $error++;
+ dol_print_error($db);
+ }
+
+ print ' '."\n";
+}
+
+
+//print ' |
';
+print '';
+
+
+// End of page
+llxFooter();
+$db->close();
+?>
diff --git a/htdocs/install/mysql/tables/llx_cronjob.sql b/htdocs/install/mysql/tables/llx_cronjob.sql
new file mode 100644
index 00000000000..5a8e33ef38f
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_cronjob.sql
@@ -0,0 +1,32 @@
+-- ===================================================================
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see .
+--
+-- ===================================================================
+
+create table llx_cronjob
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ tms timestamp,
+ datec datetime,
+ command varchar(256),
+ params text,
+ frequency varchar(24),
+ datelastrun datetime,
+ lastresult date,
+ lastoutput text,
+ fk_user integer DEFAULT NULL,
+ note text
+)ENGINE=innodb;
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index 64859a0de3f..4f504d34e59 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -3,4 +3,9 @@ CHARSET=UTF-8
CronSetup=Cron scheduler setup
CronDesc=This page can be used to setup options of the scheduler manager
URLToLaunchCronJobs=URL to launch cron jobs
-KeyForCronAccess=Security key for URL to launch cron jobs
\ No newline at end of file
+KeyForCronAccess=Security key for URL to launch cron jobs
+DateLastRun=Last run
+LastOutput=Last run output
+LastResult=Last result code
+ListOfCronJobs=List of scheduled jobs
+Command=Command
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index a5f3e44dad2..1a9bf136e02 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -3,4 +3,9 @@ CHARSET=UTF-8
CronSetup=Configuration du séquenceur de taches
CronDesc=Cette page permet de configurer certaines options du séquenceur de taches
URLToLaunchCronJobs=URL pour lancer les taches automatiques
-KeyForCronAccess=Clé de sécurité pour l'URL de lancement des taches automatiques
\ No newline at end of file
+KeyForCronAccess=Clé de sécurité pour l'URL de lancement des taches automatiques
+DateLastRun=Dernier lancement
+LastOutput=Dernière sortie
+LastResult=Dernière code retour
+ListOfCronJobs=Liste des taches programmées
+Command=Commande
\ No newline at end of file
diff --git a/htdocs/public/cron/cron_run_jobs.php b/htdocs/public/cron/cron_run_jobs.php
new file mode 100644
index 00000000000..75e15a414a0
--- /dev/null
+++ b/htdocs/public/cron/cron_run_jobs.php
@@ -0,0 +1,173 @@
+
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+/**
+ * \file cron/cron_run_jobs.php
+ * \ingroup cron
+ * \brief This file is the page to call to run jobs
+ * Initialy built by build_class_from_table on 2013-03-17 18:50
+ */
+
+//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');
+//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');
+//if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');
+//if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1');
+//if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
+//if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); // If there is no menu to show
+//if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+//if (! defined("NOLOGIN")) define("NOLOGIN",'1'); // If this page is public (can be called outside logged session)
+
+// Change this following line to use the correct relative path (../, ../../, etc)
+$res=0;
+if (! $res && file_exists("../main.inc.php")) $res=@include '../main.inc.php';
+if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';
+if (! $res && file_exists("../../../main.inc.php")) $res=@include '../../../main.inc.php';
+if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php'; // Used on dev env only
+if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php'; // Used on dev env only
+if (! $res && file_exists("../../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../../dolibarr/htdocs/main.inc.php'; // Used on dev env only
+if (! $res) die("Include of main fails");
+// Change this following line to use the correct relative path from htdocs
+include_once(DOL_DOCUMENT_ROOT.'/cron/class/cronjob.class.php');
+
+
+// C'est un wrapper, donc header vierge
+/**
+ * Header function
+ *
+ * @return void
+ */
+function llxHeaderVierge() {
+ print 'Export agenda cal';
+}
+/**
+ * Footer function
+ *
+ * @return void
+ */
+function llxFooterVierge() {
+ print '';
+}
+
+
+
+// Load traductions files requiredby by page
+$langs->load("companies");
+$langs->load("other");
+$langs->load("cron@cron");
+
+// Get parameters
+$id = GETPOST('id','int');
+$action = GETPOST('action','alpha');
+
+// Protection if external user
+if ($user->societe_id > 0)
+{
+ //accessforbidden();
+}
+
+// Security check
+if (empty($conf->cron->enabled)) accessforbidden('',1,1,1);
+
+// Check also security key
+if (empty($_GET["securitykey"]) || $conf->global->CRON_KEY != $_GET["securitykey"])
+{
+ $user->getrights();
+
+ llxHeaderVierge();
+ print 'Bad value for key.
';
+ llxFooterVierge();
+ exit;
+}
+
+
+/*******************************************************************
+* ACTIONS
+*
+* Put here all code to do according to value of "action" parameter
+********************************************************************/
+
+if ($action == 'add')
+{
+ $object=new Cronjobs($db);
+ $object->prop1=$_POST["field1"];
+ $object->prop2=$_POST["field2"];
+ $result=$object->create($user);
+ if ($result > 0)
+ {
+ // Creation OK
+ }
+ {
+ // Creation KO
+ $mesg=$object->error;
+ }
+}
+
+
+
+
+
+/***************************************************
+* VIEW
+*
+* Put here all code to build page
+****************************************************/
+
+llxHeader('',$langs->trans('CronList'),'');
+
+$form=new Form($db);
+
+
+// Put here content of your page
+
+// Example 1 : Adding jquery code
+print '';
+
+
+$cronjob=new CronJob($db);
+$result=$cronjob->fetch($id);
+
+if ($result > 0)
+{
+
+
+}
+else
+{
+ $langs->load("errors");
+ print $langs->trans("ErrorRecordNotFound");
+}
+
+
+// End of page
+llxFooter();
+
+$db->close();
+?>