X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fvalidations%2Fnl.inc.php;h=728bf38a7298c65e5309ffa9f864159584a4ced7;hb=07d0a10adbc2578f9b85875e551a03b99d3650e8;hp=3008be34332a7c3d21151099f926ab5fc453a322;hpb=acc9be56f2cc773f7e684f9cd3201141bc126ee2;p=platal.git

diff --git a/include/validations/nl.inc.php b/include/validations/nl.inc.php
index 3008be3..728bf38 100644
--- a/include/validations/nl.inc.php
+++ b/include/validations/nl.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -33,7 +33,7 @@ class NLReq extends Validate
     // }}}
     // {{{ constructor
 
-    public function __construct(User &$_user, $_title, $_body, $_append)
+    public function __construct(User $_user, $_title, $_body, $_append)
     {
         parent::__construct($_user, false, 'nl');
         $this->art = new NLArticle($_title, $_body, $_append);
@@ -60,9 +60,9 @@ class NLReq extends Validate
 
     protected function handle_editor()
     {
-        $this->art->_body   = Env::v('nl_body');
-        $this->art->_title  = Env::v('nl_title');
-        $this->art->_append = Env::v('nl_append');
+        $this->art->body   = Env::v('nl_body');
+        $this->art->title  = Env::v('nl_title');
+        $this->art->append = Env::v('nl_append');
         return true;
     }
 
@@ -79,19 +79,35 @@ class NLReq extends Validate
 
     protected function _mail_body($isok)
     {
+        $you_have = ($this->formal ? 'vous aviez' : 'tu avais');
         if ($isok) {
-            return '  L\'article que tu avais proposé ('.$this->art->title().') vient d\'être validé.';
+            return "  L'article que $you_have proposé (" . $this->art->title() . ") vient d'être validé.";
         } else {
-            return '  L\'article que tu avais proposé ('.$this->art->title().') a été refusé.';
+            return "  L'article que $you_have proposé a été refusé.";
         }
     }
 
     // }}}
+    // {{{ function _mail_ps
+
+    protected function _mail_ps($isok)
+    {
+        if ($isok) {
+            return '';
+        }
+        return "\nPS : pour rappel, en voici le contenu :"
+            . "\n--------------------------------------------------------------------------\n"
+            . $this->art->title()
+            . "\n--------------------------------------------------------------------------\n"
+            . $this->art->body() . "\n\n" . $this->art->append() . "\n";
+    }
+
+    // }}}
     // {{{ function commit()
 
     public function commit()
     {
-        $nl  = new Newsletter();
+        $nl = NewsLetter::forGroup(NewsLetter::GROUP_XORG)->getPendingIssue(true);
         $nl->saveArticle($this->art);
         return true;
     }