From 030051921b8da6cb57aab40eae704076303b17e7 Mon Sep 17 00:00:00 2001
From: Simon Leblanc <contact@leblanc-simon.eu>
Date: Sun, 3 Jul 2011 01:57:20 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20issue=20#17=20:=20ajout=20d'un=20reply-to?=
 =?UTF-8?q?=20+=20v=C3=A9rification=20adresse=20mail=20+=20mise=20en=20for?=
 =?UTF-8?q?me?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contacts.php                      |  13 +++++++++----
 locale/fr_FR/LC_MESSAGES/Studs.mo | Bin 19309 -> 19391 bytes
 locale/fr_FR/LC_MESSAGES/Studs.po |   4 ++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/contacts.php b/contacts.php
index a7b1842..0e4b306 100644
--- a/contacts.php
+++ b/contacts.php
@@ -52,7 +52,10 @@ if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && isse
   $message=str_replace("\\","",$_POST["question"]);
   
   //envoi des mails
-  $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit";
+  $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\r\nContent-Transfer-Encoding: 8bit";
+  if (isset($_POST['adresse_mail']) && !empty($_POST['adresse_mail']) && validateEmail($_POST['adresse_mail'])) {
+    $headers .= "\r\n".'Reply-To: '.$_POST['adresse_mail'];
+  }
   mail (ADRESSEMAILADMIN, "" . _("[CONTACT] You have sent a question ") . "".NOMAPPLICATION, "" . _("You have a question from a user ") . " ".NOMAPPLICATION."\n\n" . _("User") . " : ".$_POST["nom"]."\n\n" . _("User's email address") . " : $_POST[adresse_mail]\n\n" . _("Message") . " :".$message,$headers);
   if (isset($_POST['adresse_mail']) && !empty($_POST['adresse_mail']) && validateEmail($_POST['adresse_mail'])) {
     $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit";
@@ -122,6 +125,10 @@ framanav();
   echo '<br><br>'."\n";
   echo _("Your email address ") .' :<br>'."\n";
   echo '<input type="text" size="40" maxlength="64" name="adresse_mail" value="'.$_SESSION["adresse_mail"].'">'."\n";
+  
+  if ((isset($_POST['envoiquestion']) || isset($_POST['envoiquestion_x'])) && empty($_SESSION["adresse_mail"]) === false && validateEmail($_SESSION["adresse_mail"]) === false) {
+    echo ' <font color="#FF0000">'. _("The address is not correct!") .'</font>';
+  }
 
   echo '<br><br>';
 
@@ -133,9 +140,7 @@ framanav();
   }
 
   echo '<br><br><br>'."\n";
-  echo '<table>'."\n";
-  echo '<tr><td>'. _("Send your question") .'</td><td><input type="image" name="envoiquestion" value="Envoyer votre question" src="images/next-32.png"></td></tr>'."\n";
-  echo '</table>'."\n";
+  echo '<button type="submit" name="envoiquestion" value="'._("Send your question").'" class="button green poursuivre" alt="'._("Send your question").'"><strong>'._("Send your question").'</strong></button>';
   echo '<br><br><br>'."\n";
   echo '</div>'."\n";
   echo '</form>'."\n";
diff --git a/locale/fr_FR/LC_MESSAGES/Studs.mo b/locale/fr_FR/LC_MESSAGES/Studs.mo
index 1c90d14b8c0c88fb0999d4cd9ef63d8922a49db4..b4a2568ca7bbf597dd3ac7bdf46ae7a12b74f7c5 100644
GIT binary patch
delta 3335
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
AZU6uP

delta 3319
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

diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po
index 4251b44..37036f6 100644
--- a/locale/fr_FR/LC_MESSAGES/Studs.po
+++ b/locale/fr_FR/LC_MESSAGES/Studs.po
@@ -738,6 +738,10 @@ msgstr "Votre nom"
 msgid "Your email address "
 msgstr "Votre adresse &eacute;lectronique "
 
+#: contacts.php:127
+msgid "The address is not correct!"
+msgstr "L'adresse saisie n'est pas correcte !"
+
 #: contacts.php:129
 msgid "Question"
 msgstr "Question"