afup#1416 mails

stakovicz · Jan 10, 2024 · d44c6ba · d44c6ba
1 parent 340ac48
commit d44c6ba
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 58 deletions.
diff --git a/app/config/config_test.yml b/app/config/config_test.yml
@@ -21,6 +21,14 @@ parameters:
     github_authenticator: "AppBundle\\Security\\TestGithubAuthenticator"
     slack_url: null
 
+    smtp_host: "mailcatcher"
+    smtp_tls: 0
+    smtp_username: ""
+    smtp_password: ""
+    smtp_port: 1025
+    mailer_force_recipients: []
+    mailer_bcc: []
+
 services:
     AppBundle\Offices\OfficeFinder:
         class: AppBundle\Offices\NullOfficeFinder

diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
@@ -7,8 +7,8 @@ parameters:
     database_name:     symfony
     database_user:     root
     database_password: ~
-
-    slack_url: ""
+    # You should uncomment this if you want use pdo_sqlite
+    # database_path: "%kernel.root_dir%/data.db3"
 
     # A secret key that's used to generate certain security-related tokens
     secret:            ThisTokenIsNotSoSecretChangeIt
@@ -23,6 +23,9 @@ parameters:
 
     home_algolia_enabled: false
 
+    # Slack url for notifications
+    slack_url: 'http://yolo'
+
     twitter_oauth_access_token: ""
     twitter_oauth_access_token_secret: ""
     twitter_consumer_key: ""
@@ -69,3 +72,11 @@ parameters:
     paybox_identifiant: "110647233"
 
     blog_api_key: 123456
+
+    smtp_host: "mailcatcher"
+    smtp_tls: 0
+    smtp_username: ""
+    smtp_password: ""
+    smtp_port: 1025
+    mailer_force_recipients: []
+    mailer_bcc: []
diff --git a/app/config/parameters.yml.dist-docker b/app/config/parameters.yml.dist-docker
@@ -72,3 +72,11 @@ parameters:
     paybox_identifiant: "110647233"
 
     blog_api_key: 123456
+
+    smtp_host: "mailcatcher"
+    smtp_tls: 0
+    smtp_username: ""
+    smtp_password: ""
+    smtp_port: 1025
+    mailer_force_recipients: []
+    mailer_bcc: []
diff --git a/configs/application/config-test.php b/configs/application/config-test.php
@@ -1,15 +1,6 @@
 <?php
 $configuration['web']['path']='/';
 
-$configuration['mails']['serveur_smtp']='mailcatcher';
-$configuration['mails']['email_expediteur']='bureau@afup.org';
-$configuration['mails']['nom_expediteur']='Bureau AFUP';
-$configuration['mails']['force_destinataire']='';
-$configuration['mails']['bcc']='';
-$configuration['mails']['tls']='0';
-$configuration['mails']['port']='1025';
-$configuration['mails']['username']='';
-$configuration['mails']['password']='';
 $configuration['afup']['raison_sociale']='AFUP';
 $configuration['afup']['adresse']='32, Boulevard de Strasbourg
 CS 30108';

diff --git a/configs/application/config.php.dist b/configs/application/config.php.dist
@@ -1,15 +1,6 @@
 <?php
 $configuration['web']['path']='http://.dev/';
 
-$configuration['mails']['serveur_smtp']='';
-$configuration['mails']['email_expediteur']='bureau@afup.org';
-$configuration['mails']['nom_expediteur']='Bureau AFUP';
-$configuration['mails']['force_destinataire']='';
-$configuration['mails']['bcc']='tresorier@afup.org';
-$configuration['mails']['tls']='0';
-$configuration['mails']['port']='';
-$configuration['mails']['username']='';
-$configuration['mails']['password']='';
 $configuration['afup']['raison_sociale']='AFUP';
 $configuration['afup']['adresse']='32, Boulevard de Strasbourg
 CS 30108';

diff --git a/configs/application/config.php.dist-docker b/configs/application/config.php.dist-docker
@@ -1,15 +1,6 @@
 <?php
 $configuration['web']['path']='/';
 
