From 5f933150971dcb5c88619b1768371dfbf102a7f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 19 Nov 2018 15:14:46 +0100
Subject: [PATCH] Clean code

---
 htdocs/comm/action/class/actioncomm.class.php             | 8 ++++----
 .../triggers/interface_50_modAgenda_ActionsAuto.class.php | 2 +-
 htdocs/emailcollector/class/emailcollector.class.php      | 6 +++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index d703e57204f..aef77513e7b 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1333,10 +1333,10 @@ class ActionComm extends CommonObject
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
-                if ($option == 'nolink') {
-                    $linkstart = '';
-                    $linkend = '';
-                }
+		if ($option == 'nolink') {
+			$linkstart = '';
+			$linkend = '';
+		}
 		//print 'rrr'.$this->libelle.'rrr'.$this->label.'rrr'.$withpicto;
 
         if ($withpicto == 2)
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index ae55f589cf2..09725355f43 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -769,7 +769,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		    $object->sendtoid=0;
 		}
 
-		$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
+		$object->actionmsg = $langs->transnoentities("Author").': '.$user->login."\n".$object->actionmsg;
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index b45d32ced19..911d40ff57e 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -697,7 +697,7 @@ class EmailCollector extends CommonObject
 
 			$this->error.='EmailCollector ID '.$emailcollector->id.':'.$emailcollector->error.'<br>';
 			if (! empty($emailcollector->errors)) $this->error.=join('<br>', $emailcollector->errors);
-			$this->output.='EmailCollector ID '.$emailcollector->id.': '.$emailcollector->output.'<br>';
+			$this->output.='EmailCollector ID '.$emailcollector->id.': '.$emailcollector->lastresult.'<br>';
 		}
 
 		return $nberror;
@@ -1286,6 +1286,8 @@ class EmailCollector extends CommonObject
 
 										// Create thirdparty
 										$thirdpartystatic->name = $nametouseforthirdparty;
+										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);
@@ -1389,6 +1391,7 @@ class EmailCollector extends CommonObject
 
 						$projecttocreate->title = $subject;
 						$projecttocreate->date_start = $now;
+						$projecttocreate->date_end = '';
 						$projecttocreate->opp_status = $id_opp_status;
 						$projecttocreate->opp_percent = $percent_opp_status;
 						$projecttocreate->description = ($note_private?$note_private."\n":'').$messagetext;
@@ -1516,6 +1519,7 @@ class EmailCollector extends CommonObject
 
 		$this->datelastresult = $now;
 		$this->lastresult = $output;
+
 		if (! empty($this->errors)) $this->lastresult.= " - ".join(" - ", $this->errors);
 		$this->codelastresult = ($error ? 'KO' : 'OK');
 		$this->update($user);