Dolibarr / dolibarr

htdocs/core/modules/expedition/mod_expedition_safor.php

Indentation +14 added lines, -14 removed lines

@@ -29,9 +29,9 @@ 
 class mod_expedition_safor extends ModelNumRefExpedition
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	public $prefix = 'SH';
@@ -59,11 +59,11 @@ 
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
-    }
+	public function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+	}
 
 
 	/**
@@ -71,7 +71,7 @@ 
 	 *
 	 *	@return     string      Example
 	 */
-    public function getExample()
+	public function getExample()
 	{
 		return $this->prefix."0501-0001";
 	}
@@ -82,7 +82,7 @@ 
 	 *
 	 *	@return     boolean     false if conflit, true if ok
 	 */
-    public function canBeActivated()
+	public function canBeActivated()
 	{
 		global $conf, $langs, $db;
 
@@ -117,7 +117,7 @@ 
 	 *	@param	Object		$shipment	Shipment object
 	 *	@return string      			Value if OK, 0 if KO
 	 */
-    public function getNextValue($objsoc, $shipment)
+	public function getNextValue($objsoc, $shipment)
 	{
 		global $db, $conf;
 
@@ -150,7 +150,7 @@ 
 		return $this->prefix.$yymm."-".$num;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return next free value
 	 *
@@ -158,9 +158,9 @@ 
 	 *	@param	Object		$objforref	Shipment object
 	 *	@return string      			Next free value
 	 */
-    public function expedition_get_num($objsoc, $objforref)
+	public function expedition_get_num($objsoc, $objforref)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->getNextValue($objsoc, $objforref);
 	}
 }

Braces +12 added lines, -4 removed lines

@@ -131,8 +131,11 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog("mod_expedition_safor::getNextValue", LOG_DEBUG);
 			return -1;
