X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fnewsletter.php;h=3d8b610b4581670df1bb62e9b524861d8f2b0262;hb=2f85f758e0ab2d3daa8608f6357bf73c45a25837;hp=62dd6849a6ab8c777d396745f628b272423e5db3;hpb=af744c2d5f4ddf83b738b9cb390926eaca4cf7c3;p=platal.git

diff --git a/modules/newsletter.php b/modules/newsletter.php
index 62dd684..3d8b610 100644
--- a/modules/newsletter.php
+++ b/modules/newsletter.php
@@ -58,20 +58,14 @@ class NewsletterModule extends PLModule
 
         try {
             $nl = new NewsLetter($nid);
+            $user =& S::user();
             if (Get::has('text')) {
-                $nl->toText($page, S::v('prenom'), S::v('nom'), S::v('femme'));
+                $nl->toText($page, $user);
             } else {
-                $nl->toHtml($page, S::v('prenom'), S::v('nom'), S::v('femme'));
+                $nl->toHtml($page, $user);
             }
             if (Post::has('send')) {
-                $res = XDB::query("SELECT  hash
-                                     FROM  newsletter_ins
-                                    WHERE  user_id = {?}",
-                                  S::i('uid'));
-                $nl->sendTo(S::user()->login(), S::user()->bestEmail(),
-                            S::v('prenom'), S::v('nom'),
-                            S::v('femme'), S::v('mail_fmt') != 'texte',
-                            $res->fetchOneCell());
+                $nl->sendTo($user);
             }
         } catch (MailNotFound $e) {
             return PL_NOT_FOUND;