diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 83c844123befc4e567b0f9cc36c5ee9e4c8167b8..e369081f7e1b6aefc78cf9b1773c9877179c9561 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -52,7 +52,7 @@ if ($user->societe_id > 0) accessforbidden();
if (! $user->rights->accounting->chartofaccount) accessforbidden();
// Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'sortorder');
$page = GETPOST("page", 'int');
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 5eabf9eda258f2249592a95cebac6b2e89406cc0..bf26348b50af917db971c5e127c2c0f21173f461 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/fiscalyear.class.php';
$action = GETPOST('action','aZ09');
// Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST('sortfield','alpha');
$sortorder = GETPOST('sortorder','alpha');
$page = GETPOST('page','int');
diff --git a/htdocs/accountancy/admin/importaccounts.php b/htdocs/accountancy/admin/importaccounts.php
index 6b46292873671fd66cfe8741e774e8eca4db3e0b..6ae94dc8ce29bb862d8d8932136bcfd98d43e462 100644
--- a/htdocs/accountancy/admin/importaccounts.php
+++ b/htdocs/accountancy/admin/importaccounts.php
@@ -39,7 +39,7 @@ $langs->load("accountancy");
if (! $user->admin)
accessforbidden();
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index b6af74ec96d219017f6e8b4fbaedd2cadfb51435..33bf067fa9e337735056fd3c8062237ed4b8c93d 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -70,7 +70,7 @@ $accounting_product_mode = GETPOST('accounting_product_mode', 'alpha');
$btn_changeaccount = GETPOST('changeaccount');
$btn_changetype = GETPOST('changetype');
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 3dd60ad74785a3176aede2cf7ca660524bc0a9ab..06de3e09f95afe2984f71963d525226292ea5f0d 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -62,7 +62,7 @@ $optioncss = GETPOST('optioncss','alpha');
if ($statut < -1) $statut = '';
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index a5066f98f0cbea973cfc43aae5fa8ae4557c484c..af3174c0b60e55ab56c4e861c3c14a35e890c384 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -42,7 +42,7 @@ $optioncss = GETPOST('optioncss','alpha');
$date_select=isset($_GET["date_select"])?$_GET["date_select"]:$_POST["date_select"];
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 1461098034eaa103b4a9ba078f25f81a0ca062af..f2fa12446b3e0bb89533fb41fb5741d5acda3351 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -44,7 +44,7 @@ $search_email = GETPOST('search_email','alpha');
$type = GETPOST('type','alpha');
$status = GETPOST('status','alpha');
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 04a9320f4c117a281a6afa5dccb6a0d02333aafa..bd539becb865b864b72269a36f3c21bec7618223 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -39,7 +39,7 @@ $action=GETPOST('action','alpha');
$mode = GETPOST('mode')?GETPOST('mode'):'createform'; // 'createform', 'filters', 'sortorder', 'focus'
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index f48ef749b8aab463d491e3cd3ad43f911f093c27..0c4e40948ede3f5011ca5a13f0da9aec1774d207 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -45,7 +45,7 @@ $transvalue=GETPOST('transvalue','alpha');
$mode = GETPOST('mode')?GETPOST('mode'):'overwrite';
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 71c8174f1cd435e72f0ad28f80a1531188cc4126..a192076e88a90dd24ff1e7cd25335041898e3ed8 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -39,7 +39,7 @@ if (! $user->rights->bookmark->lire) {
}
$optioncss = GETPOST('optioncss','alpha');
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 186165b2f9a7027c8599ee4d758da9155cb61116..0e6fbb196a10053efd0203f07ddcdfa8ae55d0e7 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -76,7 +76,7 @@ if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
$filtert=$user->id;
}
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 73aaab22248194006b0a03b63cbaf7596dfd0877..6c580cc93d66a0c9a6b4afeabba7c6075d3fe54f 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -39,7 +39,7 @@ if (! $user->rights->mailing->lire || $user->societe_id > 0) accessforbidden();
// Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST('sortfield','alpha');
$sortorder = GETPOST('sortorder','alpha');
$page = GETPOST('page','int');
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index cdf26b6a36da84e0aba5baa4877c3c4419e7f54a..8aa699fed713f4b82ce63d044cc60696ebacc84b 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -45,7 +45,7 @@ accessforbidden();
$langs->load("companies");
$langs->load("orders");
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 2f8dfc28ae703a462184723dc5a4c47e4e91e53a..dbfeafc8f9453e027cd5b30465d7526b4c166ade 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -82,7 +82,7 @@ $result = restrictedArea($user, 'commande', $id,'');
$diroutputmassaction=$conf->commande->dir_output . '/temp/massgeneration/'.$user->id;
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index f5e9d347e8c301deef93a897274f58648aa757f1..44ecbe6eb6f6bd6a0eed2585fd7a6a179970e4b7 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -55,7 +55,7 @@ $result=restrictedArea($user,'banque');
$diroutputmassaction=$conf->bank->dir_output . '/temp/massgeneration/'.$user->id;
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 915cf43fb79e18c94d55945a2aa7c08725bc5a2a..1a0435862ea7f233ed08ffbf96141af99bdaaf69 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -48,7 +48,7 @@ $id = GETPOST('id','int');
$socid = GETPOST('socid','int');
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 6e63b74a4080864895f394eaea192c087acfda76..dd453bd7f4ecb804b85406e093101b122025f673 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -45,7 +45,7 @@ $page = GETPOST('page','int');
$sortorder = GETPOST('sortorder','alpha');
$sortfield = GETPOST('sortfield','alpha');
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 28836abe6673412d1469182a3643b10c0b6708c1..996a1aabe882342c6c1df36bbea2ed0a95e94a95 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -44,7 +44,7 @@ if ($user->societe_id > 0) accessforbidden();
$prev_id = GETPOST('id','int');
$socid = GETPOST('socid','int');
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 3ddb99a4369571c2d54cf186a3be5416a5be312c..c3231ecccdd7d57de177422d57eb75c41ede121a 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -40,7 +40,7 @@ $object = new Societe($db);
if ($id > 0) $object->fetch($id);
// Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST('sortfield','alpha');
$sortorder = GETPOST('sortorder','alpha');
$page = GETPOST('page','int');
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 61d18cd85ccf49d6e8b29c4724225f306b0d632f..62ee285d70b93f010405841db5dfcd880dd0e7bd 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -52,7 +52,7 @@ if ($user->societe_id > 0) $socid = $user->societe_id;
if (! empty($conf->comptabilite->enabled)) $result=restrictedArea($user,'compta','','','resultat');
if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accounting','','','comptarapport');
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 96876ed561dea3fd76cc5fd7111feed6e402e4cf..6c412c146d1cc3e210e713c084851285aec35c6f 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -89,7 +89,7 @@ $search_agenda_label=GETPOST('search_agenda_label');
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index fd48794afad8c515b5795b80f0f44c472b7780ec..b2f8066367cc28dd17038bcd89cc92bc1749331d 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -74,7 +74,7 @@ $optioncss = GETPOST('optioncss','alpha');
$type=GETPOST("type");
$view=GETPOST("view");
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha');
$page = GETPOST('page', 'int');
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 0003bdec3483128a4ab337527ead1d30d8bc0b10..11a259abce79f3dd5459f3ef6132914b9ed53968 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -65,7 +65,7 @@ $month=GETPOST("month","int");
$optioncss = GETPOST('optioncss','alpha');
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 6902927a8b78e974e07277f05e585e2ee2f0788c..0af99eeed33eb20c763212218e8cc16374594ae0 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -33,7 +33,7 @@ $langs->load("products");
$langs->load("contracts");
$langs->load("companies");
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 789e3bafcec2fa1a7b3a617117fb5fb263bd5f51..9d01ec888f00dcd35f5307a7e0090cdf1269e767 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -109,7 +109,7 @@ class Cronjob extends CommonObject
if (isset($this->nbrun)) $this->nbrun=trim($this->nbrun);
if (isset($this->libname)) $this->libname = trim($this->libname);
if (isset($this->test)) $this->test = trim($this->test);
-
+
// Check parameters
// Put here code to add a control on parameters values
if (dol_strlen($this->datestart)==0) {
@@ -361,15 +361,15 @@ class Cronjob extends CommonObject
* @param int $offset page
* @param int $status display active or not
* @param array $filter filter output
- * @param int $processing Processing or not
+ * @param int $processing Processing or not
* @return int <0 if KO, >0 if OK
*/
function fetch_all($sortorder='DESC', $sortfield='t.rowid', $limit=0, $offset=0, $status=1, $filter='', $processing=-1)
{
global $langs;
-
+
$this->lines=array();
-
+
$sql = "SELECT";
$sql.= " t.rowid,";
$sql.= " t.entity,";
@@ -409,7 +409,7 @@ class Cronjob extends CommonObject
if ($status == 2) $sql.= " AND t.status = 2";
//Manage filter
if (is_array($filter) && count($filter)>0) {
- foreach($filter as $key => $value)
+ foreach($filter as $key => $value)
{
if ($key == 't.rowid') $sql.= ' AND '.$key.' = '.$this->db->escape($value);
else $sql.= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
@@ -532,7 +532,7 @@ class Cronjob extends CommonObject
if (empty($this->maxrun)) $this->maxrun=0;
if (empty($this->processing)) $this->processing=0;
-
+
// Check parameters
// Put here code to add a control on parameters values
if (dol_strlen($this->datestart)==0) {
@@ -845,8 +845,8 @@ class Cronjob extends CommonObject
/**
* Run a job.
- * Once job is finished, status and nb of run is updated.
- * This function does not plan the next run. This is done by function ->reprogram_jobs
+ * Once job is finished, status and nb of run is updated.
+ * This function does not plan the next run. This is done by function ->reprogram_jobs
*
* @param string $userlogin User login
* @return int <0 if KO, >0 if OK
@@ -861,7 +861,7 @@ class Cronjob extends CommonObject
$langs->load('cron');
- if (empty($userlogin))
+ if (empty($userlogin))
{
$this->error="User login is mandatory";
dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
@@ -948,7 +948,7 @@ class Cronjob extends CommonObject
$error++;
}
}
-
+
// Load langs
if (! $error)
{
@@ -963,14 +963,14 @@ class Cronjob extends CommonObject
$error++;
}
}
-
+
if (! $error)
{
dol_syslog(get_class($this)."::run_jobs START ".$this->objectname."->".$this->methodename."(".$this->params.");", LOG_DEBUG);
-
+
// Create Object for the call module
$object = new $this->objectname($this->db);
-
+
$params_arr = array_map('trim', explode(",",$this->params));
if (!is_array($params_arr))
{
@@ -980,7 +980,7 @@ class Cronjob extends CommonObject
{
$result = call_user_func_array(array($object, $this->methodename), $params_arr);
}
-
+
if ($result===false || $result != 0)
{
$langs->load("errors");
@@ -998,7 +998,7 @@ class Cronjob extends CommonObject
$this->lastresult=var_export($result,true);
$retval = $this->lastresult;
}
- }
+ }
}
if($this->jobtype == 'function')
@@ -1071,7 +1071,7 @@ class Cronjob extends CommonObject
$this->lastoutput = ''; // Will be filled later
$this->lastresult = $retval;
$retval = $this->lastresult;
- $error++;
+ $error++;
}
}
if ($execmethod == 2)
@@ -1102,14 +1102,14 @@ class Cronjob extends CommonObject
$this->lastoutput.=$val."\n";
}
}
-
+
$this->lastresult=$retval;
-
+
dol_syslog(get_class($this)."::run_jobs output_arr:".var_export($output_arr,true)." lastoutput=".$this->lastoutput." lastresult=".$this->lastresult, LOG_DEBUG);
}
-
+
dol_syslog(get_class($this)."::run_jobs now we update job to track it is finished (with success or error)");
-
+
$this->datelastresult=dol_now();
$this->processing=0;
$result = $this->update($user); // This include begin/commit
@@ -1135,19 +1135,19 @@ class Cronjob extends CommonObject
function reprogram_jobs($userlogin, $now)
{
dol_syslog(get_class($this)."::reprogram_jobs userlogin:$userlogin", LOG_DEBUG);
-
+
require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
$user=new User($this->db);
$result=$user->fetch('',$userlogin);
- if ($result<0)
+ if ($result<0)
{
$this->error="User Error:".$user->error;
dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR);
return -1;
}
- else
+ else
{
- if (empty($user->id))
+ if (empty($user->id))
{
$this->error=" User user login:".$userlogin." do not exists";
dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR);
@@ -1155,28 +1155,28 @@ class Cronjob extends CommonObject
}
}
- dol_syslog(get_class($this)."::reprogram_jobs ", LOG_DEBUG);
+ dol_syslog(get_class($this)."::reprogram_jobs datenextrun=".$this->datenextrun." ".dol_print_date($this->datenextrun, 'dayhourrfc')." frequency=".$this->frequency." unitfrequency=".$this->unitfrequency, LOG_DEBUG);
-
- if (empty($this->datenextrun))
+ if (empty($this->datenextrun))
{
if (empty($this->datestart)) $this->datenextrun = $now + ($this->frequency * $this->unitfrequency);
else $this->datenextrun = $this->datestart + ($this->frequency * $this->unitfrequency);
}
- if ($this->datenextrun < $now && $this->frequency > 0 && $this->unitfrequency > 0)
+ if ($this->datenextrun < $now && $this->frequency > 0 && $this->unitfrequency > 0)
{
// Loop until date is after future
while ($this->datenextrun < $now)
{
$this->datenextrun += ($this->frequency * $this->unitfrequency);
-
+
// TODO For exact frequency (every month, every year, ...), use instead a dol_time_plus_duree($time, $duration_value, $duration_unit)
}
}
- else
+ else
{
//$this->datenextrun=$this->datenextrun + ($this->frequency * $this->unitfrequency);
+ dol_syslog(get_class($this)."::reprogram_jobs datenextrun is already in future, we do not change it");
}
@@ -1190,9 +1190,9 @@ class Cronjob extends CommonObject
dol_syslog(get_class($this)."::reprogram_jobs Job will be set to archived", LOG_ERR);
}
}
-
+
$result = $this->update($user);
- if ($result<0)
+ if ($result<0)
{
dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR);
return -1;
@@ -1200,7 +1200,7 @@ class Cronjob extends CommonObject
return 1;
}
-
+
/**
* Return label of status of user (active, inactive)
*
@@ -1211,7 +1211,7 @@ class Cronjob extends CommonObject
{
return $this->LibStatut($this->status,$mode);
}
-
+
/**
* Renvoi le libelle d'un statut donne
*
@@ -1223,7 +1223,7 @@ class Cronjob extends CommonObject
{
global $langs;
$langs->load('users');
-
+
if ($mode == 0)
{
$prefix='';
@@ -1255,7 +1255,7 @@ class Cronjob extends CommonObject
if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4','class="pictostatus"');
if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5','class="pictostatus"');
}
- }
+ }
}
diff --git a/htdocs/cron/info.php b/htdocs/cron/info.php
index 334a5da6890a2ee6cc7d62c8a3bfb2f57c58da42..18ab50adeaa1fd212d1959dbab78188a6e0cdbb4 100644
--- a/htdocs/cron/info.php
+++ b/htdocs/cron/info.php
@@ -48,7 +48,7 @@ $object->info($id);
$head = cron_prepare_head($object);
-dol_fiche_head($head, 'info', $langs->trans("CronTask"), 0, 'cron');
+dol_fiche_head($head, 'info', $langs->trans("CronTask"), -1, 'cron');
print '<table width="100%"><tr><td>';
dol_print_object_info($object);
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 12c92e9bdd32825ef8673a9fbb35b35e097632a2..3b830e4801fa9478edbf7fa57137859cae613748 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -39,7 +39,7 @@ $action=GETPOST('action','alpha');
$confirm=GETPOST('confirm','alpha');
$id=GETPOST('id','int');
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 517a231fdb920d4d881abf4a0f9b2701cb3e8f9b..091b5e44bb829117c6c17b6d7494628a3c547f0d 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -53,7 +53,7 @@ $search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
$sall = GETPOST('sall', 'alphanohtml');
$optioncss = GETPOST('optioncss','alpha');
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST('sortfield','alpha');
$sortorder = GETPOST('sortorder','alpha');
$page = GETPOST('page','int');
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 8fcacda5d440be6d34ff647062c2215a64664e5b..9cf47ddea94905956a11bd967ff48a9d0d2fd49d 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -51,7 +51,7 @@ $diroutputmassaction=$conf->expensereport->dir_output . '/temp/massgeneration/'.
// Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST('sortfield','alpha');
$sortorder = GETPOST('sortorder','alpha');
$page = GETPOST('page','int');
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 4b117cc4a2c9bbc6dd6768c0465a436df0bc70b6..86fb7e5c4f51864092a88a1acece695ee8340c48 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -101,7 +101,7 @@ $result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande');
$diroutputmassaction=$conf->fournisseur->commande->dir_output . '/temp/massgeneration/'.$user->id;
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index d6d0ac734a2a897961dc800e6c8e20fa09906c1a..00e2dbf939d54df6f0fc5f970b613cf99687920f 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -42,7 +42,7 @@ $type = GETPOST('type');
$optioncss = GETPOST('optioncss','alpha');
// Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST('sortfield','alpha');
$sortorder = GETPOST('sortorder','alpha');
$page = GETPOST('page','int');
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 8fac1c8a388acf72fc6bb515245218e1fa7a78e3..ef3cb110224cd6e675fba94eb449581607fd3505 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -68,7 +68,7 @@ $search_myfield=GETPOST('search_myfield');
$optioncss = GETPOST('optioncss','alpha');
// Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST('sortfield','alpha');
$sortorder = GETPOST('sortorder','alpha');
$page = GETPOST('page','int');
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 93a18788f957593a8ea445912b160e54093d9195..c8d570a6fd75bb571113c957c024c159713d06ab 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php';
$langs->load("stock");
$langs->load("inventory");
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
diff --git a/htdocs/product/list-with-listview.php b/htdocs/product/list-with-listview.php
index f3119af83c936f480de457a7f9f5f12c1efee37f..947cfaecbc2a629d846c4030260ea7158bd2d274 100644
--- a/htdocs/product/list-with-listview.php
+++ b/htdocs/product/list-with-listview.php
@@ -77,7 +77,7 @@ if (!$_POST) {
$diroutputmassaction=$conf->product->dir_output . '/temp/massgeneration/'.$user->id;
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 841156ebb0d4d67acad0bdc69f8d7d91ff3c79d1..4cd986de291867317949584d68c0d33c82563de3 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -77,7 +77,7 @@ if (!$_POST) {
$diroutputmassaction=$conf->product->dir_output . '/temp/massgeneration/'.$user->id;
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = (GETPOST("page",'int')?GETPOST("page", 'int'):0);
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 8aa5191b17607deeaf88aa661b5b0139f26d0ffe..21491eab512184c12514ca360097b466d2b0b0b1 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -38,7 +38,7 @@ $type=GETPOST("type","int");
if (! empty($user->societe_id)) $socid=$user->societe_id;
$result=restrictedArea($user,'produit|service');
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 1d74cf85fadc40a5a8e288d9fb9aeff5d0846481..61e9438c929d3c78d9a01212cc79976c450b5044 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -61,7 +61,7 @@ $search_myfield=GETPOST('search_myfield');
$optioncss = GETPOST('optioncss','alpha');
// Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST('sortfield','alpha');
$sortorder = GETPOST('sortorder','alpha');
$page = GETPOST('page','int');
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index 135517f26dbe6687b8bea77e45b984f72530bf3d..05c312877450a6d040970361f81bd4a87ab116ee 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -35,7 +35,7 @@ $ref = GETPOST('ref','alpha');
$socid = GETPOST('socid','int');
$action = GETPOST('action','alpha');
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield","alpha");
$sortorder = GETPOST("sortorder");
$page = GETPOST("page");
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index c85b96ffcf416cde58d6411925d035af09e5271b..827719148fe68ed5a8ee2e1e9ce41feba1a5295a 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -55,7 +55,7 @@ if (!$user->rights->projet->lire) accessforbidden();
$diroutputmassaction=$conf->projet->dir_output . '/temp/massgeneration/'.$user->id;
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield","alpha");
$sortorder = GETPOST("sortorder");
$page = GETPOST("page");
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 7e809fe966fe75794566f922b6cdb75882936a1f..18f133513b160789c90e3daa24f12f302a88a3b4 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -85,7 +85,7 @@ if (!$user->rights->projet->lire) accessforbidden();
$diroutputmassaction=$conf->projet->dir_output . '/tasks/temp/massgeneration/'.$user->id;
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 8aa496eaa5ae45e43b74e4fbf528486e98f350f7..08eb429f664b1b2da6c76baac98d77eb10059bee 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -58,7 +58,7 @@ $socid=0;
//if ($user->societe_id > 0) $socid = $user->societe_id; // For external user, no check is done on company because readability is managed by public status of project and assignement.
if (!$user->rights->projet->lire) accessforbidden();
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index f16d1ef122c2d44c8c6c9ccecf56a6add522b7a2..5ec9eabbfb14fae9ab8d9a999cb6f97e4f9498fb 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -91,7 +91,7 @@ if (empty($sortorder)) $sortorder="ASC";
if (empty($sortfield)) $sortfield="t.rowid";
if (empty($arch)) $arch = 0;
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$page = GETPOST("page");
$page = is_numeric($page) ? $page : 0;
$page = $page == -1 ? 0 : $page;
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index dbb9e831fe911be1e1033335fab29d2c022d4733..15ea29e9954da0979eaca5f4bb92c39777ecfaa1 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -50,7 +50,7 @@ $socid = GETPOST('socid','int');
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'societe', $socid, '&societe');
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 9842e913daeba5b41bcdcf84ba068066c8a3b87c..422768bce31c72076abe396b495a003f67f231e3 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -84,7 +84,7 @@ $mode=GETPOST("mode");
$diroutputmassaction=$conf->societe->dir_output . '/temp/massgeneration/'.$user->id;
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield=GETPOST("sortfield",'alpha');
$sortorder=GETPOST("sortorder",'alpha');
$page=GETPOST("page",'int');
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 9a5405de7fd0f206b112a4b98e8ed2830635d530..eacd047d93ad5cf0f5fe423f2a66a0df6ec491bd 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -44,7 +44,7 @@ $actionid=GETPOST('actionid');
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'societe','','');
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield=GETPOST("sortfield",'alpha');
$sortorder=GETPOST("sortorder",'alpha');
$page=GETPOST("page",'int');
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index d88d591a1520bf8d80d6318f4796e1a53bb28585..06e11caced933f50cf8c9a98eface1b8dba23ed1 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -45,7 +45,7 @@ $search_group=GETPOST('search_group');
$optioncss = GETPOST('optioncss','alpha');
// Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST('sortfield','alpha');
$sortorder = GETPOST('sortorder','alpha');
$page = GETPOST('page','int');
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 1aedee8790824a28bf51bda2cf2be75ddd289c40..da5ddd99339f46364779482f3bd522d525847ce6 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -46,7 +46,7 @@ if ($user->societe_id > 0)
$mode = GETPOST("mode", 'alpha');
// Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield = GETPOST('sortfield','alpha');
$sortorder = GETPOST('sortorder','alpha');
$page = GETPOST('page','int');
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 5fc0af8fa14c205c110fd8efd625fcab6ff4f0a5..b803fd93f7b525b846211cc73863e484712e7818 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -44,7 +44,7 @@ $actionid=GETPOST('actionid');
if ($user->societe_id) $id=$user->societe_id;
$result = restrictedArea($user, 'societe','','');
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int')::$conf->liste_limit;
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
$sortfield=GETPOST("sortfield",'alpha');
$sortorder=GETPOST("sortorder",'alpha');
$page=GETPOST("page",'int');