X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fnewsletter.php;h=3ed81bc690ca54be188637a3a0360811fd01a355;hb=fb813fb52d5ab65ca9a5b92b5cb9089523380d79;hp=fe22b072f8387bc519accd0c9c5a33c7d7a78ed3;hpb=b6ba1a0417b6fc73f3d1701146373b4bec0d1428;p=platal.git

diff --git a/modules/newsletter.php b/modules/newsletter.php
index fe22b07..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   *
@@ -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;
@@ -151,12 +145,15 @@ class NewsletterModule extends PLModule
 
         if ($action == 'edit' && $aid != 'update') {
             $eaid = $aid;
-            if(Post::has('title')) {
+            if (Post::has('title')) {
                 $art  = new NLArticle(Post::v('title'), Post::v('body'), Post::v('append'),
                                       $eaid, Post::v('cid'), Post::v('pos'));
             } else {
                 $art = ($eaid == 'new') ? new NLArticle() : $nl->getArt($eaid);
             }
+            if ($art && !$art->check()) {
+                $page->trigError("Cet article est trop long.");
+            }
             $page->assign('art', $art);
         }