Commit c06e4686 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

7.2.2

parent 715602f5

CHANGELOG.md

+5 −0
Original line number Diff line number Diff line 
7.2.2

-----

- Correction du bug lié à la réexpédition d'un mail

- Ajout d'une action pour controler la configuration du module



7.2.1

-----

- Bug Fixe pour les actions console

config/merged/mail.config.php

+11 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ return array( 
                [

                    'controller' => MailController::class,

                    'action'     => [

                        'afficher-configuration',

                        'supprimer',

                    ],

                    'privileges' => [
@@ -122,6 +123,16 @@ return array( 
                            ],

                        ],

                    ],

                    'afficher-configuration' => [

                        'type' => Literal::class,

                        'options' => [

                            'route' => '/afficher-configuration',

                            'defaults' => [

                                /** @see MailController::afficherConfigurationAction() */

                                'action' => 'afficher-configuration',

                            ],

                        ],

                    ],

                ],

            ],

        ],

src/UnicaenMail/Controller/MailController.php

+10 −0
Original line number Diff line number Diff line
@@ -26,6 +26,16 @@ class MailController extends AbstractActionController 


    }



    public function afficherConfigurationAction(): ViewModel

    {

        $config = $this->getMailService()->getConfig();



        return new ViewModel([

            'title' => 'Configuration du module',

            'config' => $config,

        ]);

    }



    public function afficherAction(): ViewModel

    {

        $mail = $this->getMailService()->getRequestedMail($this);

src/UnicaenMail/Controller/MailControllerFactory.php

+1 −3
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 


namespace UnicaenMail\Controller;



use Interop\Container\ContainerInterface;

use Psr\Container\ContainerExceptionInterface;

use Psr\Container\ContainerInterface;

use Psr\Container\NotFoundExceptionInterface;

use UnicaenMail\Service\Mail\MailService;
@@ -11,8 +11,6 @@ class MailControllerFactory 
{



    /**

     * @param ContainerInterface $container

     * @return MailController

     * @throws ContainerExceptionInterface

     * @throws NotFoundExceptionInterface

     */

src/UnicaenMail/Service/Mail/MailService.php

+6 −2
Original line number Diff line number Diff line
@@ -77,6 +77,10 @@ EOS; 
        $this->config = $config;

    }



    public function getConfig(): array

    {

        return $this->config;

    }



    public function createMailEntity(): object

    {
@@ -356,9 +360,9 @@ EOS; 
        $precedenteDateEnvoi = $mail->getDateEnvoi();

        $supplement = "<p><strong>Ce courrier électronique est une ré-expédition du courrier envoyé initialement le " . $precedenteDateEnvoi->format('d/m/Y à H:i') . "</strong></p>";



        //todo les pieces jointes

        $nMail = $this->sendMail($mail->getDestinataires(), $mail->getSujet(), $mail->getCorps(), null, null, null, $supplement);

        $nMail = $this->sendMail($mail->getDestinataires(), $mail->getSujet(), ($supplement. $mail->getCorps()), null, $mail->getAttachmentPaths(), $mail->getReplyTo());

        $nMail->setMotsClefs(explode(Mail::MOTCLEF_SEPARATEUR, $mail->getMotsClefs()));

        $nMail->setCorps($mail->getCorps());

        $this->update($nMail);

        return $mail;