diff --git a/htdocs/ecm/ajax/ecmdatabase.php b/htdocs/ecm/ajax/ecmdatabase.php
index e817f6af4a4..4d782a3caeb 100644
--- a/htdocs/ecm/ajax/ecmdatabase.php
+++ b/htdocs/ecm/ajax/ecmdatabase.php
@@ -20,10 +20,18 @@
  *       \brief      File to build ecm database
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -40,12 +48,10 @@ top_httphead();
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
-if (isset($action) && !empty($action))
-{
+if (isset($action) && !empty($action)) {
 	$error = 0;
 
-	if ($action == 'build' && !empty($element))
-	{
+	if ($action == 'build' && !empty($element)) {
 		require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 
 		$ecmdirstatic = new EcmDirectory($db);
@@ -68,22 +74,18 @@ if (isset($action) && !empty($action))
 		// Now we compare both trees to complete missing trees into database
 		//var_dump($disktree);
 		//var_dump($sqltree);
-		foreach ($disktree as $dirdesc)    // Loop on tree onto disk
-		{
+		foreach ($disktree as $dirdesc) {    // Loop on tree onto disk
 			set_time_limit(0); // To force restarts the timeout counter from zero
 
 			$dirisindatabase = 0;
-			foreach ($sqltree as $dirsqldesc)
-			{
-				if ($conf->$element->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
-				{
+			foreach ($sqltree as $dirsqldesc) {
+				if ($conf->$element->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname']) {
 					$dirisindatabase = 1;
 					break;
 				}
 			}
 
-			if (!$dirisindatabase)
-			{
+			if (!$dirisindatabase) {
 				$txt = "Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
 				dol_syslog($txt);
 
@@ -92,24 +94,20 @@ if (isset($action) && !empty($action))
 				$relativepathmissing = str_replace($diroutputslash, '', $dirdesc['fullname']);
 				$relativepathtosearchparent = $relativepathmissing;
 				//dol_syslog("Try to find parent id for directory ".$relativepathtosearchparent);
-				if (preg_match('/\//', $relativepathtosearchparent))
+				if (preg_match('/\//', $relativepathtosearchparent)) {
 					//while (preg_match('/\//',$relativepathtosearchparent))
-				{
 					$relativepathtosearchparent = preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
 					$txt = "Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
 					dol_syslog($txt);
 					//print $txt." -> ";
 					$parentdirisindatabase = 0;
-					foreach ($sqltree as $dirsqldesc)
-					{
-						if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent)
-						{
+					foreach ($sqltree as $dirsqldesc) {
+						if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent) {
 							$parentdirisindatabase = $dirsqldesc['id'];
 							break;
 						}
 					}
-					if ($parentdirisindatabase > 0)
-					{
+					if ($parentdirisindatabase > 0) {
 						dol_syslog("Yes with id ".$parentdirisindatabase);
 						//print "Yes with id ".$parentdirisindatabase."<br>\n";
 						$fk_parent = $parentdirisindatabase;
@@ -123,8 +121,7 @@ if (isset($action) && !empty($action))
 					$fk_parent = 0; // Parent is root
 				}
 
-				if ($fk_parent >= 0)
-				{
+				if ($fk_parent >= 0) {
 					$ecmdirtmp->ref                = 'NOTUSEDYET';
 					$ecmdirtmp->label              = dol_basename($dirdesc['fullname']);
 					$ecmdirtmp->description        = '';
@@ -134,8 +131,7 @@ if (isset($action) && !empty($action))
 					dol_syslog($txt);
 					//print $txt."<br>\n";
 					$id = $ecmdirtmp->create($user);
-					if ($id > 0)
-					{
+					if ($id > 0) {
 						$newdirsql = array('id'=>$id,
 								'id_mere'=>$ecmdirtmp->fk_parent,
 								'label'=>$ecmdirtmp->label,
@@ -156,11 +152,9 @@ if (isset($action) && !empty($action))
 		}
 
 		// Loop now on each sql tree to check if dir exists
-		foreach ($sqltree as $dirdesc)    // Loop on each sqltree to check dir is on disk
-		{
+		foreach ($sqltree as $dirdesc) {    // Loop on each sqltree to check dir is on disk
 			$dirtotest = $conf->$element->dir_output.'/'.$dirdesc['fullrelativename'];
-			if (!dol_is_dir($dirtotest))
-			{
+			if (!dol_is_dir($dirtotest)) {
 				$mesg .= $dirtotest." not found onto disk. We delete from database dir with id=".$dirdesc['id']."<br>\n";
 				$ecmdirtmp->id = $dirdesc['id'];
 				$ecmdirtmp->delete($user, 'databaseonly');
diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php
index 5866ba16893..4b9d0a847f2 100644
--- a/htdocs/ecm/class/htmlecm.form.class.php
+++ b/htdocs/ecm/class/htmlecm.form.class.php
@@ -62,31 +62,29 @@ class FormEcm
 		global $conf, $langs;
 		$langs->load("ecm");
 
-		if ($select_name == '') $select_name = "catParent";
+		if ($select_name == '') {
+			$select_name = "catParent";
+		}
 
 		$cate_arbo = null;
-		if ($module == 'ecm')
-		{
+		if ($module == 'ecm') {
 			$cat = new EcmDirectory($this->db);
 			$cate_arbo = $cat->get_full_arbo();
-		} elseif ($module == 'medias')
-		{
+		} elseif ($module == 'medias') {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			$path = $conf->medias->multidir_output[$conf->entity];
 			$cate_arbo = dol_dir_list($path, 'directories', 1, '', array('(\.meta|_preview.*\.png)$', '^\.'), 'relativename', SORT_ASC);
 		}
 
 		$output = '<select class="flat minwidth100 maxwidth500" id="'.$select_name.'" name="'.$select_name.'">';
-		if (is_array($cate_arbo))
-		{
-			if (!count($cate_arbo)) $output .= '<option value="-1" disabled>'.$langs->trans("NoDirectoriesFound").'</option>';
-			else {
+		if (is_array($cate_arbo)) {
+			if (!count($cate_arbo)) {
+				$output .= '<option value="-1" disabled>'.$langs->trans("NoDirectoriesFound").'</option>';
+			} else {
 				$output .= '<option value="-1">&nbsp;</option>';
-				foreach ($cate_arbo as $key => $value)
-				{
+				foreach ($cate_arbo as $key => $value) {
 					$valueforoption = empty($cate_arbo[$key]['id']) ? $cate_arbo[$key]['relativename'] : $cate_arbo[$key]['id'];
-					if ($selected && $valueforoption == $selected)
-					{
+					if ($selected && $valueforoption == $selected) {
 						$add = 'selected ';
 					} else {
 						$add = '';
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 8b86f99d2c7..4c93e005266 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -40,23 +40,30 @@ $confirm    = GETPOST('confirm', 'alpha');
 $module  = GETPOST('module', 'alpha');
 $website = GETPOST('website', 'alpha');
 $pageid  = GETPOST('pageid', 'int');
-if (empty($module)) $module = 'ecm';
+if (empty($module)) {
+	$module = 'ecm';
+}
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 $section = GETPOST("section", 'alpha') ? GETPOST("section", 'alpha') : GETPOST("relativedir", 'alpha');
-if (!$section)
-{
+if (!$section) {
 	dol_print_error('', "ErrorSectionParamNotDefined");
 	exit;
 }
@@ -64,8 +71,7 @@ if (!$section)
 // Load ecm object
 $ecmdir = new EcmDirectory($db);
 
-if ($module == 'ecm')
-{
+if ($module == 'ecm') {
 	// $section should be an int except if it is dir not yet created into EcmDirectory
 	$result = $ecmdir->fetch($section);
 	if ($result > 0) {
@@ -84,13 +90,11 @@ if ($module == 'ecm')
 // Permissions
 $permtoadd = 0;
 $permtoupload = 0;
-if ($module == 'ecm')
-{
+if ($module == 'ecm') {
 	$permtoadd = $user->rights->ecm->setup;
 	$permtoupload = $user->rights->ecm->upload;
 }
-if ($module == 'medias')
-{
+if ($module == 'medias') {
 	$permtoadd = ($user->rights->mailing->creer || $user->rights->website->write);
 	$permtoupload = ($user->rights->mailing->creer || $user->rights->website->write);
 }
@@ -102,18 +106,14 @@ if ($module == 'medias')
  */
 
 // Upload file
-if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
-{
-	if (dol_mkdir($upload_dir) >= 0)
-	{
+if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC)) {
+	if (dol_mkdir($upload_dir) >= 0) {
 		$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir."/".dol_unescapefile($_FILES['userfile']['name']), 0, 0, $_FILES['userfile']['error']);
-		if (is_numeric($resupload) && $resupload > 0)
-		{
+		if (is_numeric($resupload) && $resupload > 0) {
 			$result = $ecmdir->changeNbOfFiles('+');
 		} else {
-   			$langs->load("errors");
-			if ($resupload < 0)	// Unknown error
-			{
+			$langs->load("errors");
+			if ($resupload < 0) {	// Unknown error
 				setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 			} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload)) {
 				// Files infected by a virus
@@ -131,13 +131,15 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 }
 
 // Remove file
-if ($action == 'confirm_deletefile' && $confirm == 'yes')
-{
+if ($action == 'confirm_deletefile' && $confirm == 'yes') {
 	$langs->load("other");
 	$file = $upload_dir."/".GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
 	$ret = dol_delete_file($file);
-	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+	if ($ret) {
+		setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+	}
 
 	$result = $ecmdir->changeNbOfFiles('-');
 }
@@ -164,8 +166,9 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes') {
 		} else {
 			$resbool = dol_delete_dir($upload_dir, 1);
 		}
-		if ($resbool) $result = 1;
-		else {
+		if ($resbool) {
+			$result = 1;
+		} else {
 			$langs->load('errors');
 			setEventMessages($langs->trans("ErrorFailToDeleteDir", $upload_dir), null, 'errors');
 			$result = 0;
@@ -178,12 +181,10 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes') {
 }
 
 // Update dirname or description
-if ($action == 'update' && !GETPOST('cancel', 'alpha'))
-{
+if ($action == 'update' && !GETPOST('cancel', 'alpha')) {
 	$error = 0;
 
-	if ($module == 'ecm')
-	{
+	if ($module == 'ecm') {
 		$oldlabel = $ecmdir->label;
 		$olddir = $ecmdir->getRelativePath(0);
 		$olddir = $conf->ecm->dir_output.'/'.$olddir;
@@ -192,15 +193,16 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 		$olddir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
 	}
 
-	if ($module == 'ecm')
-	{
+	if ($module == 'ecm') {
 		$db->begin();
 
 		// Fetch was already done
 		$ecmdir->label = dol_sanitizeFileName(GETPOST("label"));
 		$ecmdir->description = GETPOST("description");
 		$ret = $extrafields->setOptionalsFromPost(null, $ecmdir);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 		if (!$error) {
 			// Actions on extra fields
 			$result = $ecmdir->insertExtraFields();
@@ -210,25 +212,21 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 			}
 		}
 		$result = $ecmdir->update($user);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			// Try to rename file if changed
-			if ($oldlabel != $ecmdir->label && file_exists($olddir))
-			{
+			if ($oldlabel != $ecmdir->label && file_exists($olddir)) {
 				$newdir = $ecmdir->getRelativePath(1); // return "xxx/zzz/" from ecm directory
 				$newdir = $conf->ecm->dir_output.'/'.$newdir;
 				//print $olddir.'-'.$newdir;
 				$result = @rename($olddir, $newdir);
-				if (!$result)
-				{
+				if (!$result) {
 					$langs->load('errors');
 					setEventMessages($langs->trans('ErrorFailToRenameDir', $olddir, $newdir), null, 'errors');
 					$error++;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$db->commit();
 
 				// Set new value after renaming
@@ -245,15 +243,13 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 		$newdir = $conf->medias->multidir_output[$conf->entity].'/'.GETPOST('oldrelparentdir', 'alpha').'/'.GETPOST('label', 'alpha');
 
 		$result = @rename($olddir, $newdir);
-		if (!$result)
-		{
+		if (!$result) {
 			$langs->load('errors');
 			setEventMessages($langs->trans('ErrorFailToRenameDir', $olddir, $newdir), null, 'errors');
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Set new value after renaming
 			$relativepath = GETPOST('oldrelparentdir', 'alpha').'/'.GETPOST('label', 'alpha');
 			$upload_dir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
@@ -284,8 +280,7 @@ llxHeader();
 $filearrayall = dol_dir_list($upload_dir, "all", 0, '', '', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 $totalsize = 0;
-foreach ($filearray as $key => $file)
-{
+foreach ($filearray as $key => $file) {
 	$totalsize += $file['size'];
 }
 
@@ -294,8 +289,7 @@ $head = ecm_prepare_head($ecmdir, $module, $section);
 print dol_get_fiche_head($head, 'card', $langs->trans("ECMSectionManual"), -1, 'dir');
 
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="section" value="'.$section.'">';
@@ -308,23 +302,21 @@ $morehtml = '';
 
 $morehtmlref = '/'.$module.'/'.$relativepath;
 
-if ($module == 'ecm')
-{
+if ($module == 'ecm') {
 	$s = '';
 	$result = 1;
 	$i = 0;
 	$tmpecmdir = new EcmDirectory($db); // Need to create a new one
 	if ($ecmdir->id > 0) {
 		$tmpecmdir->fetch($ecmdir->id);
-		while ($tmpecmdir && $result > 0)
-		{
+		while ($tmpecmdir && $result > 0) {
 			$tmpecmdir->ref = $tmpecmdir->label;
-			if ($i == 0 && $action == 'edit')
-			{
+			if ($i == 0 && $action == 'edit') {
 				$s = '<input type="text" name="label" class="minwidth300" maxlength="32" value="'.$tmpecmdir->label.'">';
-			} else $s = $tmpecmdir->getNomUrl(1).$s;
-			if ($tmpecmdir->fk_parent)
-			{
+			} else {
+				$s = $tmpecmdir->getNomUrl(1).$s;
+			}
+			if ($tmpecmdir->fk_parent) {
 				$s = ' -> '.$s;
 				$result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
 			} else {
@@ -337,25 +329,22 @@ if ($module == 'ecm')
 	}
 	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/ecm/index.php">'.$langs->trans("ECMRoot").'</a> -> '.$s;
 }
-if ($module == 'medias')
-{
+if ($module == 'medias') {
 	$s = 'medias -> ';
 	$result = 1;
 	$subdirs = explode('/', $section);
 	$i = 0;
-	foreach ($subdirs as $subdir)
-	{
-		if ($i == (count($subdirs) - 1))
-		{
-			if ($action == 'edit')
-			{
+	foreach ($subdirs as $subdir) {
+		if ($i == (count($subdirs) - 1)) {
+			if ($action == 'edit') {
 				$s .= '<input type="text" name="label" class="minwidth300" maxlength="32" value="'.$subdir.'">';
 				$s .= '<input type="hidden" name="oldrelparentdir" value="'.dirname($section).'">';
 				$s .= '<input type="hidden" name="oldreldir" value="'.basename($section).'">';
-			} else $s .= $subdir;
+			} else {
+				$s .= $subdir;
+			}
 		}
-		if ($i < (count($subdirs) - 1))
-		{
+		if ($i < (count($subdirs) - 1)) {
 			$s .= $subdir.' -> ';
 		}
 		$i++;
@@ -375,15 +364,15 @@ print '<table class="border centpercent tableforfield">';
 print img_picto('','object_dir').' <a href="'.DOL_URL_ROOT.'/ecm/index.php">'.$langs->trans("ECMRoot").'</a> -> ';
 print $s;
 print '</td></tr>';*/
-if ($module == 'ecm')
-{
+if ($module == 'ecm') {
 	print '<tr><td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-	if ($action == 'edit')
-	{
+	if ($action == 'edit') {
 		print '<textarea class="flat quatrevingtpercent" name="description">';
 		print $ecmdir->description;
 		print '</textarea>';
-	} else print dol_nl2br($ecmdir->description);
+	} else {
+		print dol_nl2br($ecmdir->description);
+	}
 	print '</td></tr>';
 
 	print '<tr><td class="titlefield">'.$langs->trans("ECMCreationUser").'</td><td>';
@@ -395,8 +384,7 @@ if ($module == 'ecm')
 	print '</td></tr>';
 }
 print '<tr><td class="titlefield">'.$langs->trans("ECMCreationDate").'</td><td>';
-if ($module == 'ecm')
-{
+if ($module == 'ecm') {
 	print dol_print_date($ecmdir->date_c, 'dayhour');
 } else {
 	//var_dump($upload_dir);
@@ -404,8 +392,7 @@ if ($module == 'ecm')
 }
 print '</td></tr>';
 print '<tr><td>'.$langs->trans("ECMDirectoryForFiles").'</td><td>';
-if ($module == 'ecm')
-{
+if ($module == 'ecm') {
 	print '/ecm/'.$relativepath;
 } else {
 	print '/'.$module.'/'.$relativepath;
@@ -414,11 +401,9 @@ print '</td></tr>';
 print '<tr><td>'.$langs->trans("ECMNbOfDocs").'</td><td>';
 $nbofiles = count($filearray);
 print $nbofiles;
-if ($ecmdir->id > 0)
-{
+if ($ecmdir->id > 0) {
 	// Test if nb is same than in cache
-	if ($nbofiles != $ecmdir->cachenbofdoc)
-	{
+	if ($nbofiles != $ecmdir->cachenbofdoc) {
 		$ecmdir->changeNbOfFiles((string) $nbofiles);
 	}
 }
@@ -429,8 +414,7 @@ print '</td></tr>';
 print $object->showOptionals($extrafields, ($action == 'edit' ? 'edit' : 'view'));
 print '</table>';
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	print '<br><div align="center">';
 	print '<input type="submit" class="button button-save" name="submit" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; &nbsp; ';
@@ -439,8 +423,7 @@ if ($action == 'edit')
 }
 
 print '</div>';
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	print '</form>';
 }
 
@@ -449,17 +432,14 @@ print dol_get_fiche_end();
 
 
 // Actions buttons
-if ($action != 'edit' && $action != 'delete')
-{
+if ($action != 'edit' && $action != 'delete') {
 	print '<div class="tabsAction">';
 
-	if ($permtoadd)
-	{
+	if ($permtoadd) {
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit'.($module ? '&module='.$module : '').'&section='.$section.'">'.$langs->trans('Edit').'</a>';
 	}
 
-	if ($permtoadd)
-	{
+	if ($permtoadd) {
 		print '<a class="butAction" href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create'.($module ? '&module='.$module : '').'&catParent='.$section.'">'.$langs->trans('ECMAddSection').'</a>';
 	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('ECMAddSection').'</a>';
@@ -467,8 +447,7 @@ if ($action != 'edit' && $action != 'delete')
 
 	//if (count($filearrayall) == 0)
 	//{
-	if ($permtoadd)
-	{
+	if ($permtoadd) {
 		print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete_dir&token='.newToken().($module ? '&module='.$module : '').'&section='.$section.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.$langs->trans('Delete').'</a>';
 	} else {
 		print '<a class="butActionDeleteRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
@@ -485,19 +464,16 @@ if ($action != 'edit' && $action != 'delete')
 }
 
 // Confirm remove file
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.GETPOST("section", 'alpha').'&urlfile='.urlencode($_GET["urlfile"]).($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile');
 }
 
 // Confirm remove file
-if ($action == 'delete_dir')
-{
+if ($action == 'delete_dir') {
 	$relativepathwithoutslash = preg_replace('/[\/]$/', '', $relativepath);
 
 	//Form to close proposal (signed or not)
-	if (count($filearrayall) > 0)
-	{
+	if (count($filearrayall) > 0) {
 		$langs->load("other");
 		$formquestion = array(
 			array('type' => 'checkbox', 'name' => 'deletedirrecursive', 'label' => $langs->trans("ContentOfDirectoryIsNotEmpty").'<br>'.$langs->trans("DeleteAlsoContentRecursively"), 'value' => '0')				// Field to complete private note (not replace)
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 8feff24e4c3..26bf242b0f2 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -35,33 +35,41 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 $langs->loadLangs(array("ecm", "companies", "other", "users", "orders", "propal", "bills", "contracts"));
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'ecm', 0);
 
 // Get parameters
 $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
 $section = GETPOST('section', 'int') ?GETPOST('section', 'int') : GETPOST('section_id', 'int');
-if (!$section) $section = 0;
+if (!$section) {
+	$section = 0;
+}
 $section_dir = GETPOST('section_dir', 'alpha');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "fullname";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "fullname";
+}
 
 $ecmdir = new EcmDirectory($db);
-if ($section > 0)
-{
+if ($section > 0) {
 	$result = $ecmdir->fetch($section);
-	if (!$result > 0)
-	{
+	if (!$result > 0) {
 		dol_print_error($db, $ecmdir->error);
 		exit;
 	}
@@ -83,21 +91,24 @@ $error = 0;
 //include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 // Upload file (code similar but different than actions_linkedfiles.inc.php)
-if (GETPOST("sendit", 'alphanohtml') && !empty($conf->global->MAIN_UPLOAD_DOC))
-{
+if (GETPOST("sendit", 'alphanohtml') && !empty($conf->global->MAIN_UPLOAD_DOC)) {
 	// Define relativepath and upload_dir
 	$relativepath = '';
-	if ($ecmdir->id) $relativepath = $ecmdir->getRelativePath();
-	else $relativepath = $section_dir;
+	if ($ecmdir->id) {
+		$relativepath = $ecmdir->getRelativePath();
+	} else {
+		$relativepath = $section_dir;
+	}
 	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
 
-	if (is_array($_FILES['userfile']['tmp_name'])) $userfiles = $_FILES['userfile']['tmp_name'];
-	else $userfiles = array($_FILES['userfile']['tmp_name']);
+	if (is_array($_FILES['userfile']['tmp_name'])) {
+		$userfiles = $_FILES['userfile']['tmp_name'];
+	} else {
+		$userfiles = array($_FILES['userfile']['tmp_name']);
+	}
 
-	foreach ($userfiles as $key => $userfile)
-	{
-		if (empty($_FILES['userfile']['tmp_name'][$key]))
-		{
+	foreach ($userfiles as $key => $userfile) {
+		if (empty($_FILES['userfile']['tmp_name'][$key])) {
 			$error++;
 			if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2) {
 				setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors');
@@ -107,29 +118,24 @@ if (GETPOST("sendit", 'alphanohtml') && !empty($conf->global->MAIN_UPLOAD_DOC))
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$generatethumbs = 0;
 		$res = dol_add_file_process($upload_dir, 0, 1, 'userfile', '', null, '', $generatethumbs);
-		if ($res > 0)
-		{
+		if ($res > 0) {
 			$result = $ecmdir->changeNbOfFiles('+');
 		}
 	}
 }
 
 // Remove file (code similar but different than actions_linkedfiles.inc.php)
-if ($action == 'confirm_deletefile')
-{
-	if (GETPOST('confirm') == 'yes')
-	{
+if ($action == 'confirm_deletefile') {
+	if (GETPOST('confirm') == 'yes') {
 		// GETPOST('urlfile','alpha') is full relative URL from ecm root dir. Contains path of all sections.
 
 		$upload_dir = $conf->ecm->dir_output.($relativepath ? '/'.$relativepath : '');
 		$file = $upload_dir."/".GETPOST('urlfile', 'alpha');
 		$ret = dol_delete_file($file); // This include also the delete from file index in database.
-		if ($ret)
-		{
+		if ($ret) {
 			$urlfiletoshow = GETPOST('urlfile', 'alpha');
 			$urlfiletoshow = preg_replace('/\.noexe$/', '', $urlfiletoshow);
 			setEventMessages($langs->trans("FileWasRemoved", $urlfiletoshow), null, 'mesgs');
@@ -144,15 +150,13 @@ if ($action == 'confirm_deletefile')
 }
 
 // Add directory
-if ($action == 'add' && $user->rights->ecm->setup)
-{
+if ($action == 'add' && $user->rights->ecm->setup) {
 	$ecmdir->ref                = 'NOTUSEDYET';
 	$ecmdir->label              = GETPOST("label");
 	$ecmdir->description        = GETPOST("desc");
 
 	$id = $ecmdir->create($user);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
@@ -164,8 +168,7 @@ if ($action == 'add' && $user->rights->ecm->setup)
 }
 
 // Remove directory
-if ($action == 'confirm_deletesection' && GETPOST('confirm', 'alpha') == 'yes')
-{
+if ($action == 'confirm_deletesection' && GETPOST('confirm', 'alpha') == 'yes') {
 	$result = $ecmdir->delete($user);
 	setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
 
@@ -175,8 +178,7 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm', 'alpha') == 'yes')
 // Refresh directory view
 // This refresh list of dirs, not list of files (for preformance reason). List of files is refresh only if dir was not synchronized.
 // To refresh content of dir with cache, just open the dir in edit mode.
-if ($action == 'refreshmanual')
-{
+if ($action == 'refreshmanual') {
 	$ecmdirtmp = new EcmDirectory($db);
 
 	// This part of code is same than into file ecm/ajax/ecmdatabase.php TODO Remove duplicate
@@ -196,20 +198,16 @@ if ($action == 'refreshmanual')
 	// Now we compare both trees to complete missing trees into database
 	//var_dump($disktree);
 	//var_dump($sqltree);
-	foreach ($disktree as $dirdesc)    // Loop on tree onto disk
-	{
+	foreach ($disktree as $dirdesc) {    // Loop on tree onto disk
 		$dirisindatabase = 0;
-		foreach ($sqltree as $dirsqldesc)
-		{
-			if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
-			{
+		foreach ($sqltree as $dirsqldesc) {
+			if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname']) {
 				$dirisindatabase = 1;
 				break;
 			}
 		}
 
-		if (!$dirisindatabase)
-		{
+		if (!$dirisindatabase) {
 			$txt = "Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
 			dol_syslog($txt);
 			//print $txt."<br>\n";
@@ -219,24 +217,20 @@ if ($action == 'refreshmanual')
 			$relativepathmissing = str_replace($diroutputslash, '', $dirdesc['fullname']);
 			$relativepathtosearchparent = $relativepathmissing;
 			//dol_syslog("Try to find parent id for directory ".$relativepathtosearchparent);
-			if (preg_match('/\//', $relativepathtosearchparent))
-			//while (preg_match('/\//',$relativepathtosearchparent))
-			{
+			if (preg_match('/\//', $relativepathtosearchparent)) {
+				//while (preg_match('/\//',$relativepathtosearchparent))
 				$relativepathtosearchparent = preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
 				$txt = "Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
 				dol_syslog($txt);
 				//print $txt." -> ";
 				$parentdirisindatabase = 0;
-				foreach ($sqltree as $dirsqldesc)
-				{
-					if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent)
-					{
+				foreach ($sqltree as $dirsqldesc) {
+					if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent) {
 						$parentdirisindatabase = $dirsqldesc['id'];
 						break;
 					}
 				}
-				if ($parentdirisindatabase > 0)
-				{
+				if ($parentdirisindatabase > 0) {
 					dol_syslog("Yes with id ".$parentdirisindatabase);
 					//print "Yes with id ".$parentdirisindatabase."<br>\n";
 					$fk_parent = $parentdirisindatabase;
@@ -250,8 +244,7 @@ if ($action == 'refreshmanual')
 				$fk_parent = 0; // Parent is root
 			}
 
-			if ($fk_parent >= 0)
-			{
+			if ($fk_parent >= 0) {
 				$ecmdirtmp->ref                = 'NOTUSEDYET';
 				$ecmdirtmp->label              = dol_basename($dirdesc['fullname']);
 				$ecmdirtmp->description        = '';
@@ -261,8 +254,7 @@ if ($action == 'refreshmanual')
 				dol_syslog($txt);
 				//print $ecmdirtmp->cachenbofdoc."<br>\n";exit;
 				$id = $ecmdirtmp->create($user);
-				if ($id > 0)
-				{
+				if ($id > 0) {
 					$newdirsql = array('id'=>$id,
 									 'id_mere'=>$ecmdirtmp->fk_parent,
 									 'label'=>$ecmdirtmp->label,
@@ -283,11 +275,9 @@ if ($action == 'refreshmanual')
 	}
 
 	// Loop now on each sql tree to check if dir exists
-	foreach ($sqltree as $dirdesc)    // Loop on each sqltree to check dir is on disk
-	{
+	foreach ($sqltree as $dirdesc) {    // Loop on each sqltree to check dir is on disk
 		$dirtotest = $conf->ecm->dir_output.'/'.$dirdesc['fullrelativename'];
-		if (!dol_is_dir($dirtotest))
-		{
+		if (!dol_is_dir($dirtotest)) {
 			$ecmdirtmp->id = $dirdesc['id'];
 			$ecmdirtmp->delete($user, 'databaseonly');
 			//exit;
@@ -300,7 +290,9 @@ if ($action == 'refreshmanual')
 
 	// If a directory was added, the fulltree array is not correctly completed and sorted, so we clean
 	// it to be sure that fulltree array is not used without reloading it.
-	if ($adirwascreated) $sqltree = null;
+	if ($adirwascreated) {
+		$sqltree = null;
+	}
 }
 
 
@@ -318,7 +310,9 @@ $moreheadjs = '';
 
 //$morejs=array();
 $morejs = array('includes/jquery/plugins/blockUI/jquery.blockUI.js', 'core/js/blockUI.js'); // Used by ecm/tpl/enabledfiletreeajax.tpl.pgp
-if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $morejs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
+if (empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+	$morejs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
+}
 
 $moreheadjs .= '<script type="text/javascript">'."\n";
 $moreheadjs .= 'var indicatorBlockUI = \''.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'\';'."\n";
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 9d8e1527b9b..f20985d45fb 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -34,7 +34,9 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 $langs->loadLangs(array("ecm", "companies", "other", "users", "orders", "propal", "bills", "contracts"));
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'ecm', 0);
 
 // Get parameters
@@ -42,7 +44,9 @@ $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
 $section = GETPOST('section', 'int') ?GETPOST('section', 'int') : GETPOST('section_id', 'int');
 $module = GETPOST('module', 'alpha');
-if (!$section) $section = 0;
+if (!$section) {
+	$section = 0;
+}
 $section_dir = GETPOST('section_dir', 'alpha');
 
 $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
@@ -51,20 +55,26 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "fullname";
-if ($module == 'invoice_supplier' && $sortfield == "fullname") $sortfield = "level1name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "fullname";
+}
+if ($module == 'invoice_supplier' && $sortfield == "fullname") {
+	$sortfield = "level1name";
+}
 
 $ecmdir = new EcmDirectory($db);
-if ($section)
-{
+if ($section) {
 	$result = $ecmdir->fetch($section);
-	if (!$result > 0)
-	{
+	if (!$result > 0) {
 		dol_print_error($db, $ecmdir->error);
 		exit;
 	}
@@ -85,8 +95,7 @@ $error = 0;
 $hookmanager->initHooks(array('ecmautocard', 'globalcard'));
 
 // 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
 	$search_doc_ref = '';
 }
 
@@ -94,15 +103,13 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 
 
 // Add directory
-if ($action == 'add' && $user->rights->ecm->setup)
-{
+if ($action == 'add' && $user->rights->ecm->setup) {
 	$ecmdir->ref                = 'NOTUSEDYET';
 	$ecmdir->label              = GETPOST("label");
 	$ecmdir->description        = GETPOST("desc");
 
 	$id = $ecmdir->create($user);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
@@ -114,38 +121,38 @@ if ($action == 'add' && $user->rights->ecm->setup)
 }
 
 // Remove file
-if ($action == 'confirm_deletefile')
-{
-	if (GETPOST('confirm') == 'yes')
-	{
+if ($action == 'confirm_deletefile') {
+	if (GETPOST('confirm') == 'yes') {
 		$langs->load("other");
-		if ($section)
-		{
+		if ($section) {
 			$result = $ecmdir->fetch($section);
-			if (!($result > 0))
-			{
+			if (!($result > 0)) {
 				dol_print_error($db, $ecmdir->error);
 				exit;
 			}
 			$relativepath = $ecmdir->getRelativePath();
-		} else $relativepath = '';
+		} else {
+			$relativepath = '';
+		}
 		$upload_dir = $conf->ecm->dir_output.($relativepath ? '/'.$relativepath : '');
 		$file = $upload_dir."/".GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_POST are already decoded by PHP).
 
 		$ret = dol_delete_file($file);
-		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+		if ($ret) {
+			setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+		}
 
 		$result = $ecmdir->changeNbOfFiles('-');
 
 		clearstatcache();
 	}
-   	$action = 'file_manager';
+	$action = 'file_manager';
 }
 
 // Remove directory
-if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes')
-{
+if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes') {
 	$result = $ecmdir->delete($user);
 	setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
 
@@ -155,8 +162,7 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes')
 // Refresh directory view
 // This refresh list of dirs, not list of files (for preformance reason). List of files is refresh only if dir was not synchronized.
 // To refresh content of dir with cache, just open the dir in edit mode.
-if ($action == 'refreshmanual')
-{
+if ($action == 'refreshmanual') {
 	$ecmdirtmp = new EcmDirectory($db);
 
 	// This part of code is same than into file ecm/ajax/ecmdatabase.php TODO Remove duplicate
@@ -176,20 +182,16 @@ if ($action == 'refreshmanual')
 	// Now we compare both trees to complete missing trees into database
 	//var_dump($disktree);
 	//var_dump($sqltree);
-	foreach ($disktree as $dirdesc)    // Loop on tree onto disk
-	{
+	foreach ($disktree as $dirdesc) {    // Loop on tree onto disk
 		$dirisindatabase = 0;
-		foreach ($sqltree as $dirsqldesc)
-		{
-			if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
-			{
+		foreach ($sqltree as $dirsqldesc) {
+			if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname']) {
 				$dirisindatabase = 1;
 				break;
 			}
 		}
 
-		if (!$dirisindatabase)
-		{
+		if (!$dirisindatabase) {
 			$txt = "Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
 			dol_syslog($txt);
 			//print $txt."<br>\n";
@@ -199,24 +201,20 @@ if ($action == 'refreshmanual')
 			$relativepathmissing = str_replace($diroutputslash, '', $dirdesc['fullname']);
 			$relativepathtosearchparent = $relativepathmissing;
 			//dol_syslog("Try to find parent id for directory ".$relativepathtosearchparent);
-			if (preg_match('/\//', $relativepathtosearchparent))
-			//while (preg_match('/\//',$relativepathtosearchparent))
-			{
+			if (preg_match('/\//', $relativepathtosearchparent)) {
+				//while (preg_match('/\//',$relativepathtosearchparent))
 				$relativepathtosearchparent = preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
 				$txt = "Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
 				dol_syslog($txt);
 				//print $txt." -> ";
 				$parentdirisindatabase = 0;
-				foreach ($sqltree as $dirsqldesc)
-				{
-					if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent)
-					{
+				foreach ($sqltree as $dirsqldesc) {
+					if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent) {
 						$parentdirisindatabase = $dirsqldesc['id'];
 						break;
 					}
 				}
-				if ($parentdirisindatabase > 0)
-				{
+				if ($parentdirisindatabase > 0) {
 					dol_syslog("Yes with id ".$parentdirisindatabase);
 					//print "Yes with id ".$parentdirisindatabase."<br>\n";
 					$fk_parent = $parentdirisindatabase;
@@ -230,8 +228,7 @@ if ($action == 'refreshmanual')
 				$fk_parent = 0; // Parent is root
 			}
 
-			if ($fk_parent >= 0)
-			{
+			if ($fk_parent >= 0) {
 				$ecmdirtmp->ref                = 'NOTUSEDYET';
 				$ecmdirtmp->label              = dol_basename($dirdesc['fullname']);
 				$ecmdirtmp->description        = '';
@@ -241,8 +238,7 @@ if ($action == 'refreshmanual')
 				dol_syslog($txt);
 				//print $ecmdirtmp->cachenbofdoc."<br>\n";exit;
 				$id = $ecmdirtmp->create($user);
-				if ($id > 0)
-				{
+				if ($id > 0) {
 					$newdirsql = array('id'=>$id,
 									 'id_mere'=>$ecmdirtmp->fk_parent,
 									 'label'=>$ecmdirtmp->label,
@@ -263,11 +259,9 @@ if ($action == 'refreshmanual')
 	}
 
 	// Loop now on each sql tree to check if dir exists
-	foreach ($sqltree as $dirdesc)    // Loop on each sqltree to check dir is on disk
-	{
+	foreach ($sqltree as $dirdesc) {    // Loop on each sqltree to check dir is on disk
 		$dirtotest = $conf->ecm->dir_output.'/'.$dirdesc['fullrelativename'];
-		if (!dol_is_dir($dirtotest))
-		{
+		if (!dol_is_dir($dirtotest)) {
 			$ecmdirtmp->id = $dirdesc['id'];
 			$ecmdirtmp->delete($user, 'databaseonly');
 			//exit;
@@ -280,7 +274,9 @@ if ($action == 'refreshmanual')
 
 	// If a directory was added, the fulltree array is not correctly completed and sorted, so we clean
 	// it to be sure that fulltree array is not used without reloading it.
-	if ($adirwascreated) $sqltree = null;
+	if ($adirwascreated) {
+		$sqltree = null;
+	}
 }
 
 
@@ -298,7 +294,9 @@ $moreheadjs = '';
 
 //$morejs=array();
 $morejs = array('includes/jquery/plugins/blockUI/jquery.blockUI.js', 'core/js/blockUI.js'); // Used by ecm/tpl/enabledfiletreeajax.tpl.pgp
-if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $morejs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
+if (empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+	$morejs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
+}
 
 $moreheadjs .= '<script type="text/javascript">'."\n";
 $moreheadjs .= 'var indicatorBlockUI = \''.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'\';'."\n";
@@ -310,31 +308,63 @@ llxHeader($moreheadcss.$moreheadjs, $langs->trans("ECMArea"), '', '', '', '', $m
 // Add sections to manage
 $rowspan = 0;
 $sectionauto = array();
-if (!empty($conf->global->ECM_AUTO_TREE_ENABLED))
-{
-	if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { $langs->load("products"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'product', 'test'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts")); }
-	if (!empty($conf->societe->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties"))); }
-	if (!empty($conf->propal->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals"))); }
-	if (!empty($conf->contrat->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts"))); }
-	if (!empty($conf->commande->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders"))); }
-	if (!empty($conf->facture->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices"))); }
-	if (!empty($conf->supplier_proposal->enabled)) { $langs->load("supplier_proposal"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals"))); }
-	if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("PurchaseOrders"))); }
-	if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices"))); }
-	if (!empty($conf->tax->enabled)) { $langs->load("compta"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions"))); }
-	if (!empty($conf->projet->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects"))); }
-	if (!empty($conf->ficheinter->enabled)) { $langs->load("interventions"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions"))); }
-	if (!empty($conf->expensereport->enabled)) { $langs->load("trips"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports"))); }
-	if (!empty($conf->holiday->enabled)) { $langs->load("holiday"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays"))); }
-	if (!empty($conf->banque->enabled)) { $langs->load("banks"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'banque', 'test'=>$conf->banque->enabled, 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount"))); }
-	if (!empty($conf->mrp->enabled)) { $langs->load("mrp"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'mrp-mo', 'test'=>$conf->mrp->enabled, 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders"))); }
-	if (!empty($conf->recruitment->enabled)) { $langs->load("recruitment"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>$conf->recruitment->enabled, 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications"))); }
+if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
+	if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+		$langs->load("products"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'product', 'test'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts"));
+	}
+	if (!empty($conf->societe->enabled)) {
+		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties")));
+	}
+	if (!empty($conf->propal->enabled)) {
+		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals")));
+	}
+	if (!empty($conf->contrat->enabled)) {
+		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
+	}
+	if (!empty($conf->commande->enabled)) {
+		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
+	}
+	if (!empty($conf->facture->enabled)) {
+		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
+	}
+	if (!empty($conf->supplier_proposal->enabled)) {
+		$langs->load("supplier_proposal"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals")));
+	}
+	if (!empty($conf->fournisseur->enabled)) {
+		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("PurchaseOrders")));
+	}
+	if (!empty($conf->fournisseur->enabled)) {
+		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices")));
+	}
+	if (!empty($conf->tax->enabled)) {
+		$langs->load("compta"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions")));
+	}
+	if (!empty($conf->projet->enabled)) {
+		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects")));
+	}
+	if (!empty($conf->ficheinter->enabled)) {
+		$langs->load("interventions"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
+	}
+	if (!empty($conf->expensereport->enabled)) {
+		$langs->load("trips"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports")));
+	}
+	if (!empty($conf->holiday->enabled)) {
+		$langs->load("holiday"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays")));
+	}
+	if (!empty($conf->banque->enabled)) {
+		$langs->load("banks"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'banque', 'test'=>$conf->banque->enabled, 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount")));
+	}
+	if (!empty($conf->mrp->enabled)) {
+		$langs->load("mrp"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'mrp-mo', 'test'=>$conf->mrp->enabled, 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders")));
+	}
+	if (!empty($conf->recruitment->enabled)) {
+		$langs->load("recruitment"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>$conf->recruitment->enabled, 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications")));
+	}
 	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Users")));
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
-	if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray)>0)
-	{
+	if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray)>0) {
 		$sectionauto[]=$hookmanager->resArray;
 		$rowspan += count($hookmanager->resArray);
 	}
@@ -346,8 +376,7 @@ print dol_get_fiche_head($head, 'index_auto', '', -1, '');
 
 
 // Confirm remove file (for non javascript users)
-if ($action == 'delete' && empty($conf->use_javascript_ajax))
-{
+if ($action == 'delete' && empty($conf->use_javascript_ajax)) {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section.'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 1);
 }
 
@@ -378,15 +407,13 @@ print '</div>';
 
 
 // Confirmation de la suppression d'une ligne categorie
-if ($action == 'delete_section')
-{
+if ($action == 'delete_section') {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
 }
 // End confirm
 
 
-if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $action) || $action == 'delete')
-{
+if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $action) || $action == 'delete') {
 	print '<table width="100%" class="liste noborderbottom">'."\n";
 
 	print '<!-- Title for auto directories -->'."\n";
@@ -397,8 +424,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 
 	$showonrightsize = '';
 	// Auto section
-	if (count($sectionauto))
-	{
+	if (count($sectionauto)) {
 		$htmltooltip = $langs->trans("ECMAreaDesc2");
 
 		$sectionauto = dol_sort_array($sectionauto, 'label', 'ASC', true, false);
@@ -409,18 +435,18 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 
 		$nbofentries = 0;
 		$oldvallevel = 0;
-		foreach ($sectionauto as $key => $val)
-		{
-			if (empty($val['test'])) continue; // If condition to show is ok
+		foreach ($sectionauto as $key => $val) {
+			if (empty($val['test'])) {
+				continue; // If condition to show is ok
+			}
 
 			$var = false;
 
 			print '<li class="directory collapsed">';
-			if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
-			{
+			if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
 				print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
 				print $val['label'];
-   				print '</a>';
+				print '</a>';
 			} else {
 				print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
 				print $val['label'];
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index a3c242cb787..a665d57f1a3 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -33,7 +33,9 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 $langs->loadLangs(array("ecm", "companies", "other", "users", "orders", "propal", "bills", "contracts"));
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'ecm', '');
 
 // Load permissions
@@ -43,12 +45,16 @@ $user->getrights('ecm');
 $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
 $section = GETPOST('section');
-if (!$section) $section = 0;
+if (!$section) {
+	$section = 0;
+}
 
 $module  = GETPOST('module', 'alpha');
 $website = GETPOST('website', 'alpha');
 $pageid  = GETPOST('pageid', 'int');
-if (empty($module)) $module = 'ecm';
+if (empty($module)) {
+	$module = 'ecm';
+}
 
 $upload_dir = $conf->ecm->dir_output.'/'.$section;
 
@@ -56,19 +62,23 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "label";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "label";
+}
 
 $ecmdir = new EcmDirectory($db);
-if (!empty($section))
-{
+if (!empty($section)) {
 	$result = $ecmdir->fetch($section);
-	if (!$result > 0)
-	{
+	if (!$result > 0) {
 		dol_print_error($db, $ecmdir->error);
 		exit;
 	}
@@ -97,23 +107,57 @@ $userstatic = new User($db);
 // Ajout rubriques automatiques
 $rowspan = 0;
 $sectionauto = array();
-if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { $langs->load("products"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'product', 'test'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts")); }
-if (!empty($conf->societe->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties"))); }
-if (!empty($conf->propal->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals"))); }
-if (!empty($conf->contrat->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts"))); }
-if (!empty($conf->commande->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders"))); }
-if (!empty($conf->facture->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices"))); }
-if (!empty($conf->supplier_proposal->enabled)) { $langs->load("supplier_proposal"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals"))); }
-if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("PurchaseOrders"))); }
-if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices"))); }
-if (!empty($conf->tax->enabled)) { $langs->load("compta"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions"))); }
-if (!empty($conf->projet->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects"))); }
-if (!empty($conf->ficheinter->enabled)) { $langs->load("interventions"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions"))); }
-if (!empty($conf->expensereport->enabled)) { $langs->load("trips"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports"))); }
-if (!empty($conf->holiday->enabled)) { $langs->load("holiday"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays"))); }
-if (!empty($conf->banque->enabled)) { $langs->load("banks"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'banque', 'test'=>$conf->banque->enabled, 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount"))); }
-if (!empty($conf->mrp->enabled)) { $langs->load("mrp"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'mrp-mo', 'test'=>$conf->mrp->enabled, 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders"))); }
-if (!empty($conf->recruitment->enabled)) { $langs->load("recruitment"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>$conf->recruitment->enabled, 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications"))); }
+if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+	$langs->load("products"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'product', 'test'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts"));
+}
+if (!empty($conf->societe->enabled)) {
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties")));
+}
+if (!empty($conf->propal->enabled)) {
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals")));
+}
+if (!empty($conf->contrat->enabled)) {
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
+}
+if (!empty($conf->commande->enabled)) {
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
+}
+if (!empty($conf->facture->enabled)) {
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
+}
+if (!empty($conf->supplier_proposal->enabled)) {
+	$langs->load("supplier_proposal"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals")));
+}
+if (!empty($conf->fournisseur->enabled)) {
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("PurchaseOrders")));
+}
+if (!empty($conf->fournisseur->enabled)) {
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices")));
+}
+if (!empty($conf->tax->enabled)) {
+	$langs->load("compta"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions")));
+}
+if (!empty($conf->projet->enabled)) {
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects")));
+}
+if (!empty($conf->ficheinter->enabled)) {
+	$langs->load("interventions"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
+}
+if (!empty($conf->expensereport->enabled)) {
+	$langs->load("trips"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports")));
+}
+if (!empty($conf->holiday->enabled)) {
+	$langs->load("holiday"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays")));
+}
+if (!empty($conf->banque->enabled)) {
+	$langs->load("banks"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'banque', 'test'=>$conf->banque->enabled, 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount")));
+}
+if (!empty($conf->mrp->enabled)) {
+	$langs->load("mrp"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'mrp-mo', 'test'=>$conf->mrp->enabled, 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders")));
+}
+if (!empty($conf->recruitment->enabled)) {
+	$langs->load("recruitment"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>$conf->recruitment->enabled, 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications")));
+}
 
 
 //***********************
@@ -160,9 +204,10 @@ print '<td colspan="4">'.$langs->trans("ECMSearchByEntity").'</td></tr>';
 
 $buthtml = '<td rowspan="'.$rowspan.'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 $butshown = 0;
-foreach ($sectionauto as $sectioncur)
-{
-	if (!$sectioncur['test']) continue;
+foreach ($sectionauto as $sectioncur) {
+	if (!$sectioncur['test']) {
+		continue;
+	}
 	print '<tr class="impair">';
 	print "<td>".$sectioncur['label'].':</td>';
 	print '<td';
diff --git a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
index 4dd9cd63cb2..b1be94524cf 100644
--- a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
+++ b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
@@ -19,8 +19,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template enablefiletreeajax.tpl.php can't be called as URL";
 	exit;
 }
@@ -33,7 +32,9 @@ if (empty($conf) || !is_object($conf))
 <script type="text/javascript">
 
 <?php
-if (empty($module)) $module = 'ecm';
+if (empty($module)) {
+	$module = 'ecm';
+}
 $paramwithoutsection = preg_replace('/&?section=(\d+)/', '', $param);
 
 $openeddir = '/'; // The root directory shown
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 3d07d52506b..ff05dc4f4c4 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -217,25 +217,24 @@ class EmailCollector extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
 
 		// Unset fields that are disabled
-		foreach ($this->fields as $key => $val)
-		{
-			if (isset($val['enabled']) && empty($val['enabled']))
-			{
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
 				unset($this->fields[$key]);
 			}
 		}
 
 		// Translate some data of arrayofkeyval
-		foreach ($this->fields as $key => $val)
-		{
-			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
-			{
-				foreach ($val['arrayofkeyval'] as $key2 => $val2)
-				{
+		foreach ($this->fields as $key => $val) {
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+				foreach ($val['arrayofkeyval'] as $key2 => $val2) {
 					$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
 				}
 			}
@@ -326,14 +325,11 @@ class EmailCollector extends CommonObject
 		$object->title = $langs->trans("CopyOf")." ".$object->title;
 		// ...
 		// Clear extrafields that are unique
-		if (is_array($object->array_options) && count($object->array_options) > 0)
-		{
+		if (is_array($object->array_options) && count($object->array_options) > 0) {
 			$extrafields->fetch_name_optionals_label($this->table_element);
-			foreach ($object->array_options as $key => $option)
-			{
+			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
-				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
-				{
+				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey])) {
 					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
@@ -381,15 +377,15 @@ class EmailCollector extends CommonObject
 	 * @return int         <0 if KO, 0 if not found, >0 if OK
 	 */
 	/*
-    public function fetchLines()
-    {
-        $this->lines=array();
+	public function fetchLines()
+	{
+		$this->lines=array();
 
-        // Load lines with object EmailCollectorLine
+		// Load lines with object EmailCollectorLine
 
-        return count($this->lines)?1:0;
-    }
-    */
+		return count($this->lines)?1:0;
+	}
+	*/
 
 	/**
 	 * Fetch all account and load objects into an array
@@ -428,8 +424,7 @@ class EmailCollector extends CommonObject
 		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
 				$emailcollector_static = new EmailCollector($this->db);
 				if ($emailcollector_static->fetch($obj->rowid)) {
@@ -496,7 +491,9 @@ class EmailCollector extends CommonObject
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
@@ -506,8 +503,7 @@ class EmailCollector extends CommonObject
 
 		$url = dol_buildpath('/admin/emailcollector_card.php', 1).'?id='.$this->id;
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
 			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
@@ -519,10 +515,8 @@ class EmailCollector extends CommonObject
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowEmailCollector");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -530,20 +524,26 @@ class EmailCollector extends CommonObject
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
 			/*
-             $hookmanager->initHooks(array('myobjectdao'));
-             $parameters=array('id'=>$this->id);
-             $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-             if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-             */
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+			 $hookmanager->initHooks(array('myobjectdao'));
+			 $parameters=array('id'=>$this->id);
+			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+			 */
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -551,8 +551,11 @@ class EmailCollector extends CommonObject
 		$hookmanager->initHooks(array('emailcollectordao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -579,8 +582,7 @@ class EmailCollector extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
 			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled');
@@ -590,7 +592,9 @@ class EmailCollector extends CommonObject
 		}
 
 		$statusType = 'status5';
-		if ($status == self::STATUS_ENABLED) $statusType = 'status4';
+		if ($status == self::STATUS_ENABLED) {
+			$statusType = 'status4';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -608,28 +612,23 @@ class EmailCollector extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.rowid = '.$id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
 
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
 
-				if ($obj->fk_user_cloture)
-				{
+				if ($obj->fk_user_cloture) {
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
 					$this->user_cloture = $cluser;
@@ -673,18 +672,18 @@ class EmailCollector extends CommonObject
 		//$sql.= ' ORDER BY position';
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				$this->filters[$obj->rowid] = array('id'=>$obj->rowid, 'type'=>$obj->type, 'rulevalue'=>$obj->rulevalue, 'status'=>$obj->status);
 				$i++;
 			}
 			$this->db->free($resql);
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		return 1;
 	}
@@ -705,18 +704,18 @@ class EmailCollector extends CommonObject
 		$sql .= ' ORDER BY position';
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				$this->actions[$obj->rowid] = array('id'=>$obj->rowid, 'type'=>$obj->type, 'actionparam'=>$obj->actionparam, 'status'=>$obj->status);
 				$i++;
 			}
 			$this->db->free($resql);
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 	}
 
 
@@ -736,12 +735,16 @@ class EmailCollector extends CommonObject
 		if (!empty($conf->global->IMAP_FORCE_TLS)) {
 			$flags .= '/tls';
 		} elseif (empty($conf->global->IMAP_FORCE_NOSSL)) {
-			if ($ssl) $flags .= '/ssl';
+			if ($ssl) {
+				$flags .= '/ssl';
+			}
 		}
 		$flags .= '/novalidate-cert';
 		//$flags.='/readonly';
 		//$flags.='/debug';
-		if ($norsh || !empty($conf->global->IMAP_FORCE_NORSH)) $flags .= '/norsh';
+		if ($norsh || !empty($conf->global->IMAP_FORCE_NORSH)) {
+			$flags .= '/norsh';
+		}
 
 		$connectstringserver = '{'.$this->host.':993'.$flags.'}';
 
@@ -769,7 +772,7 @@ class EmailCollector extends CommonObject
 			} else {
 				// print error and return false
 				$this->error = "error: is not possible to encode this string '".$str."'";
-		 		return false;
+				return false;
 			}
 		} else {
 			return $str;
@@ -791,13 +794,14 @@ class EmailCollector extends CommonObject
 		$arrayofcollectors = $this->fetchAll($user, 1);
 
 		// Loop on each collector
-		foreach ($arrayofcollectors as $emailcollector)
-		{
+		foreach ($arrayofcollectors as $emailcollector) {
 			$result = $emailcollector->doCollectOneCollector();
 			dol_syslog("doCollect result = ".$result." for emailcollector->id = ".$emailcollector->id);
 
 			$this->error .= 'EmailCollector ID '.$emailcollector->id.':'.$emailcollector->error.'<br>';
-			if (!empty($emailcollector->errors)) $this->error .= join('<br>', $emailcollector->errors);
+			if (!empty($emailcollector->errors)) {
+				$this->error .= join('<br>', $emailcollector->errors);
+			}
 			$this->output .= 'EmailCollector ID '.$emailcollector->id.': '.$emailcollector->lastresult.'<br>';
 		}
 
@@ -821,53 +825,55 @@ class EmailCollector extends CommonObject
 		// Overwrite values with values extracted from source email
 		// $this->actionparam = 'opportunity_status=123;abc=EXTRACT:BODY:....'
 		$arrayvaluetouse = dolExplodeIntoArray($actionparam, ';', '=');
-		foreach ($arrayvaluetouse as $propertytooverwrite => $valueforproperty)
-		{
+		foreach ($arrayvaluetouse as $propertytooverwrite => $valueforproperty) {
 			$tmpclass = ''; $tmpproperty = '';
 			$tmparray = explode('.', $propertytooverwrite);
-			if (count($tmparray) == 2)
-			{
+			if (count($tmparray) == 2) {
 				$tmpclass = $tmparray[0];
 				$tmpproperty = $tmparray[1];
 			} else {
 				$tmpproperty = $tmparray[0];
 			}
-			if ($tmpclass && ($tmpclass != $object->element)) continue; // Property is for another type of object
+			if ($tmpclass && ($tmpclass != $object->element)) {
+				continue; // Property is for another type of object
+			}
 
 			//if (property_exists($object, $tmpproperty) || preg_match('/^options_/', $tmpproperty))
-			if ($tmpproperty)
-			{
+			if ($tmpproperty) {
 				$sourcestring = '';
 				$sourcefield = '';
 				$regexstring = '';
 				//$transformationstring='';
 				$regforregex = array();
-				if (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*):([^:])$/', $valueforproperty, $regforregex))
-				{
+				if (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*):([^:])$/', $valueforproperty, $regforregex)) {
 					$sourcefield = $regforregex[1];
 					$regexstring = $regforregex[2];
 					//$transofrmationstring=$regforregex[3];
-				} elseif (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*)$/', $valueforproperty, $regforregex))
-				{
+				} elseif (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*)$/', $valueforproperty, $regforregex)) {
 					$sourcefield = $regforregex[1];
 					$regexstring = $regforregex[2];
 				}
-				if (!empty($sourcefield) && !empty($regexstring))
-				{
-					if (strtolower($sourcefield) == 'body') $sourcestring = $messagetext;
-					elseif (strtolower($sourcefield) == 'subject') $sourcestring = $subject;
-					elseif (strtolower($sourcefield) == 'header') $sourcestring = $header;
+				if (!empty($sourcefield) && !empty($regexstring)) {
+					if (strtolower($sourcefield) == 'body') {
+						$sourcestring = $messagetext;
+					} elseif (strtolower($sourcefield) == 'subject') {
+						$sourcestring = $subject;
+					} elseif (strtolower($sourcefield) == 'header') {
+						$sourcestring = $header;
+					}
 
-					if ($sourcestring)
-					{
+					if ($sourcestring) {
 						$regforval = array();
 						$regexoptions = '';
-						if (strtolower($sourcefield) == 'body') $regexoptions = 'ms'; // The m means ^ and $ char is valid at each new line. The s means the char '.' is valid for new lines char too
-						if (strtolower($sourcefield) == 'header') $regexoptions = 'm'; // The m means ^ and $ char is valid at each new line.
+						if (strtolower($sourcefield) == 'body') {
+							$regexoptions = 'ms'; // The m means ^ and $ char is valid at each new line. The s means the char '.' is valid for new lines char too
+						}
+						if (strtolower($sourcefield) == 'header') {
+							$regexoptions = 'm'; // The m means ^ and $ char is valid at each new line.
+						}
 
 						//var_dump($tmpproperty.' - '.$regexstring.' - '.$regexoptions.' - '.$sourcestring);
-						if (preg_match('/'.$regexstring.'/'.$regexoptions, $sourcestring, $regforval))
-						{
+						if (preg_match('/'.$regexstring.'/'.$regexoptions, $sourcestring, $regforval)) {
 							//var_dump($regforval[count($regforval)-1]);exit;
 							// Overwrite param $tmpproperty
 							$valueextracted = isset($regforval[count($regforval) - 1]) ?trim($regforval[count($regforval) - 1]) : null;
@@ -886,25 +892,23 @@ class EmailCollector extends CommonObject
 						$this->error = 'The extract rule to use has on an unknown source (must be HEADER, SUBJECT or BODY)';
 						$this->errors[] = $this->error;
 					}
-				} elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $regforregex))
-				{
+				} elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $regforregex)) {
 					$valuecurrent = '';
-					if (preg_match('/^options_/', $tmpproperty)) $valuecurrent = $object->array_options[preg_replace('/^options_/', '', $tmpproperty)];
-					else $valuecurrent = $object->$tmpproperty;
+					if (preg_match('/^options_/', $tmpproperty)) {
+						$valuecurrent = $object->array_options[preg_replace('/^options_/', '', $tmpproperty)];
+					} else {
+						$valuecurrent = $object->$tmpproperty;
+					}
 
-					if ($regforregex[1] == 'SET' || empty($valuecurrent))
-					{
+					if ($regforregex[1] == 'SET' || empty($valuecurrent)) {
 						$valuetouse = $regforregex[2];
 						$substitutionarray = array();
 						$matcharray = array();
 						preg_match_all('/__([a-z0-9]+(?:_[a-z0-9]+)?)__/i', $valuetouse, $matcharray);
 						//var_dump($tmpproperty.' - '.$object->$tmpproperty.' - '.$valuetouse); var_dump($matcharray);
-						if (is_array($matcharray[1]))    // $matcharray[1] is array with list of substitution key found without the __
-						{
-							foreach ($matcharray[1] as $keytoreplace)
-							{
-								if ($keytoreplace && isset($object->$keytoreplace))
-								{
+						if (is_array($matcharray[1])) {    // $matcharray[1] is array with list of substitution key found without the __
+							foreach ($matcharray[1] as $keytoreplace) {
+								if ($keytoreplace && isset($object->$keytoreplace)) {
 									$substitutionarray['__'.$keytoreplace.'__'] = $object->$keytoreplace;
 								}
 							}
@@ -913,8 +917,11 @@ class EmailCollector extends CommonObject
 						dol_syslog(var_export($substitutionarray, true));
 						//var_dump($substitutionarray);
 						$valuetouse = make_substitutions($valuetouse, $substitutionarray);
-						if (preg_match('/^options_/', $tmpproperty)) $object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $valuetouse;
-						else $object->$tmpproperty = $valuetouse;
+						if (preg_match('/^options_/', $tmpproperty)) {
+							$object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $valuetouse;
+						} else {
+							$object->$tmpproperty = $valuetouse;
+						}
 					}
 				} else {
 					$errorforthisaction++;
@@ -950,23 +957,19 @@ class EmailCollector extends CommonObject
 
 		$now = dol_now();
 
-		if (empty($this->host))
-		{
+		if (empty($this->host)) {
 			$this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('EMailHost'));
 			return -1;
 		}
-		if (empty($this->login))
-		{
+		if (empty($this->login)) {
 			$this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Login'));
 			return -1;
 		}
-		if (empty($this->source_directory))
-		{
+		if (empty($this->source_directory)) {
 			$this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('MailboxSourceDirectory'));
 			return -1;
 		}
-		if (!function_exists('imap_open'))
-		{
+		if (!function_exists('imap_open')) {
 			$this->error = 'IMAP function not enabled on your PHP';
 			return -2;
 		}
@@ -982,8 +985,7 @@ class EmailCollector extends CommonObject
 		$connectstringtarget = $connectstringserver.imap_utf7_encode($targetdir);
 
 		$connection = imap_open($connectstringsource, $this->login, $this->password);
-		if (!$connection)
-		{
+		if (!$connection) {
 			$this->error = 'Failed to open IMAP connection '.$connectstringsource;
 			return -3;
 		}
@@ -1002,9 +1004,10 @@ class EmailCollector extends CommonObject
 		$searchfilternodoltrackid = 0;
 		$searchfilterisanswer = 0;
 		$searchfilterisnotanswer = 0;
-		foreach ($this->filters as $rule)
-		{
-			if (empty($rule['status'])) continue;
+		foreach ($this->filters as $rule) {
+			if (empty($rule['status'])) {
+				continue;
+			}
 
 			if ($rule['type'] == 'to') {
 				$tmprulevaluearray = explode('*', $rule['rulevalue']);
@@ -1016,37 +1019,80 @@ class EmailCollector extends CommonObject
 					$search .= ($search ? ' ' : '').'TO "'.str_replace('"', '', $rule['rulevalue']).'"';
 				}
 			}
-			if ($rule['type'] == 'bcc')     $search .= ($search ? ' ' : '').'BCC';
-			if ($rule['type'] == 'cc')      $search .= ($search ? ' ' : '').'CC';
-			if ($rule['type'] == 'from')    $search .= ($search ? ' ' : '').'FROM "'.str_replace('"', '', $rule['rulevalue']).'"';
-			if ($rule['type'] == 'subject') $search .= ($search ? ' ' : '').'SUBJECT "'.str_replace('"', '', $rule['rulevalue']).'"';
-			if ($rule['type'] == 'body')    $search .= ($search ? ' ' : '').'BODY "'.str_replace('"', '', $rule['rulevalue']).'"';
-			if ($rule['type'] == 'header')  $search .= ($search ? ' ' : '').'HEADER '.$rule['rulevalue'];
+			if ($rule['type'] == 'bcc') {
+				$search .= ($search ? ' ' : '').'BCC';
+			}
+			if ($rule['type'] == 'cc') {
+				$search .= ($search ? ' ' : '').'CC';
+			}
+			if ($rule['type'] == 'from') {
+				$search .= ($search ? ' ' : '').'FROM "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
+			if ($rule['type'] == 'subject') {
+				$search .= ($search ? ' ' : '').'SUBJECT "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
+			if ($rule['type'] == 'body') {
+				$search .= ($search ? ' ' : '').'BODY "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
+			if ($rule['type'] == 'header') {
+				$search .= ($search ? ' ' : '').'HEADER '.$rule['rulevalue'];
+			}
 
-			if ($rule['type'] == 'notinsubject') $search .= ($search ? ' ' : '').'SUBJECT NOT "'.str_replace('"', '', $rule['rulevalue']).'"';
-			if ($rule['type'] == 'notinbody') $search .= ($search ? ' ' : '').'BODY NOT "'.str_replace('"', '', $rule['rulevalue']).'"';
+			if ($rule['type'] == 'notinsubject') {
+				$search .= ($search ? ' ' : '').'SUBJECT NOT "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
+			if ($rule['type'] == 'notinbody') {
+				$search .= ($search ? ' ' : '').'BODY NOT "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
 
-			if ($rule['type'] == 'seen')    $search .= ($search ? ' ' : '').'SEEN';
-			if ($rule['type'] == 'unseen')  $search .= ($search ? ' ' : '').'UNSEEN';
-			if ($rule['type'] == 'unanswered') $search .= ($search ? ' ' : '').'UNANSWERED';
-			if ($rule['type'] == 'answered')   $search .= ($search ? ' ' : '').'ANSWERED';
-			if ($rule['type'] == 'smaller') $search .= ($search ? ' ' : '').'SMALLER "'.str_replace('"', '', $rule['rulevalue']).'"';
-			if ($rule['type'] == 'larger')  $search .= ($search ? ' ' : '').'LARGER "'.str_replace('"', '', $rule['rulevalue']).'"';
+			if ($rule['type'] == 'seen') {
+				$search .= ($search ? ' ' : '').'SEEN';
+			}
+			if ($rule['type'] == 'unseen') {
+				$search .= ($search ? ' ' : '').'UNSEEN';
+			}
+			if ($rule['type'] == 'unanswered') {
+				$search .= ($search ? ' ' : '').'UNANSWERED';
+			}
+			if ($rule['type'] == 'answered') {
+				$search .= ($search ? ' ' : '').'ANSWERED';
+			}
+			if ($rule['type'] == 'smaller') {
+				$search .= ($search ? ' ' : '').'SMALLER "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
+			if ($rule['type'] == 'larger') {
+				$search .= ($search ? ' ' : '').'LARGER "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
 
-			if ($rule['type'] == 'withtrackingidinmsgid') { $searchfilterdoltrackid++; $searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/'; }
-			if ($rule['type'] == 'withouttrackingidinmsgid') { $searchfilterdoltrackid++; $searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/'; }
-			if ($rule['type'] == 'withtrackingid') { $searchfilterdoltrackid++; $searchhead .= '/References.*@'.preg_quote($host, '/').'/'; }
-			if ($rule['type'] == 'withouttrackingid') { $searchfilternodoltrackid++; $searchhead .= '! /References.*@'.preg_quote($host, '/').'/'; }
+			if ($rule['type'] == 'withtrackingidinmsgid') {
+				$searchfilterdoltrackid++; $searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/';
+			}
+			if ($rule['type'] == 'withouttrackingidinmsgid') {
+				$searchfilterdoltrackid++; $searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/';
+			}
+			if ($rule['type'] == 'withtrackingid') {
+				$searchfilterdoltrackid++; $searchhead .= '/References.*@'.preg_quote($host, '/').'/';
+			}
+			if ($rule['type'] == 'withouttrackingid') {
+				$searchfilternodoltrackid++; $searchhead .= '! /References.*@'.preg_quote($host, '/').'/';
+			}
 
-			if ($rule['type'] == 'isanswer') { $searchfilterisanswer++; $searchhead .= '/References.*@.*/'; }
-			if ($rule['type'] == 'isnotanswer') { $searchfilterisnotanswer++; $searchhead .= '! /References.*@.*/'; }
+			if ($rule['type'] == 'isanswer') {
+				$searchfilterisanswer++; $searchhead .= '/References.*@.*/';
+			}
+			if ($rule['type'] == 'isnotanswer') {
+				$searchfilterisnotanswer++; $searchhead .= '! /References.*@.*/';
+			}
 		}
 
-		if (empty($targetdir))	// Use last date as filter if there is no targetdir defined.
-		{
+		if (empty($targetdir)) {	// Use last date as filter if there is no targetdir defined.
 			$fromdate = 0;
-			if ($this->datelastok) $fromdate = $this->datelastok;
-			if ($fromdate > 0) $search .= ($search ? ' ' : '').'SINCE '.date('j-M-Y', $fromdate - 1); // SENTSINCE not supported. Date must be X-Abc-9999 (X on 1 digit if < 10)
+			if ($this->datelastok) {
+				$fromdate = $this->datelastok;
+			}
+			if ($fromdate > 0) {
+				$search .= ($search ? ' ' : '').'SINCE '.date('j-M-Y', $fromdate - 1); // SENTSINCE not supported. Date must be X-Abc-9999 (X on 1 digit if < 10)
+			}
 			//$search.=($search?' ':'').'SINCE 8-Apr-2018';
 		}
 		dol_syslog("IMAP search string = ".$search);
@@ -1059,12 +1105,10 @@ class EmailCollector extends CommonObject
 
 		// Scan IMAP inbox
 		$arrayofemail = imap_search($connection, $search, null, $charset);
-		if ($arrayofemail === false)
-		{
+		if ($arrayofemail === false) {
 			// Nothing found or search string not understood
 			$mapoferrrors = imap_errors();
-			if ($mapoferrrors !== false)
-			{
+			if ($mapoferrrors !== false) {
 				$error++;
 				$this->error = "Search string not understood - ".join(',', $mapoferrrors);
 				$this->errors[] = $this->error;
@@ -1072,24 +1116,23 @@ class EmailCollector extends CommonObject
 		}
 
 		// Loop on each email found
-		if (!$error && !empty($arrayofemail) && count($arrayofemail) > 0)
-		{
+		if (!$error && !empty($arrayofemail) && count($arrayofemail) > 0) {
 			// Loop to get part html and plain
 			/*
-             0 multipart/mixed
-             1 multipart/alternative
-             1.1 text/plain
-             1.2 text/html
-             2 message/rfc822
-             2 multipart/mixed
-             2.1 multipart/alternative
-             2.1.1 text/plain
-             2.1.2 text/html
-             2.2 message/rfc822
-             2.2 multipart/alternative
-             2.2.1 text/plain
-             2.2.2 text/html
-             */
+			 0 multipart/mixed
+			 1 multipart/alternative
+			 1.1 text/plain
+			 1.2 text/html
+			 2 message/rfc822
+			 2 multipart/mixed
+			 2.1 multipart/alternative
+			 2.1.1 text/plain
+			 2.1.2 text/html
+			 2.2 message/rfc822
+			 2.2 multipart/alternative
+			 2.2.1 text/plain
+			 2.2.2 text/html
+			 */
 			/**
 			 * create_part_array
 			 *
@@ -1098,18 +1141,18 @@ class EmailCollector extends CommonObject
 			 * @return 	array				Array with number and object
 			 */
 			/*function createPartArray($structure, $prefix = "")
-            {
-                //print_r($structure);
-                $part_array=array();
-                if (count($structure->parts) > 0) {    // There some sub parts
-                    foreach ($structure->parts as $count => $part) {
-                        addPartToArray($part, $prefix.($count+1), $part_array);
-                    }
-                }else{    // Email does not have a seperate mime attachment for text
-                    $part_array[] = array('part_number' => $prefix.'1', 'part_object' => $structure);
-                }
-                return $part_array;
-            }*/
+			{
+				//print_r($structure);
+				$part_array=array();
+				if (count($structure->parts) > 0) {    // There some sub parts
+					foreach ($structure->parts as $count => $part) {
+						addPartToArray($part, $prefix.($count+1), $part_array);
+					}
+				}else{    // Email does not have a seperate mime attachment for text
+					$part_array[] = array('part_number' => $prefix.'1', 'part_object' => $structure);
+				}
+				return $part_array;
+			}*/
 
 			/**
 			 * Sub function for createPartArray(). Only called by createPartArray() and itself.
@@ -1120,40 +1163,38 @@ class EmailCollector extends CommonObject
 			 * @return	void
 			 */
 			/*function addPartToArray($obj, $partno, &$part_array)
-            {
-                $part_array[] = array('part_number' => $partno, 'part_object' => $obj);
-                if ($obj->type == 2) { // Check to see if the part is an attached email message, as in the RFC-822 type
-                    //print_r($obj);
-                    if (array_key_exists('parts', $obj)) {    // Check to see if the email has parts
-                        foreach ($obj->parts as $count => $part) {
-                            // Iterate here again to compensate for the broken way that imap_fetchbody() handles attachments
-                            if (count($part->parts) > 0) {
-                                foreach ($part->parts as $count2 => $part2) {
-                                    addPartToArray($part2, $partno.".".($count2+1), $part_array);
-                                }
-                            }else{    // Attached email does not have a seperate mime attachment for text
-                                $part_array[] = array('part_number' => $partno.'.'.($count+1), 'part_object' => $obj);
-                            }
-                        }
-                    }else{    // Not sure if this is possible
-                        $part_array[] = array('part_number' => $partno.'.1', 'part_object' => $obj);
-                    }
-                }else{    // If there are more sub-parts, expand them out.
-                    if (array_key_exists('parts', $obj)) {
-                        foreach ($obj->parts as $count => $p) {
-                            addPartToArray($p, $partno.".".($count+1), $part_array);
-                        }
-                    }
-                }
-            }*/
+			{
+				$part_array[] = array('part_number' => $partno, 'part_object' => $obj);
+				if ($obj->type == 2) { // Check to see if the part is an attached email message, as in the RFC-822 type
+					//print_r($obj);
+					if (array_key_exists('parts', $obj)) {    // Check to see if the email has parts
+						foreach ($obj->parts as $count => $part) {
+							// Iterate here again to compensate for the broken way that imap_fetchbody() handles attachments
+							if (count($part->parts) > 0) {
+								foreach ($part->parts as $count2 => $part2) {
+									addPartToArray($part2, $partno.".".($count2+1), $part_array);
+								}
+							}else{    // Attached email does not have a seperate mime attachment for text
+								$part_array[] = array('part_number' => $partno.'.'.($count+1), 'part_object' => $obj);
+							}
+						}
+					}else{    // Not sure if this is possible
+						$part_array[] = array('part_number' => $partno.'.1', 'part_object' => $obj);
+					}
+				}else{    // If there are more sub-parts, expand them out.
+					if (array_key_exists('parts', $obj)) {
+						foreach ($obj->parts as $count => $p) {
+							addPartToArray($p, $partno.".".($count+1), $part_array);
+						}
+					}
+				}
+			}*/
 
 			dol_syslog("Start of loop on email", LOG_INFO, 1);
 
 			$iforemailloop = 0;
-			foreach ($arrayofemail as $imapemail)
-			{
-				if ($nbemailprocessed > 1000)
-				{
+			foreach ($arrayofemail as $imapemail) {
+				if ($nbemailprocessed > 1000) {
 					break; // Do not process more than 1000 email per launch (this is a different protection than maxnbcollectedpercollect
 				}
 
@@ -1162,15 +1203,21 @@ class EmailCollector extends CommonObject
 				$header = imap_fetchheader($connection, $imapemail, 0);
 				$header = preg_replace('/\r\n\s+/m', ' ', $header); // When a header line is on several lines, merge lines
 				/*print $header;
-                print $header;*/
+				print $header;*/
 
 				$matches = array();
 				preg_match_all('/([^: ]+): (.+?(?:\r\n\s(?:.+?))*)\r\n/m', $header, $matches);
 				$headers = array_combine($matches[1], $matches[2]);
 
-				if (!empty($headers['in-reply-to']) && empty($headers['In-Reply-To'])) { $headers['In-Reply-To'] = $headers['in-reply-to']; }
-				if (!empty($headers['references']) && empty($headers['References'])) { $headers['References'] = $headers['references']; }
-				if (!empty($headers['message-id']) && empty($headers['Message-ID'])) { $headers['Message-ID'] = $headers['message-id']; }
+				if (!empty($headers['in-reply-to']) && empty($headers['In-Reply-To'])) {
+					$headers['In-Reply-To'] = $headers['in-reply-to'];
+				}
+				if (!empty($headers['references']) && empty($headers['References'])) {
+					$headers['References'] = $headers['references'];
+				}
+				if (!empty($headers['message-id']) && empty($headers['Message-ID'])) {
+					$headers['Message-ID'] = $headers['message-id'];
+				}
 
 				$headers['Subject'] = $this->decodeSMTPSubject($headers['Subject']);
 
@@ -1179,33 +1226,30 @@ class EmailCollector extends CommonObject
 				//print "Process mail ".$iforemailloop." Subject: ".dol_escape_htmltag($headers['Subject'])." References: ".dol_escape_htmltag($headers['References'])." In-Reply-To: ".dol_escape_htmltag($headers['In-Reply-To'])."<br>\n";
 
 				// If there is a filter on trackid
-				if ($searchfilterdoltrackid > 0)
-				{
-					if (empty($headers['References']) || !preg_match('/@'.preg_quote($host, '/').'/', $headers['References']))
-					{
+				if ($searchfilterdoltrackid > 0) {
+					if (empty($headers['References']) || !preg_match('/@'.preg_quote($host, '/').'/', $headers['References'])) {
 						$nbemailprocessed++;
 						continue; // Exclude email
 					}
 				}
-				if ($searchfilternodoltrackid > 0)
-				{
-					if (!empty($headers['References']) && preg_match('/@'.preg_quote($host, '/').'/', $headers['References']))
-					{
+				if ($searchfilternodoltrackid > 0) {
+					if (!empty($headers['References']) && preg_match('/@'.preg_quote($host, '/').'/', $headers['References'])) {
 						$nbemailprocessed++;
 						continue; // Exclude email
 					}
 				}
 
 				if ($searchfilterisanswer > 0) {
-					if (empty($headers['In-Reply-To']))
-					{
+					if (empty($headers['In-Reply-To'])) {
 						$nbemailprocessed++;
 						continue; // Exclude email
 					}
 					// Note: we can have
 					// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer or NOT (a transfer rewriten)
 					$isanswer = 0;
-					if (preg_match('/Re\s*:\s+/i', $headers['Subject'])) $isanswer = 1;
+					if (preg_match('/Re\s*:\s+/i', $headers['Subject'])) {
+						$isanswer = 1;
+					}
 					//if ($headers['In-Reply-To'] != $headers['Message-ID'] && empty($headers['References'])) $isanswer = 1;	// If in-reply-to differs of message-id, this is a reply
 					//if ($headers['In-Reply-To'] != $headers['Message-ID'] && !empty($headers['References']) && strpos($headers['References'], $headers['Message-ID']) !== false) $isanswer = 1;
 
@@ -1215,12 +1259,13 @@ class EmailCollector extends CommonObject
 					}
 				}
 				if ($searchfilterisnotanswer > 0) {
-					if (!empty($headers['In-Reply-To']))
-					{
+					if (!empty($headers['In-Reply-To'])) {
 						// Note: we can have
 						// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer or NOT (a transfer rewriten)
 						$isanswer = 0;
-						if (preg_match('/Re\s*:\s+/i', $headers['Subject'])) $isanswer = 1;
+						if (preg_match('/Re\s*:\s+/i', $headers['Subject'])) {
+							$isanswer = 1;
+						}
 						//if ($headers['In-Reply-To'] != $headers['Message-ID'] && empty($headers['References'])) $isanswer = 1;	// If in-reply-to differs of message-id, this is a reply
 						//if ($headers['In-Reply-To'] != $headers['Message-ID'] && !empty($headers['References']) && strpos($headers['References'], $headers['Message-ID']) !== false) $isanswer = 1;
 						if ($isanswer) {
@@ -1270,51 +1315,51 @@ class EmailCollector extends CommonObject
 				$messagetext = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $messagetext);
 
 				/*var_dump($plainmsg);
-                var_dump($htmlmsg);
-                var_dump($messagetext);*/
+				var_dump($htmlmsg);
+				var_dump($messagetext);*/
 				/*var_dump($charset);
-                var_dump($attachments);
-                exit;*/
+				var_dump($attachments);
+				exit;*/
 
 				// Parse IMAP email structure
 				/*
-                $structure = imap_fetchstructure($connection, $imapemail, 0);
+				$structure = imap_fetchstructure($connection, $imapemail, 0);
 
-                $partplain = $parthtml = -1;
-                $encodingplain = $encodinghtml = '';
+				$partplain = $parthtml = -1;
+				$encodingplain = $encodinghtml = '';
 
-                $result = createPartArray($structure, '');
+				$result = createPartArray($structure, '');
 
-                foreach($result as $part)
-                {
-                    // $part['part_object']->type seems 0 for content
-                    // $part['part_object']->type seems 5 for attachment
-                    if (empty($part['part_object'])) continue;
-                    if ($part['part_object']->subtype == 'HTML')
-                    {
-                        $parthtml=$part['part_number'];
-                        if ($part['part_object']->encoding == 4)
-                        {
-                            $encodinghtml = 'aaa';
-                        }
-                    }
-                    if ($part['part_object']->subtype == 'PLAIN')
-                    {
-                        $partplain=$part['part_number'];
-                        if ($part['part_object']->encoding == 4)
-                        {
-                            $encodingplain = 'rr';
-                        }
-                    }
-                }
-                //var_dump($result); var_dump($partplain); var_dump($parthtml);
+				foreach($result as $part)
+				{
+					// $part['part_object']->type seems 0 for content
+					// $part['part_object']->type seems 5 for attachment
+					if (empty($part['part_object'])) continue;
+					if ($part['part_object']->subtype == 'HTML')
+					{
+						$parthtml=$part['part_number'];
+						if ($part['part_object']->encoding == 4)
+						{
+							$encodinghtml = 'aaa';
+						}
+					}
+					if ($part['part_object']->subtype == 'PLAIN')
+					{
+						$partplain=$part['part_number'];
+						if ($part['part_object']->encoding == 4)
+						{
+							$encodingplain = 'rr';
+						}
+					}
+				}
+				//var_dump($result); var_dump($partplain); var_dump($parthtml);
 
-                var_dump($structure);
-                var_dump($parthtml);
-                var_dump($partplain);
+				var_dump($structure);
+				var_dump($parthtml);
+				var_dump($partplain);
 
-                $messagetext = imap_fetchbody($connection, $imapemail, ($parthtml != '-1' ? $parthtml : ($partplain != '-1' ? $partplain : 1)), FT_PEEK);
-                */
+				$messagetext = imap_fetchbody($connection, $imapemail, ($parthtml != '-1' ? $parthtml : ($partplain != '-1' ? $partplain : 1)), FT_PEEK);
+				*/
 
 				//var_dump($messagetext);
 				//var_dump($structure->parts[0]->parts);
@@ -1334,8 +1379,7 @@ class EmailCollector extends CommonObject
 				//var_dump($msgid);exit;
 
 				$reg = array();
-				if (preg_match('/^(.*)<(.*)>$/', $fromstring, $reg))
-				{
+				if (preg_match('/^(.*)<(.*)>$/', $fromstring, $reg)) {
 					$from = $reg[2];
 					$fromtext = $reg[1];
 				} else {
@@ -1356,8 +1400,7 @@ class EmailCollector extends CommonObject
 				$objectemail = null;
 
 				$reg = array();
-				if (!empty($headers['References']))
-				{
+				if (!empty($headers['References'])) {
 					$arrayofreferences = preg_split('/(,|\s+)/', $headers['References']);
 					//var_dump($headers['References']);
 					//var_dump($arrayofreferences);
@@ -1370,44 +1413,34 @@ class EmailCollector extends CommonObject
 
 							$objectid = $reg[2];
 							// See also list into interface_50_modAgenda_ActionsAuto
-							if ($reg[1] == 'thi')
-							{
+							if ($reg[1] == 'thi') {
 								$objectemail = new Societe($this->db);
 							}
-							if ($reg[1] == 'ctc')
-							{
+							if ($reg[1] == 'ctc') {
 								$objectemail = new Contact($this->db);
 							}
-							if ($reg[1] == 'inv')
-							{
+							if ($reg[1] == 'inv') {
 								$objectemail = new Facture($this->db);
 							}
-							if ($reg[1] == 'proj')
-							{
+							if ($reg[1] == 'proj') {
 								$objectemail = new Project($this->db);
 							}
-							if ($reg[1] == 'tas')
-							{
+							if ($reg[1] == 'tas') {
 								$objectemail = new Task($this->db);
 							}
-							if ($reg[1] == 'con')
-							{
+							if ($reg[1] == 'con') {
 								$objectemail = new Contact($this->db);
 							}
-							if ($reg[1] == 'use')
-							{
+							if ($reg[1] == 'use') {
 								$objectemail = new User($this->db);
 							}
-							if ($reg[1] == 'tic')
-							{
+							if ($reg[1] == 'tic') {
 								$objectemail = new Ticket($this->db);
 							}
-							if ($reg[1] == 'recruitmentcandidature')
-							{
+							if ($reg[1] == 'recruitmentcandidature') {
 								$objectemail = new RecruitmentCandidature($this->db);
 							}
-							if ($reg[1] == 'mem')
-							{
+							if ($reg[1] == 'mem') {
 								$objectemail = new Adherent($this->db);
 							}
 						} elseif (preg_match('/<(.*@.*)>/', $reference, $reg)) {
@@ -1459,81 +1492,97 @@ class EmailCollector extends CommonObject
 						}
 
 						// Load object linked to email
-						if (is_object($objectemail))
-						{
+						if (is_object($objectemail)) {
 							$result = $objectemail->fetch($objectid);
-							if ($result > 0)
-							{
+							if ($result > 0) {
 								$fk_element_id = $objectemail->id;
 								$fk_element_type = $objectemail->element;
 								// Fix fk_element_type
-								if ($fk_element_type == 'facture') $fk_element_type = 'invoice';
+								if ($fk_element_type == 'facture') {
+									$fk_element_type = 'invoice';
+								}
 
-								if (get_class($objectemail) != 'Societe') $thirdpartyid = $objectemail->fk_soc;
-								else $thirdpartyid = $objectemail->id;
+								if (get_class($objectemail) != 'Societe') {
+									$thirdpartyid = $objectemail->fk_soc;
+								} else {
+									$thirdpartyid = $objectemail->id;
+								}
 
-								if (get_class($objectemail) != 'Contact') $contactid = $objectemail->fk_socpeople;
-								else $contactid = $objectemail->id;
+								if (get_class($objectemail) != 'Contact') {
+									$contactid = $objectemail->fk_socpeople;
+								} else {
+									$contactid = $objectemail->id;
+								}
 
-								if (get_class($objectemail) != 'Project') $projectid = isset($objectemail->fk_project) ? $objectemail->fk_project : $objectemail->fk_projet;
-								else $projectid = $objectemail->id;
+								if (get_class($objectemail) != 'Project') {
+									$projectid = isset($objectemail->fk_project) ? $objectemail->fk_project : $objectemail->fk_projet;
+								} else {
+									$projectid = $objectemail->id;
+								}
 							}
 						}
 
 						// Project
-						if ($projectid > 0)
-						{
+						if ($projectid > 0) {
 							$result = $projectstatic->fetch($projectid);
-							if ($result <= 0) $projectstatic->id = 0;
-							else {
+							if ($result <= 0) {
+								$projectstatic->id = 0;
+							} else {
 								$projectid = $projectstatic->id;
-								if ($trackid) $projectfoundby = 'trackid ('.$trackid.')';
-								if (empty($contactid)) $contactid = $projectstatic->fk_contact;
-								if (empty($thirdpartyid)) $thirdpartyid = $projectstatic->fk_soc;
+								if ($trackid) {
+									$projectfoundby = 'trackid ('.$trackid.')';
+								}
+								if (empty($contactid)) {
+									$contactid = $projectstatic->fk_contact;
+								}
+								if (empty($thirdpartyid)) {
+									$thirdpartyid = $projectstatic->fk_soc;
+								}
 							}
 						}
 						// Contact
-						if ($contactid > 0)
-						{
+						if ($contactid > 0) {
 							$result = $contactstatic->fetch($contactid);
-							if ($result <= 0) $contactstatic->id = 0;
-							else {
+							if ($result <= 0) {
+								$contactstatic->id = 0;
+							} else {
 								$contactid = $contactstatic->id;
-								if ($trackid) $contactfoundby = 'trackid ('.$trackid.')';
-								if (empty($thirdpartyid)) $thirdpartyid = $contactstatic->fk_soc;
+								if ($trackid) {
+									$contactfoundby = 'trackid ('.$trackid.')';
+								}
+								if (empty($thirdpartyid)) {
+									$thirdpartyid = $contactstatic->fk_soc;
+								}
 							}
 						}
 						// Thirdparty
-						if ($thirdpartyid > 0)
-						{
+						if ($thirdpartyid > 0) {
 							$result = $thirdpartystatic->fetch($thirdpartyid);
-							if ($result <= 0) $thirdpartystatic->id = 0;
-							else {
+							if ($result <= 0) {
+								$thirdpartystatic->id = 0;
+							} else {
 								$thirdpartyid = $thirdpartystatic->id;
-								if ($trackid) $thirdpartyfoundby = 'trackid ('.$trackid.')';
+								if ($trackid) {
+									$thirdpartyfoundby = 'trackid ('.$trackid.')';
+								}
 							}
 						}
 
-						if (is_object($objectemail))
-						{
+						if (is_object($objectemail)) {
 							break; // Exit loop of references. We already found an accurate reference
 						}
 					}
 				}
 
-				if (empty($contactid))		// Try to find contact using email
-				{
+				if (empty($contactid)) {		// Try to find contact using email
 					$result = $contactstatic->fetch(0, null, '', $from);
 
-					if ($result > 0)
-					{
+					if ($result > 0) {
 						$contactid = $contactstatic->id;
 						$contactfoundby = 'email of contact ('.$from.')';
-						if (empty($thirdpartyid) && $contactstatic->socid > 0)
-						{
+						if (empty($thirdpartyid) && $contactstatic->socid > 0) {
 							$result = $thirdpartystatic->fetch($contactstatic->socid);
-							if ($result > 0)
-							{
+							if ($result > 0) {
 								$thirdpartyid = $thirdpartystatic->id;
 								$thirdpartyfoundby = 'email of contact ('.$from.')';
 							}
@@ -1541,19 +1590,23 @@ class EmailCollector extends CommonObject
 					}
 				}
 
-				if (empty($thirdpartyid))		// Try to find thirdparty using email
-				{
+				if (empty($thirdpartyid)) {		// Try to find thirdparty using email
 					$result = $thirdpartystatic->fetch(0, '', '', '', '', '', '', '', '', '', $from);
-					if ($result > 0) $thirdpartyfoundby = 'email ('.$from.')';
+					if ($result > 0) {
+						$thirdpartyfoundby = 'email ('.$from.')';
+					}
 				}
 
 				// Do operations
-				foreach ($this->actions as $operation)
-				{
+				foreach ($this->actions as $operation) {
 					$errorforthisaction = 0;
 
-					if ($errorforactions) break;
-					if (empty($operation['status'])) continue;
+					if ($errorforactions) {
+						break;
+					}
+					if (empty($operation['status'])) {
+						continue;
+					}
 
 					// Make Operation
 					dol_syslog("Execute action ".$operation['type']." actionparam=".$operation['actionparam'].' thirdpartystatic->id='.$thirdpartystatic->id.' contactstatic->id='.$contactstatic->id.' projectstatic->id='.$projectstatic->id);
@@ -1561,7 +1614,9 @@ class EmailCollector extends CommonObject
 
 					$actioncode = 'EMAIL_IN';
 					// If we scan the Sent box, we use the code for out email
-					if ($this->source_directory == 'Sent') $actioncode = 'EMAIL_OUT';
+					if ($this->source_directory == 'Sent') {
+						$actioncode = 'EMAIL_OUT';
+					}
 
 					$description = $descriptiontitle = $descriptionmeta = $descriptionfull = '';
 
@@ -1569,13 +1624,16 @@ class EmailCollector extends CommonObject
 
 					$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailTopic").' : '.dol_escape_htmltag($subject));
 					$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailFrom").($langs->trans("MailFrom") != 'From' ? ' (From)' : '').' : '.dol_escape_htmltag($fromstring));
-					if ($sender) $descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("Sender").($langs->trans("Sender") != 'Sender' ? ' (Sender)' : '').' : '.dol_escape_htmltag($sender));
+					if ($sender) {
+						$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("Sender").($langs->trans("Sender") != 'Sender' ? ' (Sender)' : '').' : '.dol_escape_htmltag($sender));
+					}
 					$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailTo").($langs->trans("MailTo") != 'To' ? ' (To)' : '').' : '.dol_escape_htmltag($to));
-					if ($sendtocc) $descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailCC").($langs->trans("MailCC") != 'CC' ? ' (CC)' : '').' : '.dol_escape_htmltag($sendtocc));
+					if ($sendtocc) {
+						$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailCC").($langs->trans("MailCC") != 'CC' ? ' (CC)' : '').' : '.dol_escape_htmltag($sendtocc));
+					}
 
 					// Search and create thirdparty
-					if ($operation['type'] == 'loadthirdparty' || $operation['type'] == 'loadandcreatethirdparty')
-					{
+					if ($operation['type'] == 'loadthirdparty' || $operation['type'] == 'loadandcreatethirdparty') {
 						if (empty($operation['actionparam'])) {
 							$errorforactions++;
 							$this->error = "Action loadthirdparty or loadandcreatethirdparty has empty parameter. Must be a rule like 'SET:xxx' or 'EXTRACT:(body|subject):regex' to define how to set or extract data";
@@ -1586,31 +1644,30 @@ class EmailCollector extends CommonObject
 
 							// $this->actionparam = 'SET:aaa' or 'EXTRACT:BODY:....'
 							$arrayvaluetouse = dolExplodeIntoArray($actionparam, ';', '=');
-							foreach ($arrayvaluetouse as $propertytooverwrite => $valueforproperty)
-							{
+							foreach ($arrayvaluetouse as $propertytooverwrite => $valueforproperty) {
 								$sourcestring = '';
 								$sourcefield = '';
 								$regexstring = '';
 								$regforregex = array();
 
-								if (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*)$/', $valueforproperty, $regforregex))
-								{
+								if (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*)$/', $valueforproperty, $regforregex)) {
 									$sourcefield = $regforregex[1];
 									$regexstring = $regforregex[2];
 								}
 
-								if (!empty($sourcefield) && !empty($regexstring))
-								{
-									if (strtolower($sourcefield) == 'body') $sourcestring = $messagetext;
-									elseif (strtolower($sourcefield) == 'subject') $sourcestring = $subject;
-									elseif (strtolower($sourcefield) == 'header') $sourcestring = $header;
+								if (!empty($sourcefield) && !empty($regexstring)) {
+									if (strtolower($sourcefield) == 'body') {
+										$sourcestring = $messagetext;
+									} elseif (strtolower($sourcefield) == 'subject') {
+										$sourcestring = $subject;
+									} elseif (strtolower($sourcefield) == 'header') {
+										$sourcestring = $header;
+									}
 
-									if ($sourcestring)
-									{
+									if ($sourcestring) {
 										$regforval = array();
 										//var_dump($regexstring);var_dump($sourcestring);
-										if (preg_match('/'.$regexstring.'/ms', $sourcestring, $regforval))
-										{
+										if (preg_match('/'.$regexstring.'/ms', $sourcestring, $regforval)) {
 											//var_dump($regforval[count($regforval)-1]);exit;
 											// Overwrite param $tmpproperty
 											$nametouseforthirdparty = isset($regforval[count($regforval) - 1]) ? trim($regforval[count($regforval) - 1]) : null;
@@ -1625,8 +1682,7 @@ class EmailCollector extends CommonObject
 										$this->error = 'The extract rule to use to load thirdparty has on an unknown source (must be HEADER, SUBJECT or BODY)';
 										$this->errors[] = $this->error;
 									}
-								} elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $reg))
-								{
+								} elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $reg)) {
 									//if (preg_match('/^options_/', $tmpproperty)) $object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $reg[1];
 									//else $object->$tmpproperty = $reg[1];
 									$nametouseforthirdparty = $reg[2];
@@ -1638,43 +1694,38 @@ class EmailCollector extends CommonObject
 								}
 							}
 
-							if (!$errorforactions && $nametouseforthirdparty)
-							{
+							if (!$errorforactions && $nametouseforthirdparty) {
 								$result = $thirdpartystatic->fetch(0, $nametouseforthirdparty);
-								if ($result < 0)
-								{
+								if ($result < 0) {
 									$errorforactions++;
 									$this->error = 'Error when getting thirdparty with name '.$nametouseforthirdparty.' (may be 2 record exists with same name ?)';
 									$this->errors[] = $this->error;
 									break;
-								} elseif ($result == 0)
-								{
-									if ($operation['type'] == 'loadthirdparty')
-									{
+								} elseif ($result == 0) {
+									if ($operation['type'] == 'loadthirdparty') {
 										dol_syslog("Third party with name ".$nametouseforthirdparty." was not found");
 
 										$errorforactions++;
 										$this->error = 'ErrorFailedToLoadThirdParty';
 										$this->errors[] = 'ErrorFailedToLoadThirdParty';
-									} elseif ($operation['type'] == 'loadandcreatethirdparty')
-									{
+									} elseif ($operation['type'] == 'loadandcreatethirdparty') {
 										dol_syslog("Third party with name ".$nametouseforthirdparty." was not found. We try to create it.");
 
 										// Create thirdparty
 										$thirdpartystatic->name = $nametouseforthirdparty;
-										if ($fromtext != $nametouseforthirdparty) $thirdpartystatic->name_alias = $fromtext;
+										if ($fromtext != $nametouseforthirdparty) {
+											$thirdpartystatic->name_alias = $fromtext;
+										}
 										$thirdpartystatic->email = $from;
 
 										// Overwrite values with values extracted from source email
 										$errorforthisaction = $this->overwritePropertiesOfObject($thirdpartystatic, $operation['actionparam'], $messagetext, $subject, $header);
 
-										if ($errorforthisaction)
-										{
+										if ($errorforthisaction) {
 											$errorforactions++;
 										} else {
 											$result = $thirdpartystatic->create($user);
-											if ($result <= 0)
-											{
+											if ($result <= 0) {
 												$errorforactions++;
 												$this->error = $thirdpartystatic->error;
 												$this->errors = $thirdpartystatic->errors;
@@ -1684,26 +1735,26 @@ class EmailCollector extends CommonObject
 								}
 							}
 						}
-					}
-					// Create event
-					elseif ($operation['type'] == 'recordevent')
-					{
+					} elseif ($operation['type'] == 'recordevent') {
+						// Create event
 						$actioncomm = new ActionComm($this->db);
 
 						$alreadycreated = $actioncomm->fetch(0, '', '', $msgid);
-						if ($alreadycreated == 0)
-						{
-							if ($projectstatic->id > 0)
-							{
-								if ($projectfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Project found from '.$projectfoundby);
+						if ($alreadycreated == 0) {
+							if ($projectstatic->id > 0) {
+								if ($projectfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Project found from '.$projectfoundby);
+								}
 							}
-							if ($thirdpartystatic->id > 0)
-							{
-								if ($thirdpartyfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+							if ($thirdpartystatic->id > 0) {
+								if ($thirdpartyfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+								}
 							}
-							if ($contactstatic->id > 0)
-							{
-								if ($contactfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+							if ($contactstatic->id > 0) {
+								if ($contactfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+								}
 							}
 
 							$description = $descriptiontitle;
@@ -1742,8 +1793,7 @@ class EmailCollector extends CommonObject
 							$actioncomm->email_subject = $subject;
 							$actioncomm->errors_to   = '';
 
-							if (!in_array($fk_element_type, array('societe', 'contact', 'project', 'user')))
-							{
+							if (!in_array($fk_element_type, array('societe', 'contact', 'project', 'user'))) {
 								$actioncomm->fk_element  = $fk_element_id;
 								$actioncomm->elementid = $fk_element_id;
 								$actioncomm->elementtype = $fk_element_type;
@@ -1758,42 +1808,39 @@ class EmailCollector extends CommonObject
 							$errorforthisaction = $this->overwritePropertiesOfObject($actioncomm, $operation['actionparam'], $messagetext, $subject, $header);
 
 							/*var_dump($fk_element_id);
-	                        var_dump($fk_element_type);
-	                        var_dump($alreadycreated);
-	                        var_dump($operation['type']);
-	                        var_dump($actioncomm);
-	                        exit;*/
+							var_dump($fk_element_type);
+							var_dump($alreadycreated);
+							var_dump($operation['type']);
+							var_dump($actioncomm);
+							exit;*/
 
-							if ($errorforthisaction)
-							{
+							if ($errorforthisaction) {
 								$errorforactions++;
 							} else {
 								$result = $actioncomm->create($user);
-								if ($result <= 0)
-								{
+								if ($result <= 0) {
 									$errorforactions++;
 									$this->errors = $actioncomm->errors;
 								}
 							}
 						}
-					}
-					// Create project / lead
-					elseif ($operation['type'] == 'project')
-					{
+					} elseif ($operation['type'] == 'project') {
+						// Create project / lead
 						$projecttocreate = new Project($this->db);
 
 						$alreadycreated = $projecttocreate->fetch(0, '', '', $msgid);
-						if ($alreadycreated == 0)
-						{
-							if ($thirdpartystatic->id > 0)
-							{
+						if ($alreadycreated == 0) {
+							if ($thirdpartystatic->id > 0) {
 								$projecttocreate->socid = $thirdpartystatic->id;
-								if ($thirdpartyfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+								if ($thirdpartyfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+								}
 							}
-							if ($contactstatic->id > 0)
-							{
+							if ($contactstatic->id > 0) {
 								$projecttocreate->contact_id = $contactstatic->id;
-								if ($contactfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+								if ($contactfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+								}
 							}
 
 							$description = $descriptiontitle;
@@ -1828,8 +1875,7 @@ class EmailCollector extends CommonObject
 							$errorforthisaction = $this->overwritePropertiesOfObject($projecttocreate, $operation['actionparam'], $messagetext, $subject, $header);
 
 							// Set project ref if not yet defined
-							if (empty($projecttocreate->ref))
-							{
+							if (empty($projecttocreate->ref)) {
 								// Get next Ref
 								$defaultref = '';
 								$modele = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
@@ -1837,29 +1883,23 @@ class EmailCollector extends CommonObject
 								// Search template files
 								$file = ''; $classname = ''; $filefound = 0; $reldir = '';
 								$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-								foreach ($dirmodels as $reldir)
-								{
+								foreach ($dirmodels as $reldir) {
 									$file = dol_buildpath($reldir."core/modules/project/".$modele.'.php', 0);
-									if (file_exists($file))
-									{
+									if (file_exists($file)) {
 										$filefound = 1;
 										$classname = $modele;
 										break;
 									}
 								}
 
-								if ($filefound)
-								{
-									if ($savesocid > 0)
-									{
-										if ($savesocid != $projecttocreate->socid)
-										{
+								if ($filefound) {
+									if ($savesocid > 0) {
+										if ($savesocid != $projecttocreate->socid) {
 											$errorforactions++;
 											setEventMessages('You loaded a thirdparty (id='.$savesocid.') and you force another thirdparty id (id='.$projecttocreate->socid.') by setting socid in operation with a different value', null, 'errors');
 										}
 									} else {
-										if ($projecttocreate->socid > 0)
-										{
+										if ($projecttocreate->socid > 0) {
 											$thirdpartystatic->fetch($projecttocreate->socid);
 										}
 									}
@@ -1871,19 +1911,16 @@ class EmailCollector extends CommonObject
 								$projecttocreate->ref = $defaultref;
 							}
 
-							if ($errorforthisaction)
-							{
+							if ($errorforthisaction) {
 								$errorforactions++;
 							} else {
-								if (empty($projecttocreate->ref) || (is_numeric($projecttocreate->ref) && $projecttocreate->ref <= 0))
-								{
+								if (empty($projecttocreate->ref) || (is_numeric($projecttocreate->ref) && $projecttocreate->ref <= 0)) {
 									$errorforactions++;
 									$this->error = 'Failed to create project: Can\'t get a valid value for the field ref with numbering template = '.$modele.', thirdparty id = '.$thirdpartystatic->id;
 								} else {
 									// Create project
 									$result = $projecttocreate->create($user);
-									if ($result <= 0)
-									{
+									if ($result <= 0) {
 										$errorforactions++;
 										$this->error = 'Failed to create project: '.$langs->trans($projecttocreate->error);
 										$this->errors = $projecttocreate->errors;
@@ -1891,25 +1928,24 @@ class EmailCollector extends CommonObject
 								}
 							}
 						}
-					}
-					// Create ticket
-					elseif ($operation['type'] == 'ticket')
-					{
+					} elseif ($operation['type'] == 'ticket') {
+						// Create ticket
 						$tickettocreate = new Ticket($this->db);
 
 						$alreadycreated = $tickettocreate->fetch(0, '', '', $msgid);
-						if ($alreadycreated == 0)
-						{
-							if ($thirdpartystatic->id > 0)
-							{
+						if ($alreadycreated == 0) {
+							if ($thirdpartystatic->id > 0) {
 								$tickettocreate->socid = $thirdpartystatic->id;
 								$tickettocreate->fk_soc = $thirdpartystatic->id;
-								if ($thirdpartyfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+								if ($thirdpartyfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+								}
 							}
-							if ($contactstatic->id > 0)
-							{
+							if ($contactstatic->id > 0) {
 								$tickettocreate->contact_id = $contactstatic->id;
-								if ($contactfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+								if ($contactfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+								}
 							}
 
 							$description = $descriptiontitle;
@@ -1946,8 +1982,7 @@ class EmailCollector extends CommonObject
 							$errorforthisaction = $this->overwritePropertiesOfObject($tickettocreate, $operation['actionparam'], $messagetext, $subject, $header);
 
 							// Set ticket ref if not yet defined
-							if (empty($tickettocreate->ref))
-							{
+							if (empty($tickettocreate->ref)) {
 								// Get next Ref
 								$defaultref = '';
 								$modele = empty($conf->global->TICKET_ADDON) ? 'mod_ticket_simple' : $conf->global->TICKET_ADDON;
@@ -1955,29 +1990,23 @@ class EmailCollector extends CommonObject
 								// Search template files
 								$file = ''; $classname = ''; $filefound = 0; $reldir = '';
 								$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-								foreach ($dirmodels as $reldir)
-								{
+								foreach ($dirmodels as $reldir) {
 									$file = dol_buildpath($reldir."core/modules/ticket/".$modele.'.php', 0);
-									if (file_exists($file))
-									{
+									if (file_exists($file)) {
 										$filefound = 1;
 										$classname = $modele;
 										break;
 									}
 								}
 
-								if ($filefound)
-								{
-									if ($savesocid > 0)
-									{
-										if ($savesocid != $tickettocreate->socid)
-										{
+								if ($filefound) {
+									if ($savesocid > 0) {
+										if ($savesocid != $tickettocreate->socid) {
 											$errorforactions++;
 											setEventMessages('You loaded a thirdparty (id='.$savesocid.') and you force another thirdparty id (id='.$tickettocreate->socid.') by setting socid in operation with a different value', null, 'errors');
 										}
 									} else {
-										if ($tickettocreate->socid > 0)
-										{
+										if ($tickettocreate->socid > 0) {
 											$thirdpartystatic->fetch($tickettocreate->socid);
 										}
 									}
@@ -1989,19 +2018,16 @@ class EmailCollector extends CommonObject
 								$tickettocreate->ref = $defaultref;
 							}
 
-							if ($errorforthisaction)
-							{
+							if ($errorforthisaction) {
 								$errorforactions++;
 							} else {
-								if (is_numeric($tickettocreate->ref) && $tickettocreate->ref <= 0)
-								{
+								if (is_numeric($tickettocreate->ref) && $tickettocreate->ref <= 0) {
 									$errorforactions++;
 									$this->error = 'Failed to create ticket: Can\'t get a valid value for the field ref with numbering template = '.$modele.', thirdparty id = '.$thirdpartystatic->id;
 								} else {
 									// Create project
 									$result = $tickettocreate->create($user);
-									if ($result <= 0)
-									{
+									if ($result <= 0) {
 										$errorforactions++;
 										$this->error = 'Failed to create ticket: '.$langs->trans($tickettocreate->error);
 										$this->errors = $tickettocreate->errors;
@@ -2009,15 +2035,12 @@ class EmailCollector extends CommonObject
 								}
 							}
 						}
-					}
-					// Create candidature
-					elseif ($operation['type'] == 'candidature')
-					{
+					} elseif ($operation['type'] == 'candidature') {
+						// Create candidature
 						$candidaturetocreate = new RecruitmentCandidature($this->db);
 
 						$alreadycreated = $candidaturetocreate->fetch(0, '', $msgid);
-						if ($alreadycreated == 0)
-						{
+						if ($alreadycreated == 0) {
 							$description = $descriptiontitle;
 							$description = dol_concatdesc($description, "-----");
 							$description = dol_concatdesc($description, $descriptionmeta);
@@ -2051,66 +2074,59 @@ class EmailCollector extends CommonObject
 
 							// Set candidature ref if not yet defined
 							/*if (empty($candidaturetocreate->ref))				We do not need this because we create object in draft status
-	                    	{
-	                    		// Get next Ref
-	                    		$defaultref = '';
-	                    		$modele = empty($conf->global->CANDIDATURE_ADDON) ? 'mod_candidature_simple' : $conf->global->CANDIDATURE_ADDON;
-
-	                    		// Search template files
-	                    		$file = ''; $classname = ''; $filefound = 0; $reldir = '';
-	                    		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	                    		foreach ($dirmodels as $reldir)
-	                    		{
-	                    			$file = dol_buildpath($reldir."core/modules/ticket/".$modele.'.php', 0);
-	                    			if (file_exists($file))
-	                    			{
-	                    				$filefound = 1;
-	                    				$classname = $modele;
-	                    				break;
-	                    			}
-	                    		}
-
-	                    		if ($filefound)
-	                    		{
-	                    			if ($savesocid > 0)
-	                    			{
-	                    				if ($savesocid != $candidaturetocreate->socid)
-	                    				{
-	                    					$errorforactions++;
-	                    					setEventMessages('You loaded a thirdparty (id='.$savesocid.') and you force another thirdparty id (id='.$candidaturetocreate->socid.') by setting socid in operation with a different value', null, 'errors');
-	                    				}
-	                    			} else {
-	                    				if ($candidaturetocreate->socid > 0)
-	                    				{
-	                    					$thirdpartystatic->fetch($candidaturetocreate->socid);
-	                    				}
-	                    			}
-
-	                    			$result = dol_include_once($reldir."core/modules/ticket/".$modele.'.php');
-	                    			$modModuleToUseForNextValue = new $classname;
-	                    			$defaultref = $modModuleToUseForNextValue->getNextValue(($thirdpartystatic->id > 0 ? $thirdpartystatic : null), $tickettocreate);
-	                    		}
-	                    		$candidaturetocreate->ref = $defaultref;
-	                    	}*/
-
-							if ($errorforthisaction)
 							{
+								// Get next Ref
+								$defaultref = '';
+								$modele = empty($conf->global->CANDIDATURE_ADDON) ? 'mod_candidature_simple' : $conf->global->CANDIDATURE_ADDON;
+
+								// Search template files
+								$file = ''; $classname = ''; $filefound = 0; $reldir = '';
+								$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+								foreach ($dirmodels as $reldir)
+								{
+									$file = dol_buildpath($reldir."core/modules/ticket/".$modele.'.php', 0);
+									if (file_exists($file)) {
+										$filefound = 1;
+										$classname = $modele;
+										break;
+									}
+								}
+
+								if ($filefound) {
+									if ($savesocid > 0) {
+										if ($savesocid != $candidaturetocreate->socid) {
+											$errorforactions++;
+											setEventMessages('You loaded a thirdparty (id='.$savesocid.') and you force another thirdparty id (id='.$candidaturetocreate->socid.') by setting socid in operation with a different value', null, 'errors');
+										}
+									} else {
+										if ($candidaturetocreate->socid > 0)
+										{
+											$thirdpartystatic->fetch($candidaturetocreate->socid);
+										}
+									}
+
+									$result = dol_include_once($reldir."core/modules/ticket/".$modele.'.php');
+									$modModuleToUseForNextValue = new $classname;
+									$defaultref = $modModuleToUseForNextValue->getNextValue(($thirdpartystatic->id > 0 ? $thirdpartystatic : null), $tickettocreate);
+								}
+								$candidaturetocreate->ref = $defaultref;
+							}*/
+
+							if ($errorforthisaction) {
 								$errorforactions++;
 							} else {
 								// Create project
 								$result = $candidaturetocreate->create($user);
-								if ($result <= 0)
-								{
+								if ($result <= 0) {
 									$errorforactions++;
 									$this->error = 'Failed to create ticket: '.join(', ', $candidaturetocreate->errors);
 									$this->errors = $candidaturetocreate->errors;
 								}
 							}
 						}
-					}
-					// Create event specific on hook
-					// this code action is hook..... for support this call
-					elseif (substr($operation['type'], 0, 4) == 'hook') {
+					} elseif (substr($operation['type'], 0, 4) == 'hook') {
+						// Create event specific on hook
+						// this code action is hook..... for support this call
 						global $hookmanager;
 
 						if (!is_object($hookmanager)) {
@@ -2141,23 +2157,19 @@ class EmailCollector extends CommonObject
 							$errorforthisaction++;
 							$this->error = $hookmanager->resPrint;
 						}
-						if ($errorforthisaction)
-						{
+						if ($errorforthisaction) {
 							$errorforactions++;
 						}
 					}
 
-					if (!$errorforactions)
-					{
+					if (!$errorforactions) {
 						$nbactiondoneforemail++;
 					}
 				}
 
 				// Error for email or not ?
-				if (!$errorforactions)
-				{
-					if ($targetdir)
-					{
+				if (!$errorforactions) {
+					if ($targetdir) {
 						dol_syslog("EmailCollector::doCollectOneCollector move message ".$imapemail." to ".$connectstringtarget, LOG_DEBUG);
 						$res = imap_mail_move($connection, $imapemail, $targetdir, 0);
 						if ($res == false) {
@@ -2180,16 +2192,14 @@ class EmailCollector extends CommonObject
 
 				$nbemailprocessed++;
 
-				if (!$errorforemail)
-				{
+				if (!$errorforemail) {
 					$nbactiondone += $nbactiondoneforemail;
 					$nbemailok++;
 
 					$this->db->commit();
 
 					// Stop the loop to process email if we reach maximum collected per collect
-					if ($this->maxemailpercollect > 0 && $nbemailok >= $this->maxemailpercollect)
-					{
+					if ($this->maxemailpercollect > 0 && $nbemailok >= $this->maxemailpercollect) {
 						dol_syslog("EmailCollect::doCollectOneCollector We reach maximum of ".$nbemailok." collected with success, so we stop this collector now.");
 						break;
 					}
@@ -2214,11 +2224,17 @@ class EmailCollector extends CommonObject
 		$this->datelastresult = $now;
 		$this->lastresult = $output;
 		$this->debuginfo = 'IMAP search string used : '.$search;
-		if ($searchhead) $this->debuginfo .= '<br>Then search string into email header : '.$searchhead;
+		if ($searchhead) {
+			$this->debuginfo .= '<br>Then search string into email header : '.$searchhead;
+		}
 
-		if (!$error) $this->datelastok = $now;
+		if (!$error) {
+			$this->datelastok = $now;
+		}
 
-		if (!empty($this->errors)) $this->lastresult .= " - ".join(" - ", $this->errors);
+		if (!empty($this->errors)) {
+			$this->lastresult .= " - ".join(" - ", $this->errors);
+		}
 		$this->codelastresult = ($error ? 'KO' : 'OK');
 		$this->update($user);
 
@@ -2265,20 +2281,20 @@ class EmailCollector extends CommonObject
 	}
 
 	/* partno string
-     0 multipart/mixed
-     1 multipart/alternative
-     1.1 text/plain
-     1.2 text/html
-     2 message/rfc822
-     2 multipart/mixed
-     2.1 multipart/alternative
-     2.1.1 text/plain
-     2.1.2 text/html
-     2.2 message/rfc822
-     2.2 multipart/alternative
-     2.2.1 text/plain
-     2.2.2 text/html
-     */
+	 0 multipart/mixed
+	 1 multipart/alternative
+	 1.1 text/plain
+	 1.2 text/html
+	 2 message/rfc822
+	 2 multipart/mixed
+	 2.1 multipart/alternative
+	 2.1.1 text/plain
+	 2.1.2 text/html
+	 2.2 message/rfc822
+	 2.2 multipart/alternative
+	 2.2.1 text/plain
+	 2.2.2 text/html
+	 */
 	/**
 	 * Sub function for getpart(). Only called by createPartArray() and itself.
 	 *
@@ -2298,25 +2314,22 @@ class EmailCollector extends CommonObject
 		imap_fetchbody($mbox, $mid, $partno) : // multipart
 		imap_body($mbox, $mid); // simple
 		// Any part may be encoded, even plain text messages, so check everything.
-		if ($p->encoding == 4)
+		if ($p->encoding == 4) {
 			$data = quoted_printable_decode($data);
-		elseif ($p->encoding == 3)
+		} elseif ($p->encoding == 3) {
 			$data = base64_decode($data);
+		}
 
 		// PARAMETERS
 		// get all parameters, like charset, filenames of attachments, etc.
 		$params = array();
-		if ($p->parameters)
-		{
-			foreach ($p->parameters as $x)
-			{
+		if ($p->parameters) {
+			foreach ($p->parameters as $x) {
 				$params[strtolower($x->attribute)] = $x->value;
 			}
 		}
-		if ($p->dparameters)
-		{
-			foreach ($p->dparameters as $x)
-			{
+		if ($p->dparameters) {
+			foreach ($p->dparameters as $x) {
 				$params[strtolower($x->attribute)] = $x->value;
 			}
 		}
@@ -2338,18 +2351,18 @@ class EmailCollector extends CommonObject
 			}
 			// Messages may be split in different parts because of inline attachments,
 			// so append parts together with blank row.
-			if (strtolower($p->subtype) == 'plain')
+			if (strtolower($p->subtype) == 'plain') {
 				$plainmsg .= trim($data)."\n\n";
-			else $htmlmsg .= $data."<br><br>";
+			} else {
+				$htmlmsg .= $data."<br><br>";
+			}
 			$charset = $params['charset']; // assume all parts are same charset
-		}
-
-		// EMBEDDED MESSAGE
-		// Many bounce notifications embed the original message as type 2,
-		// but AOL uses type 1 (multipart), which is not handled here.
-		// There are no PHP functions to parse embedded messages,
-		// so this just appends the raw source to the main message.
-		elseif ($p->type == 2 && $data) {
+		} elseif ($p->type == 2 && $data) {
+			// EMBEDDED MESSAGE
+			// Many bounce notifications embed the original message as type 2,
+			// but AOL uses type 1 (multipart), which is not handled here.
+			// There are no PHP functions to parse embedded messages,
+			// so this just appends the raw source to the main message.
 			if (!empty($params['charset'])) {
 				$data = $this->convertStringEncoding($data, $params['charset']);
 			}
@@ -2358,8 +2371,7 @@ class EmailCollector extends CommonObject
 
 		// SUBPART RECURSION
 		if ($p->parts) {
-			foreach ($p->parts as $partno0=>$p2)
-			{
+			foreach ($p->parts as $partno0 => $p2) {
 				$this->getpart($mbox, $mid, $p2, $partno.'.'.($partno0 + 1)); // 1.2, 1.2.1, etc.
 			}
 		}
@@ -2376,52 +2388,52 @@ class EmailCollector extends CommonObject
 	 */
 	protected function convertStringEncoding($string, $fromEncoding, $toEncoding = 'UTF-8')
 	{
-  		if (!$string || $fromEncoding == $toEncoding) {
-  			return $string;
-  		}
-  		$convertedString = function_exists('iconv') ? @iconv($fromEncoding, $toEncoding.'//IGNORE', $string) : null;
-  		if (!$convertedString && extension_loaded('mbstring')) {
-  			$convertedString = @mb_convert_encoding($string, $toEncoding, $fromEncoding);
-  		}
-  		if (!$convertedString) {
-  			throw new Exception('Mime string encoding conversion failed');
-  		}
-  		return $convertedString;
-  	}
+		if (!$string || $fromEncoding == $toEncoding) {
+			return $string;
+		}
+		$convertedString = function_exists('iconv') ? @iconv($fromEncoding, $toEncoding.'//IGNORE', $string) : null;
+		if (!$convertedString && extension_loaded('mbstring')) {
+			$convertedString = @mb_convert_encoding($string, $toEncoding, $fromEncoding);
+		}
+		if (!$convertedString) {
+			throw new Exception('Mime string encoding conversion failed');
+		}
+		return $convertedString;
+	}
 
-  	/**
-  	 * Decode a subject string according to RFC2047
-  	 * Example: '=?Windows-1252?Q?RE=A0:_ABC?=' => 'RE : ABC...'
-  	 * Example: '=?UTF-8?Q?A=C3=A9B?=' => 'AéB'
-  	 * Example: '=?UTF-8?B?2KLYstmF2KfbjNi0?=' =>
-  	 * Example: '=?utf-8?B?UkU6IG1vZHVsZSBkb2xpYmFyciBnZXN0aW9ubmFpcmUgZGUgZmljaGllcnMg?= =?utf-8?B?UsOpZsOpcmVuY2UgZGUgbGEgY29tbWFuZGUgVFVHRURJSklSIOKAkyBwYXNz?= =?utf-8?B?w6llIGxlIDIyLzA0LzIwMjA=?='
-  	 *
-  	 * @param 	string	$subject		Subject
-  	 * @return 	string					Decoded subject (in UTF-8)
-  	 */
-  	protected function decodeSMTPSubject($subject)
-  	{
-  		// Decode $overview[0]->subject according to RFC2047
-  		// Can use also imap_mime_header_decode($str)
-  		// Can use also mb_decode_mimeheader($str)
-  		// Can use also iconv_mime_decode($str, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8')
+	/**
+	 * Decode a subject string according to RFC2047
+	 * Example: '=?Windows-1252?Q?RE=A0:_ABC?=' => 'RE : ABC...'
+	 * Example: '=?UTF-8?Q?A=C3=A9B?=' => 'AéB'
+	 * Example: '=?UTF-8?B?2KLYstmF2KfbjNi0?=' =>
+	 * Example: '=?utf-8?B?UkU6IG1vZHVsZSBkb2xpYmFyciBnZXN0aW9ubmFpcmUgZGUgZmljaGllcnMg?= =?utf-8?B?UsOpZsOpcmVuY2UgZGUgbGEgY29tbWFuZGUgVFVHRURJSklSIOKAkyBwYXNz?= =?utf-8?B?w6llIGxlIDIyLzA0LzIwMjA=?='
+	 *
+	 * @param 	string	$subject		Subject
+	 * @return 	string					Decoded subject (in UTF-8)
+	 */
+	protected function decodeSMTPSubject($subject)
+	{
+		// Decode $overview[0]->subject according to RFC2047
+		// Can use also imap_mime_header_decode($str)
+		// Can use also mb_decode_mimeheader($str)
+		// Can use also iconv_mime_decode($str, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8')
 		if (function_exists('imap_mime_header_decode') && function_exists('iconv_mime_decode')) {
-  			$elements = imap_mime_header_decode($subject);
-  			$newstring = '';
-  			if (!empty($elements)) {
-  				$num = count($elements);
-  				for ($i = 0; $i < $num; $i++) {
-  					$stringinutf8 = (in_array(strtoupper($elements[$i]->charset), array('DEFAULT', 'UTF-8')) ? $elements[$i]->text : iconv_mime_decode($elements[$i]->text, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, $elements[$i]->charset));
-  					$newstring .= $stringinutf8;
-  				}
-  				$subject = $newstring;
-  			}
+			$elements = imap_mime_header_decode($subject);
+			$newstring = '';
+			if (!empty($elements)) {
+				$num = count($elements);
+				for ($i = 0; $i < $num; $i++) {
+					$stringinutf8 = (in_array(strtoupper($elements[$i]->charset), array('DEFAULT', 'UTF-8')) ? $elements[$i]->text : iconv_mime_decode($elements[$i]->text, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, $elements[$i]->charset));
+					$newstring .= $stringinutf8;
+				}
+				$subject = $newstring;
+			}
 		} elseif (!function_exists('mb_decode_mimeheader')) {
 			$subject = mb_decode_mimeheader($subject);
 		} elseif (function_exists('iconv_mime_decode')) {
-  			$subject = iconv_mime_decode($subject, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
-  		}
+			$subject = iconv_mime_decode($subject, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
+		}
 
-  		return $subject;
-  	}
+		return $subject;
+	}
 }
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index 58aaf9efdb7..0b8dfbca973 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -155,25 +155,24 @@ class EmailCollectorAction extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
 
 		// Unset fields that are disabled
-		foreach ($this->fields as $key => $val)
-		{
-			if (isset($val['enabled']) && empty($val['enabled']))
-			{
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
 				unset($this->fields[$key]);
 			}
 		}
 
 		// Translate some data of arrayofkeyval
-		foreach ($this->fields as $key => $val)
-		{
-			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
-			{
-				foreach ($val['arrayofkeyval'] as $key2 => $val2)
-				{
+		foreach ($this->fields as $key => $val) {
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+				foreach ($val['arrayofkeyval'] as $key2 => $val2) {
 					$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
 				}
 			}
@@ -190,8 +189,7 @@ class EmailCollectorAction extends CommonObject
 	public function create(User $user, $notrigger = false)
 	{
 		global $langs;
-		if (empty($this->type))
-		{
+		if (empty($this->type)) {
 			$langs->load("errors");
 			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"));
 			return -1;
@@ -230,14 +228,11 @@ class EmailCollectorAction extends CommonObject
 		$object->title = $langs->trans("CopyOf")." ".$object->title;
 		// ...
 		// Clear extrafields that are unique
-		if (is_array($object->array_options) && count($object->array_options) > 0)
-		{
+		if (is_array($object->array_options) && count($object->array_options) > 0) {
 			$extrafields->fetch_name_optionals_label($this->table_element);
-			foreach ($object->array_options as $key => $option)
-			{
+			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
-				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
-				{
+				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey])) {
 					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
@@ -275,7 +270,9 @@ class EmailCollectorAction extends CommonObject
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && !empty($this->table_element_line)) {
+			$this->fetchLines();
+		}
 		return $result;
 	}
 
@@ -285,13 +282,13 @@ class EmailCollectorAction extends CommonObject
 	 * @return int         <0 if KO, 0 if not found, >0 if OK
 	 */
 	/*public function fetchLines()
-    {
-        $this->lines=array();
+	{
+		$this->lines=array();
 
-        // Load lines with object EmailcollectorActionLine
+		// Load lines with object EmailcollectorActionLine
 
-        return count($this->lines)?1:0;
-    }*/
+		return count($this->lines)?1:0;
+	}*/
 
 	/**
 	 * Update object into database
@@ -333,7 +330,9 @@ class EmailCollectorAction extends CommonObject
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 		$companylink = '';
@@ -344,19 +343,20 @@ class EmailCollectorAction extends CommonObject
 
 		$url = dol_buildpath('/emailcollector/emailcollectoraction_card.php', 1).'?id='.$this->id;
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowEmailcollectorAction");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -364,20 +364,26 @@ class EmailCollectorAction extends CommonObject
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
 			/*
-             $hookmanager->initHooks(array('emailcollectoractiondao'));
-             $parameters=array('id'=>$this->id);
-             $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-             if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-             */
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+			 $hookmanager->initHooks(array('emailcollectoractiondao'));
+			 $parameters=array('id'=>$this->id);
+			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+			 */
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -385,8 +391,11 @@ class EmailCollectorAction extends CommonObject
 		$hookmanager->initHooks(array('emailcollectoractiondao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -413,40 +422,47 @@ class EmailCollectorAction extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		if (empty($this->labelStatus))
-		{
+		if (empty($this->labelStatus)) {
 			global $langs;
 			//$langs->load("emailcollector");
 			$this->labelStatus[1] = $langs->trans('Enabled');
 			$this->labelStatus[0] = $langs->trans('Disabled');
 		}
 
-		if ($mode == 0)
-		{
+		if ($mode == 0) {
 			return $this->labelStatus[$status];
-		} elseif ($mode == 1)
-		{
+		} elseif ($mode == 1) {
 			return $this->labelStatus[$status];
-		} elseif ($mode == 2)
-		{
-			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-		} elseif ($mode == 3)
-		{
-			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-		} elseif ($mode == 4)
-		{
-			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-		} elseif ($mode == 5)
-		{
-			if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-			elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-		} elseif ($mode == 6)
-		{
-			if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-			elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+		} elseif ($mode == 2) {
+			if ($status == 1) {
+				return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			} elseif ($status == 0) {
+				return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			}
+		} elseif ($mode == 3) {
+			if ($status == 1) {
+				return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			} elseif ($status == 0) {
+				return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+			}
+		} elseif ($mode == 4) {
+			if ($status == 1) {
+				return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			} elseif ($status == 0) {
+				return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			}
+		} elseif ($mode == 5) {
+			if ($status == 1) {
+				return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			} elseif ($status == 0) {
+				return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+			}
+		} elseif ($mode == 6) {
+			if ($status == 1) {
+				return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			} elseif ($status == 0) {
+				return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+			}
 		}
 	}
 
@@ -463,28 +479,23 @@ class EmailCollectorAction extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.rowid = '.$id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
 
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
 
-				if ($obj->fk_user_cloture)
-				{
+				if ($obj->fk_user_cloture) {
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
 					$this->user_cloture = $cluser;
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index 71edce42d94..0e6e54529a8 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -124,25 +124,24 @@ class EmailCollectorFilter extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
 
 		// Unset fields that are disabled
-		foreach ($this->fields as $key => $val)
-		{
-			if (isset($val['enabled']) && empty($val['enabled']))
-			{
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
 				unset($this->fields[$key]);
 			}
 		}
 
 		// Translate some data of arrayofkeyval
-		foreach ($this->fields as $key => $val)
-		{
-			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
-			{
-				foreach ($val['arrayofkeyval'] as $key2 => $val2)
-				{
+		foreach ($this->fields as $key => $val) {
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+				foreach ($val['arrayofkeyval'] as $key2 => $val2) {
 					$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
 				}
 			}
@@ -159,14 +158,12 @@ class EmailCollectorFilter extends CommonObject
 	public function create(User $user, $notrigger = false)
 	{
 		global $langs;
-		if (empty($this->type))
-		{
+		if (empty($this->type)) {
 			$langs->load("errors");
 			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"));
 			return -1;
 		}
-		if (!in_array($this->type, array('seen', 'unseen', 'unanswered', 'answered', 'withtrackingidinmsgid', 'withouttrackingidinmsgid', 'withtrackingid', 'withouttrackingid', 'isanswer', 'isnotanswer')) && empty($this->rulevalue))
-		{
+		if (!in_array($this->type, array('seen', 'unseen', 'unanswered', 'answered', 'withtrackingidinmsgid', 'withouttrackingidinmsgid', 'withtrackingid', 'withouttrackingid', 'isanswer', 'isnotanswer')) && empty($this->rulevalue)) {
 			$langs->load("errors");
 			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("SearchString"));
 			return -2;
@@ -205,14 +202,11 @@ class EmailCollectorFilter extends CommonObject
 		$object->title = $langs->trans("CopyOf")." ".$object->title;
 		// ...
 		// Clear extrafields that are unique
-		if (is_array($object->array_options) && count($object->array_options) > 0)
-		{
+		if (is_array($object->array_options) && count($object->array_options) > 0) {
 			$extrafields->fetch_name_optionals_label($this->table_element);
-			foreach ($object->array_options as $key => $option)
-			{
+			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
-				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
-				{
+				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey])) {
 					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
@@ -250,7 +244,9 @@ class EmailCollectorFilter extends CommonObject
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && !empty($this->table_element_line)) {
+			$this->fetchLines();
+		}
 		return $result;
 	}
 
@@ -308,7 +304,9 @@ class EmailCollectorFilter extends CommonObject
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 		$companylink = '';
@@ -319,19 +317,20 @@ class EmailCollectorFilter extends CommonObject
 
 		$url = dol_buildpath('/emailcollector/emailcollectorfilter_card.php', 1).'?id='.$this->id;
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowEmailcollectorFilter");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -339,20 +338,26 @@ class EmailCollectorFilter extends CommonObject
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
 			/*
-             $hookmanager->initHooks(array('emailcollectorfilterdao'));
-             $parameters=array('id'=>$this->id);
-             $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-             if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-             */
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+			 $hookmanager->initHooks(array('emailcollectorfilterdao'));
+			 $parameters=array('id'=>$this->id);
+			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+			 */
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -360,8 +365,11 @@ class EmailCollectorFilter extends CommonObject
 		$hookmanager->initHooks(array('emailcollectorfilterdao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -388,40 +396,47 @@ class EmailCollectorFilter extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		if (empty($this->labelStatus))
-		{
+		if (empty($this->labelStatus)) {
 			global $langs;
 			//$langs->load("emailcollector");
 			$this->labelStatus[1] = $langs->trans('Enabled');
 			$this->labelStatus[0] = $langs->trans('Disabled');
 		}
 
-		if ($mode == 0)
-		{
+		if ($mode == 0) {
 			return $this->labelStatus[$status];
-		} elseif ($mode == 1)
-		{
+		} elseif ($mode == 1) {
 			return $this->labelStatus[$status];
-		} elseif ($mode == 2)
-		{
-			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-		} elseif ($mode == 3)
-		{
-			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-		} elseif ($mode == 4)
-		{
-			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-		} elseif ($mode == 5)
-		{
-			if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-			elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-		} elseif ($mode == 6)
-		{
-			if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-			elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+		} elseif ($mode == 2) {
+			if ($status == 1) {
+				return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			} elseif ($status == 0) {
+				return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			}
+		} elseif ($mode == 3) {
+			if ($status == 1) {
+				return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			} elseif ($status == 0) {
+				return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+			}
+		} elseif ($mode == 4) {
+			if ($status == 1) {
+				return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			} elseif ($status == 0) {
+				return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			}
+		} elseif ($mode == 5) {
+			if ($status == 1) {
+				return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			} elseif ($status == 0) {
+				return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+			}
+		} elseif ($mode == 6) {
+			if ($status == 1) {
+				return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			} elseif ($status == 0) {
+				return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+			}
 		}
 	}
 
@@ -438,28 +453,23 @@ class EmailCollectorFilter extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.rowid = '.$id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
 
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
 
-				if ($obj->fk_user_cloture)
-				{
+				if ($obj->fk_user_cloture) {
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
 					$this->user_cloture = $cluser;