diff --git a/VERSIONS_HOTLINE/123836 b/VERSIONS_HOTLINE/123836 new file mode 100644 index 0000000000000000000000000000000000000000..c77bdd5e1a7bb7404ca51b5f46660babf5d9a140 --- /dev/null +++ b/VERSIONS_HOTLINE/123836 @@ -0,0 +1 @@ + - ticket #123836 : Pouvoir personnaliser l'objet des mails envoyés par formulaire \ No newline at end of file diff --git a/application/modules/opac/controllers/FormulaireController.php b/application/modules/opac/controllers/FormulaireController.php index 822c42455f7ebcee2ddd129e67795c46555ae284..cc16abf59ab60c405420b57f0a0182170bf5cb95 100644 --- a/application/modules/opac/controllers/FormulaireController.php +++ b/application/modules/opac/controllers/FormulaireController.php @@ -46,17 +46,17 @@ class FormulaireController extends ZendAfi_Controller_Action { $this->view->article = $article; if ($address = $article->getDestinationEmail()) { - $this->_sendFormEmail($address, $formulaire->dataAsBodyText()); + $this->_sendFormEmail($address, $formulaire->dataAsBodyText(), $article->getTitre()); $this->view->email_sent = true; } } - protected function _sendFormEmail($address, $body) { + protected function _sendFormEmail($address, $body, $subject) { $mail = new ZendAfi_Mail('utf8'); $mail->setFrom(Class_Profil::getCurrentProfil()->getMailSiteOrPortail()) ->addTo($address) - ->setSubject('[Bokeh] ' . $this->_('Envoi d\'un formulaire')) + ->setSubject('[ '.Class_Profil::getPortail()->getLibelle().' ] '. $this->_('Réponse formulaire :').' '.$subject) ->setBodyText($body); $this->_sendMail($mail); diff --git a/tests/application/modules/opac/controllers/FormulaireControllerTest.php b/tests/application/modules/opac/controllers/FormulaireControllerTest.php index 7d16714b71308c0723c6f73c4772eadb8b9b8080..37ec8f9aa8b372c2c155624092011c693991bb68 100644 --- a/tests/application/modules/opac/controllers/FormulaireControllerTest.php +++ b/tests/application/modules/opac/controllers/FormulaireControllerTest.php @@ -104,7 +104,7 @@ class FormulaireControllerWithEmailPostActionTest extends FormulaireControllerPo /** @test */ public function emailSubjectShouldBeFormSent() { - $this->assertEquals('[Bokeh] Envoi d\'un formulaire', $this->mock_transport->getSentMails()[0]->getSubject()); + $this->assertContains('[ portail ] Réponse formulaire : Contactez nous', quoted_printable_decode($this->mock_transport->getSentMails()[0]->getSubject())); } }