-$configuration['mails']['serveur_smtp']='mailcatcher';
-$configuration['mails']['email_expediteur']='bureau@afup.org';
-$configuration['mails']['nom_expediteur']='Bureau AFUP';
-$configuration['mails']['force_destinataire']='';
-$configuration['mails']['bcc']='tresorier@afup.org';
-$configuration['mails']['tls']='0';
-$configuration['mails']['port']='1025';
-$configuration['mails']['username']='';
-$configuration['mails']['password']='';
 $configuration['afup']['raison_sociale']='AFUP';
 $configuration['afup']['adresse']='32, Boulevard de Strasbourg
 CS 30108';

diff --git a/htdocs/pages/administration/configuration.php b/htdocs/pages/administration/configuration.php
@@ -14,21 +14,6 @@
 
 $formulaire->setDefaults($defaults);
 
-$formulaire->addElement('header'  , ''                                      , 'Mails');
-$formulaire->addElement('text'    , 'mails|email_expediteur'                , 'Email expediteur'                , array('size' => 30));
-$formulaire->addElement('text'    , 'mails|nom_expediteur'                  , 'Nom expediteur'                  , array('size' => 30));
-$formulaire->addElement('textarea', 'mails|texte_adhesion_personne_physique', 'Texte adhesion personne physique', array('cols' => 42, 'rows' => 7));
-$formulaire->addElement('text'    , 'mails|force_destinataire'              , 'Force le destinaire du mail pour test'                  , array('size' => 30));
-$formulaire->addElement('text'    , 'mails|bcc'                             , 'Ajout un email en bcc à tout les emailss'                  , array('size' => 30));
-
-
-$formulaire->addElement('header'  , ''                                      , 'Config SMTP');
-$formulaire->addElement('text'    , 'mails|serveur_smtp'                    , 'Serveur SMTP'                , array('size' => 30));
-$formulaire->addElement('advcheckbox', 'mails|tls'                          , 'Use TLS'                     , null, null, array(0, 1));
-$formulaire->addElement('text'    , 'mails|port'                            , 'Port'                        , array('size' => 30));
-$formulaire->addElement('text'    , 'mails|username'                        , 'Username'                    , array('size' => 30));
-$formulaire->addElement('text'    , 'mails|password'                        , 'Password'                    , array('size' => 30));
-
 $formulaire->addElement('header'  , ''                   , 'AFUP');
 $formulaire->addElement('text'    , 'afup|raison_sociale', 'Raison Sociale', array('size' => 30));
 $formulaire->addElement('textarea', 'afup|adresse'       , 'Adresse'       , array('cols' => 42, 'rows' => 7));

