X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fnewsletter.php;h=3ed81bc690ca54be188637a3a0360811fd01a355;hb=23ba40c466e05d369cd9e2a96107f38e309b767a;hp=908f1bf4d4b85376f75fd3bbed1e0b080d125cff;hpb=ee71865181e96e7b0754ef9e7da4b3cb26f4c1d7;p=platal.git

diff --git a/modules/newsletter.php b/modules/newsletter.php
index 908f1bf..3ed81bc 100644
--- a/modules/newsletter.php
+++ b/modules/newsletter.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -41,13 +41,13 @@ class NewsletterModule extends PLModule
         $page->setTitle('Lettres mensuelles');
 
         switch ($action) {
-          case 'out': Newsletter::unsubscribe(); break;
-          case 'in':  Newsletter::subscribe(); break;
+          case 'out': NewsLetter::unsubscribe(); break;
+          case 'in':  NewsLetter::subscribe(); break;
           default: ;
         }
 
-        $page->assign('nls', Newsletter::subscriptionState());
-        $page->assign('nl_list', Newsletter::listSent());
+        $page->assign('nls', NewsLetter::subscriptionState());
+        $page->assign('nl_list', NewsLetter::listSent());
     }
 
     function handler_nl_show(&$page, $nid = 'last')
@@ -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;
@@ -108,11 +102,11 @@ class NewsletterModule extends PLModule
         require_once("newsletter.inc.php");
 
         if($new) {
-            Newsletter::create();
+            NewsLetter::create();
             pl_redirect("admin/newsletter");
         }
 
-        $page->assign('nl_list', Newsletter::listAll());
+        $page->assign('nl_list', NewsLetter::listAll());
     }
 
     function handler_admin_nl_edit(&$page, $nid = 'last', $aid = null, $action = 'edit') {