Browse Source

Fix syntax error

Laurent Destailleur 8 years ago
parent
commit
b441c62e1d
48 changed files with 83 additions and 83 deletions
  1. 1 1
      htdocs/accountancy/admin/account.php
  2. 1 1
      htdocs/accountancy/admin/fiscalyear.php
  3. 1 1
      htdocs/accountancy/admin/importaccounts.php
  4. 1 1
      htdocs/accountancy/admin/productaccount.php
  5. 1 1
      htdocs/adherents/list.php
  6. 1 1
      htdocs/adherents/subscription/list.php
  7. 1 1
      htdocs/adherents/type.php
  8. 1 1
      htdocs/admin/defaultvalues.php
  9. 1 1
      htdocs/admin/translation.php
  10. 1 1
      htdocs/bookmarks/list.php
  11. 1 1
      htdocs/comm/action/listactions.php
  12. 1 1
      htdocs/comm/mailing/cibles.php
  13. 1 1
      htdocs/commande/customer.php
  14. 1 1
      htdocs/commande/list.php
  15. 1 1
      htdocs/compta/bank/index.php
  16. 1 1
      htdocs/compta/prelevement/card.php
  17. 1 1
      htdocs/compta/prelevement/demandes.php
  18. 1 1
      htdocs/compta/prelevement/factures.php
  19. 1 1
      htdocs/compta/recap-compta.php
  20. 1 1
      htdocs/compta/resultat/clientfourn.php
  21. 1 1
      htdocs/contact/agenda.php
  22. 1 1
      htdocs/contact/list.php
  23. 1 1
      htdocs/contrat/list.php
  24. 1 1
      htdocs/contrat/services.php
  25. 36 36
      htdocs/cron/class/cronjob.class.php
  26. 1 1
      htdocs/cron/info.php
  27. 1 1
      htdocs/cron/list.php
  28. 1 1
      htdocs/expedition/list.php
  29. 1 1
      htdocs/expensereport/list.php
  30. 1 1
      htdocs/fourn/commande/list.php
  31. 1 1
      htdocs/fourn/product/list.php
  32. 1 1
      htdocs/modulebuilder/template/myobject_list.php
  33. 1 1
      htdocs/product/inventory/list.php
  34. 1 1
      htdocs/product/list-with-listview.php
  35. 1 1
      htdocs/product/list.php
  36. 1 1
      htdocs/product/popuprop.php
  37. 1 1
      htdocs/product/stock/productlot_list.php
  38. 1 1
      htdocs/projet/info.php
  39. 1 1
      htdocs/projet/list.php
  40. 1 1
      htdocs/projet/tasks/list.php
  41. 1 1
      htdocs/projet/tasks/time.php
  42. 1 1
      htdocs/resource/list.php
  43. 1 1
      htdocs/societe/agenda.php
  44. 1 1
      htdocs/societe/list.php
  45. 1 1
      htdocs/societe/notify/card.php
  46. 1 1
      htdocs/user/group/index.php
  47. 1 1
      htdocs/user/index.php
  48. 1 1
      htdocs/user/notify/card.php

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 36 - 36
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"');
 	    }
-	}	
+	}
 }
 
 

+ 1 - 1
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);

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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);

+ 1 - 1
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);

+ 1 - 1
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);

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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");

+ 1 - 1
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");

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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;

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');

+ 1 - 1
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');