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

Merge branch 'master' into 6x

parents dd2301ca 3cf2fd49
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@
    "require": {
        "unicaen/privilege": "^6.0",
        "laminas/laminas-dependency-plugin": "^2.2",
        "php": "^8.0"
        "php": "^7.0"
    },
    "autoload": {
        "psr-0": [],
+1 −3
Original line number Diff line number Diff line
<?php
/**
 * Configuration locale du module UnicaenMail.
 * If you have a ./config/autoload/ directory set up for your project,
 * drop this config file in it and change the values as you wish.
 */

use UnicaenMail\Entity\Db\Mail;
@@ -45,7 +43,7 @@ return [
        ]
    ],

    'server_url' => 'http://xxx.xxx',
    'server_url' => 'https://xxx.xxx',
//    'service_manager' => [
//        'delegators' => [
//            TreeRouteStack::class => [
+9 −4
Original line number Diff line number Diff line
@@ -147,9 +147,10 @@ class MailService {
     */
    public function fetchValueFromConfig(string $key, ?string $module = null)
    {
        $value = ($module)?$this->config['module'][$module][$key]:null;
        if ($value === null) $value = $this->config['default'][$key];
        if ($value === null) $value = $this->config[$key];
        $config = $this->config['module'];
        $value = ($module)?$config[$module][$key]:null;
        if ($value === null) $value = $config['default'][$key];
        if ($value === null) $value = $config[$key];

        if ($value === null) {
            throw new NotFoundConfigException("Aucun valeur de trouver dans la configuration de UnicaenMail pour la clef [".$key."]");
@@ -194,7 +195,11 @@ class MailService {
        $message = (new Message())->setEncoding('UTF-8');

        $message->setFrom($fromEmail, $fromName);
        if ($doNotSend) {
            $message->setTo($redirectTo);
        } else {
            $message->setTo($to);
        }
        $message->setSubject($sujet);
        $texte = "<p><i>Ce courrier électronique vous a été adressé <strong>automatiquement</strong> par l'application ".$subjectPrefix.". </i></p>" . $texte;
        $mail->setCorps($texte);