From 33305f63b19af3562f682088b83be5b1e61f0a19 Mon Sep 17 00:00:00 2001
From: Pierre-Etienne Marx <pierre-etienne.marx_git@polytechnique.org>
Date: Mon, 8 Apr 2013 11:55:06 +0200
Subject: [PATCH] Removes check on Xorg NL validation to always send text, adds
 text sending to events validation.

---
 include/validations/evts.inc.php | 13 +++++++++++++
 include/validations/nl.inc.php   |  3 ---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/include/validations/evts.inc.php b/include/validations/evts.inc.php
index 7437e7e..70a33c8 100644
--- a/include/validations/evts.inc.php
+++ b/include/validations/evts.inc.php
@@ -131,6 +131,19 @@ class EvtReq extends Validate
     }
 
     // }}}
+    // {{{ function _mail_ps
+
+    protected function _mail_ps($isok)
+    {
+        $maildate = make_datetime($this->expiration)->format('d / m / Y');
+        return "\nPS : pour rappel, en voici le contenu :"
+            . "\n--------------------------------------------------------------------------\n"
+            . $this->titre
+            . "\n--------------------------------------------------------------------------\n"
+            . $this->texte . "\n\nPour les promotions de " . $this->pmin . " à " . $this->pmax . ", avec expiration le " . $maildate . ".\n";
+    }
+
+    // }}}
     // {{{ function commit()
 
     public function commit()
diff --git a/include/validations/nl.inc.php b/include/validations/nl.inc.php
index e939bd4..2fc3678 100644
--- a/include/validations/nl.inc.php
+++ b/include/validations/nl.inc.php
@@ -92,9 +92,6 @@ class NLReq extends Validate
 
     protected function _mail_ps($isok)
     {
-        if ($isok) {
-            return '';
-        }
         return "\nPS : pour rappel, en voici le contenu :"
             . "\n--------------------------------------------------------------------------\n"
             . $this->art->title()
-- 
2.1.4