diff --git a/CHANGELOG.md b/CHANGELOG.md index c6c114e8e7b76626c3a65e00caabf4959f6429c7..7fe78867b00f87d140e15bf40c2f88186e71fb42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +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 diff --git a/config/merged/mail.config.php b/config/merged/mail.config.php index 5e8d82906ead3f352e1077ff3bd81ce57a99674a..bc17705183dc84dfb3ee72185a511d1d986e3305 100644 --- a/config/merged/mail.config.php +++ b/config/merged/mail.config.php @@ -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', + ], + ], + ], ], ], ], diff --git a/src/UnicaenMail/Controller/MailController.php b/src/UnicaenMail/Controller/MailController.php index 5bcffa87f3ca182998ef636c55ac7a2a40eb852e..9812697fcc108d36cf541730dfb834ec86a24758 100644 --- a/src/UnicaenMail/Controller/MailController.php +++ b/src/UnicaenMail/Controller/MailController.php @@ -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); diff --git a/src/UnicaenMail/Controller/MailControllerFactory.php b/src/UnicaenMail/Controller/MailControllerFactory.php index 5c06f162191f55106de073b54d1ed04b4aa1558f..412f5390e539d99d7475de1df32ab1ec10a6cdd9 100644 --- a/src/UnicaenMail/Controller/MailControllerFactory.php +++ b/src/UnicaenMail/Controller/MailControllerFactory.php @@ -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 */ diff --git a/src/UnicaenMail/Service/Mail/MailService.php b/src/UnicaenMail/Service/Mail/MailService.php index 8683fab4ec252a604a9eea7e1fe2041f3b877972..826f5c316779afd9b6f38e109be85cd4a9c843cb 100644 --- a/src/UnicaenMail/Service/Mail/MailService.php +++ b/src/UnicaenMail/Service/Mail/MailService.php @@ -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; diff --git a/src/UnicaenMail/Service/Mail/MailServiceFactory.php b/src/UnicaenMail/Service/Mail/MailServiceFactory.php index 83028032a36188b98151f0738225884ff31dcb39..510369ae0a69612489eea5da3717a93b4d7d6211 100644 --- a/src/UnicaenMail/Service/Mail/MailServiceFactory.php +++ b/src/UnicaenMail/Service/Mail/MailServiceFactory.php @@ -3,8 +3,8 @@ namespace UnicaenMail\Service\Mail; use Doctrine\ORM\EntityManager; -use Interop\Container\ContainerInterface; use Psr\Container\ContainerExceptionInterface; +use Psr\Container\ContainerInterface; use Psr\Container\NotFoundExceptionInterface; use Symfony\Component\Mailer\Mailer; use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport; diff --git a/view/unicaen-mail/mail/afficher-configuration.phtml b/view/unicaen-mail/mail/afficher-configuration.phtml new file mode 100644 index 0000000000000000000000000000000000000000..f8d8e1f0b7b313e4196e0e99b2837f6dc82c71dc --- /dev/null +++ b/view/unicaen-mail/mail/afficher-configuration.phtml @@ -0,0 +1,14 @@ +<?php + +/** + * @see \UnicaenMail\Controller\MailController::afficherConfigurationAction() + * @var array $config + */ + +?> + + +<?php foreach ($config as $key => $value): ?> + <h2> <?php echo $key; ?> </h2> + <?php var_dump($value); ?> +<?php endforeach; ?> diff --git a/view/unicaen-mail/mail/index.phtml b/view/unicaen-mail/mail/index.phtml index 58241edc1419611659e98f73f01ddd2a3be1cbd9..79c1906d9e3f149dd4e3ce10a34e0d79f97fc549 100644 --- a/view/unicaen-mail/mail/index.phtml +++ b/view/unicaen-mail/mail/index.phtml @@ -14,6 +14,7 @@ $this->headTitle($title); $canTest = $this->isAllowed(MailPrivileges::getResourceId(MailPrivileges::MAIL_AFFICHER)); +$canAfficherConfiguration = $this->isAllowed(MailPrivileges::getResourceId(MailPrivileges::MAIL_SUPPRIMER)); ?> @@ -23,11 +24,22 @@ $canTest = $this->isAllowed(MailPrivileges::getResourceId(MailPrivileges::MAIL_A <div class="row mb-3"> <div class="col-md-12"> - <a href="<?php echo $this->url('mail/test', [], [], true); ?>" - class="btn btn-primary action ajax-modal" data-event="modification"> - <span class="icon icon-notifier"></span> - Envoi d'un mail de test - </a> + <?php if ($canTest): ?> + <?php /** @see \UnicaenMail\Controller\MailController::testAction() */ ?> + <a href="<?php echo $this->url('mail/test', [], [], true); ?>" + class="btn btn-primary ajax-modal" data-event="modification"> + <span class="icon icon-notifier"></span> + Envoi d'un mail de test + </a> + <?php endif; ?> + <?php if ($canAfficherConfiguration) : ?> + <?php /** @see \UnicaenMail\Controller\MailController::afficherConfigurationAction() */ ?> + <a href="<?php echo $this->url('mail/afficher-configuration', [], [], true); ?>" + class="btn btn-secondary ajax-modal"> + <span class="icon icon-gerer"></span> + Vérification de la configuration + </a> + <?php endif; ?> </div> </div>