@@ -141,8 +144,13 @@ 
 		$date = time();
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1;
+		}
+		// If counter > 9999, we do not format on 4 chars, we take number as it is
+		else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog("mod_expedition_safor::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

htdocs/core/modules/expedition/mod_expedition_ribera.php

Indentation +25 added lines, -25 removed lines

@@ -31,9 +31,9 @@ 
 class mod_expedition_ribera extends ModelNumRefExpedition
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	/**
@@ -58,9 +58,9 @@ 
 	 *
 	 *	@return     string      text description
 	 */
-    public function info()
-    {
-    	global $conf, $langs, $db;
+	public function info()
+	{
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
@@ -87,22 +87,22 @@ 
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
 	/**
 	 *	Return numbering example
 	 *
 	 *	@return     string      Example
 	 */
-    public function getExample()
-    {
-     	global $conf, $langs, $mysoc;
-
-    	$old_code_client = $mysoc->code_client;
-    	$old_code_type = $mysoc->typent_code;
-    	$mysoc->code_client = 'CCCCCCCCCC';
-    	$mysoc->typent_code = 'TTTTTTTTTT';
-     	$numExample = $this->getNextValue($mysoc, '');
+	public function getExample()
+	{
+	 	global $conf, $langs, $mysoc;
+
+		$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';
+	 	$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
@@ -111,7 +111,7 @@ 
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 *	Return next value
@@ -120,8 +120,8 @@ 
 	 *	@param	Object		$shipment	Shipment object
 	 *	@return string      			Value if OK, 0 if KO
 	 */
-    public function getNextValue($objsoc, $shipment)
-    {
+	public function getNextValue($objsoc, $shipment)
+	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -141,7 +141,7 @@ 
 		return  $numFinal;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return next free value
 	 *
@@ -149,9 +149,9 @@ 
 	 *	@param	Object		$objforref	Shipment object
 	 *	@return string      			Next free value
 	 */
-    public function expedition_get_num($objsoc, $objforref)
-    {
-        // phpcs:enable
-        return $this->getNextValue($objsoc, $objforref);
-    }
+	public function expedition_get_num($objsoc, $objforref)
+	{
+		// phpcs:enable
+		return $this->getNextValue($objsoc, $objforref);
+	}
 }

htdocs/core/modules/expensereport/mod_expensereport_sand.php

Indentation +36 added lines, -36 removed lines

@@ -31,9 +31,9 @@ 
 class mod_expensereport_sand extends ModeleNumRefExpenseReport
 {
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 
 	/**
@@ -54,14 +54,14 @@ 
 	public $name = 'Sand';
 
 
-    /**
-     *  Returns the description of the numbering model
-     *
-     *  @return     string      Texte descripif
-     */
-    public function info()
-    {
-    	global $db, $conf, $langs;
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $db, $conf, $langs;
 
 		$langs->load("bills");
 
@@ -92,39 +92,39 @@ 
 		$texte .= '</form>';
 
 		return $texte;
-    }
+	}
 
-    /**
-     *  Return an example of numbering
-     *
-     *  @return     string      Example
-     */
-    public function getExample()
-    {
-     	global $db, $conf, $langs, $user;
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+	 	global $db, $conf, $langs, $user;
 
-     	$exp = new ExpenseReport($db);
-     	$exp->initAsSpecimen();
-     	$exp->fk_user_author = $user->id;
+	 	$exp = new ExpenseReport($db);
+	 	$exp->initAsSpecimen();
+	 	$exp->fk_user_author = $user->id;
 
-     	$numExample = $this->getNextValue($exp);
+	 	$numExample = $this->getNextValue($exp);
 
 		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
-
-    /**
-     *  Return next free value
-     *
-     *  @param  Object      $object     Object we need next value for
-     *  @return string                  Value if KO, <0 if KO
-     */
-    public function getNextValue($object)
-    {
-        global $db, $conf;
+	}
+
+	/**
+	 *  Return next free value
+	 *
+	 *  @param  Object      $object     Object we need next value for
+	 *  @return string                  Value if KO, <0 if KO
+	 */
+	public function getNextValue($object)
+	{
+		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
@@ -154,5 +154,5 @@ 
 		$numFinal = get_next_value($db, $mask, 'expensereport', 'ref', '', null, $date, 'next', true, $fuser);
 
 		return $numFinal;
-    }
+	}
 }

htdocs/core/modules/modBom.class.php

Braces +4 added lines, -1 removed lines

@@ -320,7 +320,10 @@
 		global $conf, $langs;
 
 		$result = $this->_load_tables('/bom/sql/');
-		if ($result < 0) return -1; // Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
+		if ($result < 0) {
+			return -1;
+		}
+		// Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
 
 		// Create extrafields
 		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

htdocs/core/actions_changeselectedfields.inc.php

Braces +5 added lines, -2 removed lines

@@ -34,8 +34,11 @@
 
     $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 
-    if (GETPOST("selectedfields")) $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = GETPOST("selectedfields");
-    else $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = '';
+    if (GETPOST("selectedfields")) {
+    	$tabparam["MAIN_SELECTEDFIELDS_".$varpage] = GETPOST("selectedfields");
+    } else {
+    	$tabparam["MAIN_SELECTEDFIELDS_".$varpage] = '';
+    }
 
     include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 

Indentation +8 added lines, -8 removed lines

@@ -30,17 +30,17 @@
 // Save selection
 if (GETPOST('formfilteraction', 'alphanohtml') == 'listafterchangingselectedfields')
 {
-    $tabparam = array();
+	$tabparam = array();
 
-    $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 
-    if (GETPOST("selectedfields")) $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = GETPOST("selectedfields");
-    else $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = '';
+	if (GETPOST("selectedfields")) $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = GETPOST("selectedfields");
+	else $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = '';
 
-    include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-    $result = dol_set_user_param($db, $conf, $user, $tabparam);
+	$result = dol_set_user_param($db, $conf, $user, $tabparam);
 
-    //$action='list';
-    //var_dump($tabparam);exit;
+	//$action='list';
+	//var_dump($tabparam);exit;
 }

htdocs/core/lib/signature.lib.php

Indentation +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	global $conf, $langs;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array("payment", "paybox"));
+	$langs->loadLangs(array("payment", "paybox"));
 
 	$servicename = 'Online';
 

Braces +16 added lines, -6 removed lines

@@ -59,15 +59,22 @@ 
 	if ($type == 'proposal')
 	{
 		$out = DOL_MAIN_URL_ROOT.'/public/onlinesign/newonlinesign.php?source=proposal&ref='.($mode ? '<font color="#666666">' : '');
-		if ($mode == 1) $out .= 'proposal_ref';
-		if ($mode == 0) $out .= urlencode($ref);
+		if ($mode == 1) {
+			$out .= 'proposal_ref';
+		}
+		if ($mode == 0) {
+			$out .= urlencode($ref);
+		}
 		$out .= ($mode ? '</font>' : '');
-		if ($mode == 1) $out .= '&hashp=<font color="#666666">hash_of_file</font>';
-		else {
+		if ($mode == 1) {
+			$out .= '&hashp=<font color="#666666">hash_of_file</font>';
+		} else {
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$propaltmp = new Propal($db);
 			$res = $propaltmp->fetch(0, $ref);
-			if ($res <= 0) return 'FailedToGetProposal';
+			if ($res <= 0) {
+				return 'FailedToGetProposal';
+			}
 
 			include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 			$ecmfile = new EcmFiles($db);
@@ -86,7 +93,10 @@ 
 	}
 
 	// For multicompany
-	if (!empty($out)) $out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
+	if (!empty($out)) {
+		$out .= "&entity=".$conf->entity;
+	}
+	// Check the entity because He may be the same reference in several entities
 
 	return $out;
 }

htdocs/loan/note.php

Braces +3 added lines, -1 removed lines

@@ -44,7 +44,9 @@
 $result = restrictedArea($user, 'loan', $id, '&loan');
 
 $object = new Loan($db);
-if ($id > 0) $object->fetch($id);
+if ($id > 0) {
+	$object->fetch($id);
+}
 
 $permissionnote = $user->rights->loan->write; // Used by the include of actions_setnotes.inc.php
 

Indentation +7 added lines, -7 removed lines

@@ -68,14 +68,14 @@ 
 
 if ($id > 0)
 {
-    /*
+	/*
      * Affichage onglets
      */
 	$totalpaid = $object->getSumPayment();
 
-    $head = loan_prepare_head($object);
+	$head = loan_prepare_head($object);
 
-    print dol_get_fiche_head($head, 'note', $langs->trans("Loan"), -1, 'bill');
+	print dol_get_fiche_head($head, 'note', $langs->trans("Loan"), -1, 'bill');
 
 	$morehtmlref = '<div class="refidno">';
 	// Ref loan
@@ -122,11 +122,11 @@ 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
-    $cssclass = 'titlefield';
-    $permission = $user->rights->loan->write; // Used by the include of notes.tpl.php
-    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+	$cssclass = 'titlefield';
+	$permission = $user->rights->loan->write; // Used by the include of notes.tpl.php
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-    print dol_get_fiche_end();
+	print dol_get_fiche_end();
 }
 
 // End of page

htdocs/exports/index.php

Indentation +5 added lines, -5 removed lines

@@ -50,7 +50,7 @@ 
 print '<div class="center">';
 if (count($export->array_export_code))
 {
-    print dolGetButtonTitle($langs->trans('NewExport'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/exports/export.php?leftmenu=export', '', $user->rights->export->creer);
+	print dolGetButtonTitle($langs->trans('NewExport'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/exports/export.php?leftmenu=export', '', $user->rights->export->creer);
 }
 print '</div>';
 print '<br>';
@@ -73,10 +73,10 @@ 
 
 foreach ($liste as $key => $val)
 {
-    if (preg_match('/__\(Disabled\)__/', $liste[$key]))
-    {
-    	$liste[$key] = preg_replace('/__\(Disabled\)__/', '('.$langs->transnoentitiesnoconv("Disabled").')', $liste[$key]);
-    }
+	if (preg_match('/__\(Disabled\)__/', $liste[$key]))
+	{
+		$liste[$key] = preg_replace('/__\(Disabled\)__/', '('.$langs->transnoentitiesnoconv("Disabled").')', $liste[$key]);
+	}
 
 	print '<tr class="oddeven">';
 	print '<td width="16">'.img_picto_common($model->getDriverLabelForKey($key), $model->getPictoForKey($key)).'</td>';

htdocs/comm/mailing/list.php

Indentation +4 added lines, -4 removed lines

@@ -59,7 +59,7 @@ 
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
-    'm.titre'=>'Ref',
+	'm.titre'=>'Ref',
 );
 
 
@@ -157,7 +157,7 @@ 
 	$newcardbutton = '';
 	if ($user->rights->mailing->creer)
 	{
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewMailing'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/mailing/card.php?action=create');
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewMailing'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/mailing/card.php?action=create');
 	}
 
 	$i = 0;
@@ -177,8 +177,8 @@ 
 
 	$moreforfilter = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre">';

Braces +70 added lines, -25 removed lines

@@ -40,8 +40,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "m.date_creat";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "m.date_creat";
+}
 
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_ref = GETPOST("search_ref", "alpha") ? GETPOST("search_ref", "alpha") : GETPOST("sref", "alpha");
@@ -75,7 +79,9 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -83,13 +89,15 @@ 
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+		// All tests are required to be compatible with all browsers
 	{
 		/*foreach($object->fields as $key => $val)
 		{
 			$search[$key]='';
 		}*/
 		$search_ref = '';
+	}
 		$search_all = '';
 		$toselect = '';
 		$search_array_options = array();
@@ -126,19 +134,35 @@ 
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc";
 	$sql .= " WHERE m.rowid = mc.fk_mailing AND m.entity = ".$conf->entity;
 	$sql .= " AND mc.email = '".$db->escape($filteremail)."'";
-	if ($search_ref) $sql .= " AND m.rowid = '".$db->escape($search_ref)."'";
-	if ($search_all) $sql .= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
-	if (!$sortorder) $sortorder = "ASC";
-	if (!$sortfield) $sortfield = "m.rowid";
-} else {
+	if ($search_ref) {
+		$sql .= " AND m.rowid = '".$db->escape($search_ref)."'";
+	}
+	if ($search_all) {
+		$sql .= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
+	}
+	if (!$sortorder) {
+		$sortorder = "ASC";
+	}
+	if (!$sortfield) {
+		$sortfield = "m.rowid";
+	}
+	} else {
 	$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi";
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m";
 	$sql .= " WHERE m.entity = ".$conf->entity;
-	if ($search_ref) $sql .= " AND m.rowid = '".$db->escape($search_ref)."'";
-	if ($search_all) $sql .= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
-	if (!$sortorder) $sortorder = "ASC";
-	if (!$sortfield) $sortfield = "m.rowid";
-}
+	if ($search_ref) {
+		$sql .= " AND m.rowid = '".$db->escape($search_ref)."'";
+	}
+	if ($search_all) {
+		$sql .= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
+	}
+	if (!$sortorder) {
+		$sortorder = "ASC";
+	}
+	if (!$sortfield) {
+		$sortfield = "m.rowid";
+	}
+	}
 
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -147,9 +171,11 @@ 
 {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
+		// if total resultset is smaller then paging size (filtering), goto and load page 0
 	{
 		$page = 0;
+	}
 		$offset = 0;
 	}
 }
@@ -164,7 +190,9 @@ 
 	$num = $db->num_rows($resql);
 
 	$title = $langs->trans("ListOfEMailings");
-	if ($filteremail) $title .= ' ('.$langs->trans("SentTo", $filteremail).')';
+	if ($filteremail) {
+		$title .= ' ('.$langs->trans("SentTo", $filteremail).')';
+	}
 
 	$newcardbutton = '';
 	if ($user->rights->mailing->creer)
@@ -175,12 +203,20 @@ 
 	$i = 0;
 
 	$param = "&search_all=".urlencode($search_all);
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($filteremail) $param .= '&filteremail='.urlencode($filteremail);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($filteremail) {
+		$param .= '&filteremail='.urlencode($filteremail);
+	}
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
@@ -202,7 +238,9 @@ 
 	print '<input type="text" class="flat maxwidth100 maxwidth50onsmartphone" name="search_all" value="'.dol_escape_htmltag($search_all).'">';
 	print '</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
-	if (!$filteremail) print '<td class="liste_titre">&nbsp;</td>';
+	if (!$filteremail) {
+		print '<td class="liste_titre">&nbsp;</td>';
+	}
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre maxwidthsearch">';
@@ -215,9 +253,14 @@ 
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "m.rowid", $param, "", "", $sortfield, $sortorder);
 	print_liste_field_titre("Title", $_SERVER["PHP_SELF"], "m.titre", $param, "", "", $sortfield, $sortorder);
 	print_liste_field_titre("DateCreation", $_SERVER["PHP_SELF"], "m.date_creat", $param, "", 'align="center"', $sortfield, $sortorder);
-	if (!$filteremail) print_liste_field_titre("NbOfEMails", $_SERVER["PHP_SELF"], "m.nbemail", $param, "", 'align="center"', $sortfield, $sortorder);
-	if (!$filteremail) print_liste_field_titre("DateLastSend", $_SERVER["PHP_SELF"], "m.date_envoi", $param, "", 'align="center"', $sortfield, $sortorder);
-	else print_liste_field_titre("DateSending", $_SERVER["PHP_SELF"], "mc.date_envoi", $param, "", 'align="center"', $sortfield, $sortorder);
+	if (!$filteremail) {
+		print_liste_field_titre("NbOfEMails", $_SERVER["PHP_SELF"], "m.nbemail", $param, "", 'align="center"', $sortfield, $sortorder);
+	}
+	if (!$filteremail) {
+		print_liste_field_titre("DateLastSend", $_SERVER["PHP_SELF"], "m.date_envoi", $param, "", 'align="center"', $sortfield, $sortorder);
+	} else {
+		print_liste_field_titre("DateSending", $_SERVER["PHP_SELF"], "mc.date_envoi", $param, "", 'align="center"', $sortfield, $sortorder);
+	}
 	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], ($filteremail ? "mc.statut" : "m.statut"), $param, "", 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', 'class="right"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print "</tr>\n";
@@ -284,7 +327,9 @@ 
 	}
 	if (empty($num)) {
 		$colspan = 6;
-		if (!$filteremail) $colspan++;
+		if (!$filteremail) {
+			$colspan++;
+		}
 		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 	}