From a66eb04379261ce82662a4b165e0ea5a75745513 Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Sat, 6 Aug 2022 15:48:54 +0200
Subject: [PATCH] changed mailhost to pro1.mail.ovh.net

---
 cao_blogr/templates/home.jinja2   |  9 +++++++--
 cao_blogr/templates/layout.jinja2 |  2 +-
 cao_blogr/views/default.py        |  9 +++++----
 development.ini                   | 12 ++++++------
 production.ini                    | 13 ++++++-------
 5 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/cao_blogr/templates/home.jinja2 b/cao_blogr/templates/home.jinja2
index 6ff43e1..2edd955 100644
--- a/cao_blogr/templates/home.jinja2
+++ b/cao_blogr/templates/home.jinja2
@@ -139,9 +139,14 @@
 
     <div class="row">
       <div class="col-sm-4">
-        <p><span class="glyphicon glyphicon-envelope"></span>&nbsp;Centre de Méditation Sunyata<br>
+        <p class="text-right">
+          <span class="glyphicon glyphicon-map-marker"></span><br>
+          <b>Méditation Sunyata Paris</b><br>
           116 bd Maréchal Foch<br>
-          93160 NOISY LE GRAND
+          93160 NOISY LE GRAND<br>
+          <br>
+          <span class="glyphicon glyphicon-envelope"></span><br>
+          contact@meditation-sunyata.paris
         </p>
       </div>
       <div class="col-sm-8">
diff --git a/cao_blogr/templates/layout.jinja2 b/cao_blogr/templates/layout.jinja2
index cea99e2..a3cac42 100644
--- a/cao_blogr/templates/layout.jinja2
+++ b/cao_blogr/templates/layout.jinja2
@@ -113,7 +113,7 @@
           &copy; 2022&nbsp;-&nbsp;Méditation SUNYATA Paris
           &nbsp;|&nbsp;<a href="{{ request.route_url('blog', id=1, slug='mentions-legales') }}">Mentions légales</a>
           &nbsp;|&nbsp;<a href="{{ request.route_url('topic', topic='FR9') }}">A propos</a>
-              
+          &nbsp;|&nbsp;<a href="https://www.ovhcloud.com/fr/mail/" target="__blank">Contact</a>
         </p>
 			</div>
 	</footer>
diff --git a/cao_blogr/views/default.py b/cao_blogr/views/default.py
index 95d1efe..6842dc0 100644
--- a/cao_blogr/views/default.py
+++ b/cao_blogr/views/default.py
@@ -59,11 +59,12 @@ def home(request):
             body = """
 Bonjour,
 
-L' expéditeur : {0} ( {1} )
-a envoyé le message suivant via le formulaire de Contact du site : 
+L' expéditeur '{0}' ({1}), a envoyé le message suivant via le site web : 
 
 -----  Début du message -----
+
 {2}
+
 -----  Fin du message -----
 
 Cordialement,
@@ -71,10 +72,10 @@ webmaster@meditation-sunyata.paris
 
 """.format(name, email, comments)
 
-            message = Message(subject="[MSParis] Message de contact",
+            message = Message(subject="[MSParis] Message du site web",
                             sender=request.registry.settings['admin_email'],
                             body=body)
-            message.add_recipient('phuoc@caotek.fr')
+            message.add_recipient(request.registry.settings['admin_email'])
             mailer = request.registry['mailer']
             mailer.send_immediately(message)
             request.session.flash("Votre message a bien été envoyé au webmestre. Merci de votre intérêt pour notre site.", "success")
diff --git a/development.ini b/development.ini
index 77fc0e6..70d2002 100644
--- a/development.ini
+++ b/development.ini
@@ -26,12 +26,12 @@ secret_key = 6LeDvVUgAAAAAGASZXCmcmhh-KtBWTZjXpLpKdNt
 # cao_blogr.admin_email = cao.thien-phuoc@orange.fr
 # mail.host = smtp.orange.fr
 # mail.port = 25
-admin_email = phuoc@caotek.fr
-mail.host = smtp.gmail.com
-mail.port = 465
-mail.ssl  = True
-mail.username = phuoc@caotek.fr  
-mail.password = pcao.8211
+admin_email = contact@meditation-sunyata.paris
+mail.host = pro1.mail.ovh.net
+mail.port = 587
+mail.tls  = True
+mail.username = contact@meditation-sunyata.paris  
+mail.password = 88.tanhkhong
 
 
 retry.attempts = 3
diff --git a/production.ini b/production.ini
index 6c3b448..5d18b01 100644
--- a/production.ini
+++ b/production.ini
@@ -23,13 +23,12 @@ secret_key = 6LeDvVUgAAAAAGASZXCmcmhh-KtBWTZjXpLpKdNt
 # Mailer configuration
 # mail.host = localhost
 # mail.port = 25
-admin_email = phuoc@caotek.fr
-mail.host = smtp.gmail.com
-mail.port = 465
-mail.ssl  = True
-mail.username = phuoc@caotek.fr  
-mail.password = pcao.8211
-retry.attempts = 3
+admin_email = contact@meditation-sunyata.paris
+mail.host = pro1.mail.ovh.net
+mail.port = 587
+mail.tls  = True
+mail.username = contact@meditation-sunyata.paris  
+mail.password = 88.tanhkhong
 
 [pshell]
 setup = cao_blogr.pshell.setup