diff --git a/sources/Afup/Association/Cotisations.php b/sources/Afup/Association/Cotisations.php
@@ -250,8 +250,7 @@ function notifierRegelementEnLigneAuTresorier($cmd, $total, $autorisation, $tran
         $corps .= "Autorisation : " . $autorisation . "\n";
         $corps .= "Transaction : " . $transaction . "\n\n";
 
-        $expediteur = $GLOBALS['AFUP_CONF']->obtenir('mails|email_expediteur');
-        $ok = Mailing::envoyerMail(new Message($sujet, new MailUser($expediteur), MailUserFactory::tresorier()), $corps);
+        $ok = Mailing::envoyerMail(new Message($sujet, new MailUser(MailUser::DEFAULT_SENDER_EMAIL, MailUser::DEFAULT_SENDER_NAME), MailUserFactory::tresorier()), $corps);
 
         if (false === $ok) {
             return false;

diff --git a/sources/Afup/Comptabilite/Facture.php b/sources/Afup/Comptabilite/Facture.php
@@ -741,8 +741,7 @@ function envoyerFacture($reference)
         $chemin_facture = AFUP_CHEMIN_RACINE . 'cache' . DIRECTORY_SEPARATOR . 'fact' . $reference . '.pdf';
         $this->genererFacture($reference, $chemin_facture);
 
-        $expediteur = $GLOBALS['AFUP_CONF']->obtenir('mails|email_expediteur');
-        $message = new Message($sujet, new MailUser($expediteur), new MailUser($personne['email'], $personne['nom']));
+        $message = new Message($sujet, new MailUser(MailUser::DEFAULT_SENDER_EMAIL, MailUser::DEFAULT_SENDER_NAME), new MailUser($personne['email'], $personne['nom']));
         $message->addAttachment(new Attachment(
             $chemin_facture,
             'facture-'.$reference.'.pdf',

diff --git a/sources/Afup/Utils/Configuration.php b/sources/Afup/Utils/Configuration.php
@@ -43,6 +43,15 @@ public function __construct($chemin_fichier)
             $this->_valeurs['database_name'] = $sfParameters['database_name'];
             $this->_valeurs['database_user'] = $sfParameters['database_user'];
             $this->_valeurs['database_password'] = $sfParameters['database_password'];
+
+            $this->_valeurs['smtp_host'] = $sfParameters['smtp_host'];
+            $this->_valeurs['smtp_port'] = $sfParameters['smtp_port'];
+            $this->_valeurs['smtp_tls'] = $sfParameters['smtp_tls'];
+            $this->_valeurs['smtp_username'] = $sfParameters['smtp_username'];
+            $this->_valeurs['smtp_password'] = $sfParameters['smtp_password'];
+
+            $this->_valeurs['mailer_force_recipients'] = $sfParameters['mailer_force_recipients'];
+            $this->_valeurs['mailer_bcc'] = $sfParameters['mailer_bcc'];
         }
     }
 

diff --git a/sources/AppBundle/Association/UserMembership/UserService.php b/sources/AppBundle/Association/UserMembership/UserService.php
@@ -3,7 +3,6 @@
 namespace AppBundle\Association\UserMembership;
 
 use Afup\Site\Association\Cotisations;
-use Afup\Site\Utils\Configuration;
 use AppBundle\Association\Model\Repository\UserRepository;
 use AppBundle\Association\Model\User;
 use AppBundle\Email\Mailer\Mailer;
@@ -29,14 +28,13 @@ public function __construct(
         UserRepository $userRepository,
         Mailer $mailer,
         UrlGeneratorInterface $urlGenerator,
-        Configuration $configuration,
         Cotisations $cotisations
     ) {
         $this->userRepository = $userRepository;
         $this->mailer = $mailer;
         $this->urlGenerator = $urlGenerator;
         $this->cotisations = $cotisations;
-        $this->sender = $configuration->obtenir('mails|email_expediteur');
+        $this->sender = MailUser::DEFAULT_SENDER_EMAIL;
     }
 
     public function generateRandomPassword()

diff --git a/sources/AppBundle/Email/Mailer/Adapter/PhpMailerAdapter.php b/sources/AppBundle/Email/Mailer/Adapter/PhpMailerAdapter.php
@@ -32,11 +32,11 @@ public function __construct($smtpServer, $tls, $username, $password, $port)
     public static function createFromConfiguration(Configuration $configuration)
     {
         return new self(
-            $configuration->obtenir('mails|serveur_smtp'),
-            $configuration->obtenir('mails|tls'),
-            $configuration->obtenir('mails|username'),
-            $configuration->obtenir('mails|password'),
-            $configuration->obtenir('mails|port')
+            $configuration->obtenir('smtp_host'),
+            (string) $configuration->obtenir('smtp_tls'),
+            $configuration->obtenir('smtp_username'),
+            $configuration->obtenir('smtp_password'),
+            (string) $configuration->obtenir('smtp_port')
         );
     }
 

diff --git a/sources/AppBundle/Email/Mailer/MailUser.php b/sources/AppBundle/Email/Mailer/MailUser.php
@@ -4,6 +4,9 @@
 
 class MailUser
 {
+    const DEFAULT_SENDER_NAME = 'Bureau AFUP';
+    const DEFAULT_SENDER_EMAIL = 'bureau@afup.org';
+
     /** @var string */
     private $email;
     /** @var string */

diff --git a/sources/AppBundle/Email/Mailer/Mailer.php b/sources/AppBundle/Email/Mailer/Mailer.php
@@ -32,8 +32,8 @@ public function __construct(
         $this->logger = $logger;
         $this->twig = $twig;
         $this->adapter = $adapter;
-        $this->forcedRecipient = $configuration->obtenir('mails|force_destinataire');
-        $defaultBccs = $configuration->obtenir('mails|bcc');
+        $this->forcedRecipient = $configuration->obtenir('mailer_force_recipients');
+        $defaultBccs = $configuration->obtenir('mailer_bcc');
         $this->defaultBccs = is_array($defaultBccs) ? $defaultBccs : [$defaultBccs];
     }