Loading src/UnicaenMail/Service/Mail/MailService.php +11 −7 Changes for src/UnicaenMail/Service/Mail/MailService.php: 11 added lines, 7 removed lines. Original line number Diff line number Diff line Loading @@ -25,11 +25,19 @@ class MailService { private $redirectTo; private $doNotSend; public function __construct(TransportInterface $transport, $redirectTo, $doNotSend) /** info sur l'expediteur */ private $expediteurNom; private $expediteurMail; private $sigle; public function __construct(TransportInterface $transport, $redirectTo, $doNotSend, $expediteurNom, $expediteurMail, $sigle) { $this->transport = $transport; $this->redirectTo = $redirectTo; $this->doNotSend = $doNotSend; $this->expediteurNom=$expediteurNom; $this->expediteurMail=$expediteurMail; $this->sigle=$sigle; } /** GESTION DES ENTITES *******************************************************************************************/ Loading Loading @@ -151,11 +159,7 @@ class MailService { { $message = (new Message())->setEncoding('UTF-8'); /** TODO rependre depuis les parametre ou la config ... (parametre dans l'ancien temps) */ $email = 'ne-pas-repondre@unicaen.fr'; $name = 'Application'; $message->setFrom($email, $name); $message->setFrom($this->expediteurMail, $this->expediteurNom); if (!is_array($to)) $to = [$to]; if ($this->doNotSend) { $message->addTo($this->redirectTo); Loading @@ -174,7 +178,7 @@ class MailService { $this->create($mail); $sujet = '['.$name.'] ' . $subject; $sujet = '['.$this->sigle.'] ' . $subject; if ($this->doNotSend) { $sujet .= ' {REDIR}'; } Loading src/UnicaenMail/Service/Mail/MailServiceFactory.php +4 −1 Changes for src/UnicaenMail/Service/Mail/MailServiceFactory.php: 4 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -23,7 +23,10 @@ class MailServiceFactory { */ $entityManager = $container->get('doctrine.entitymanager.orm_default'); $service = new MailService($transport, $config['redirect_to'], $config['do_not_send']); $service = new MailService($transport, $config['redirect_to'], $config['do_not_send'], $config['expediteur'], $config['email'], $config['sigle'] ); $service->setEntityManager($entityManager); return $service; } Loading Loading
src/UnicaenMail/Service/Mail/MailService.php +11 −7 Changes for src/UnicaenMail/Service/Mail/MailService.php: 11 added lines, 7 removed lines. Original line number Diff line number Diff line Loading @@ -25,11 +25,19 @@ class MailService { private $redirectTo; private $doNotSend; public function __construct(TransportInterface $transport, $redirectTo, $doNotSend) /** info sur l'expediteur */ private $expediteurNom; private $expediteurMail; private $sigle; public function __construct(TransportInterface $transport, $redirectTo, $doNotSend, $expediteurNom, $expediteurMail, $sigle) { $this->transport = $transport; $this->redirectTo = $redirectTo; $this->doNotSend = $doNotSend; $this->expediteurNom=$expediteurNom; $this->expediteurMail=$expediteurMail; $this->sigle=$sigle; } /** GESTION DES ENTITES *******************************************************************************************/ Loading Loading @@ -151,11 +159,7 @@ class MailService { { $message = (new Message())->setEncoding('UTF-8'); /** TODO rependre depuis les parametre ou la config ... (parametre dans l'ancien temps) */ $email = 'ne-pas-repondre@unicaen.fr'; $name = 'Application'; $message->setFrom($email, $name); $message->setFrom($this->expediteurMail, $this->expediteurNom); if (!is_array($to)) $to = [$to]; if ($this->doNotSend) { $message->addTo($this->redirectTo); Loading @@ -174,7 +178,7 @@ class MailService { $this->create($mail); $sujet = '['.$name.'] ' . $subject; $sujet = '['.$this->sigle.'] ' . $subject; if ($this->doNotSend) { $sujet .= ' {REDIR}'; } Loading
src/UnicaenMail/Service/Mail/MailServiceFactory.php +4 −1 Changes for src/UnicaenMail/Service/Mail/MailServiceFactory.php: 4 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -23,7 +23,10 @@ class MailServiceFactory { */ $entityManager = $container->get('doctrine.entitymanager.orm_default'); $service = new MailService($transport, $config['redirect_to'], $config['do_not_send']); $service = new MailService($transport, $config['redirect_to'], $config['do_not_send'], $config['expediteur'], $config['email'], $config['sigle'] ); $service->setEntityManager($entityManager); return $service; } Loading