Uses user's visibility limitations to display vcards (Closes #1478).

[platal.git] / include / validations / nl.inc.php

diff --git a/include/validations/nl.inc.php b/include/validations/nl.inc.php
index 25067a4..728bf38 100644 (file)
--- a/include/validations/nl.inc.php
+++ b/include/validations/nl.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 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,10 +79,11 @@ 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é a été refusé.";
+            return "  L'article que $you_have proposé a été refusé.";
         }
     }
 
@@ -106,7 +107,7 @@ class NLReq extends Validate
 
     public function commit()
     {
-        $nl  = new NewsLetter();
+        $nl = NewsLetter::forGroup(NewsLetter::GROUP_XORG)->getPendingIssue(true);
         $nl->saveArticle($this->art);
         return true;
     }