X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvalidations%2Fnl.inc.php;h=25067a4fd5ba8b27f1df3b112eeee4b804b8925d;hb=0b6c8b36e62b950d1b24088e98c4026a54efe9d0;hp=974084822c69c78324f3eb222e6529460a780b6f;hpb=a7de4ef724d1a3b0bf978a50ce7cc9d23412c7a0;p=platal.git

diff --git a/include/validations/nl.inc.php b/include/validations/nl.inc.php
index 9740848..25067a4 100644
--- a/include/validations/nl.inc.php
+++ b/include/validations/nl.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -27,21 +27,22 @@ class NLReq extends Validate
 {
     // {{{ properties
 
-    var $art;
-    var $rules = "Laisser valider par le NL-MASTER";
-    
+    public $art;
+    public $rules = "Laisser valider par le NL-MASTER";
+
     // }}}
     // {{{ constructor
 
-    function NlReq($uid, $title, $body, $append) {
-        $this->Validate($uid, false, 'nl');
-        $this->art = new NLArticle($title, $body, $append);
+    public function __construct(User &$_user, $_title, $_body, $_append)
+    {
+        parent::__construct($_user, false, 'nl');
+        $this->art = new NLArticle($_title, $_body, $_append);
     }
 
     // }}}
     // {{{ function formu()
 
-    function formu()
+    public function formu()
     {
         return 'include/form.valid.nl.tpl';
     }
@@ -49,7 +50,7 @@ class NLReq extends Validate
     // }}}
     // {{{ function editor()
 
-    function editor()
+    public function editor()
     {
         return 'include/form.valid.edit-nl.tpl';
     }
@@ -57,7 +58,7 @@ class NLReq extends Validate
     // }}}
     // {{{ function handle_editor()
 
-    function handle_editor()
+    protected function handle_editor()
     {
         $this->art->_body   = Env::v('nl_body');
         $this->art->_title  = Env::v('nl_title');
@@ -67,8 +68,8 @@ class NLReq extends Validate
 
     // }}}
     // {{{ function _mail_subj
-    
-    function _mail_subj()
+
+    protected function _mail_subj()
     {
         return "[Polytechnique.org/NL] Proposition d'article dans la NL";
     }
@@ -76,21 +77,36 @@ class NLReq extends Validate
     // }}}
     // {{{ function _mail_body
 
-    function _mail_body($isok)
+    protected function _mail_body($isok)
     {
         if ($isok) {
-            return '  L\'article que tu avais proposé ('.$this->art->title().') vient d\'être validé.';
+            return "  L'article que tu avais 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 tu avais 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()
 
-    function commit()
+    public function commit()
     {
-        $nl  = new Newsletter();
+        $nl  = new NewsLetter();
         $nl->saveArticle($this->art);
         return true;
     }