More readable text layout for wiki pages in the skin 'Keynote'

[platal.git] / modules / email.php

diff --git a/modules/email.php b/modules/email.php
index 597df36..1350ec7 100644 (file)
--- a/modules/email.php
+++ b/modules/email.php
@@ -200,6 +200,11 @@ class EmailModule extends PLModule
 
         $redirect = new Redirect(S::v('uid'));
 
+        // FS#703 : $_GET is urldecoded twice, hence
+        // + (the data) => %2B (in the url) => + (first decoding) => ' ' (second decoding)
+        // Since there can be no spaces in emails, we can fix this with :
+        $email = str_replace(' ', '+', $email);
+
         if ($action == 'remove' && $email) {
             $retour = $redirect->delete_email($email);
             $page->assign('retour', $retour);
@@ -424,11 +429,11 @@ consulter la page <{$globals->baseurl}/emails/broken>.
 
 
 A bientôt sur Polytechnique.org !
-L'équipe d'administration <support@" . $globals->mails->domain . '>';
+L'équipe d'administration <support@" . $globals->mail->domain . '>';
 
                 $mail = new PlMailer();
-                $mail->setFrom('"Polytechnique.org" <support@' . $globals->mails->domain . '>');
-                $mail->addTo("$dest@" . $globals->mails->domain);
+                $mail->setFrom('"Polytechnique.org" <support@' . $globals->mail->domain . '>');
+                $mail->addTo("$dest@" . $globals->mail->domain);
                 $mail->setSubject("Une de tes adresse de redirection Polytechnique.org ne marche plus !!");
                 $mail->setTxtBody($message);
                 $mail->send();