Merge commit 'origin/master' into fusionax

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

diff --git a/include/validations.inc.php b/include/validations.inc.php
index aaa6bf5..6666e28 100644 (file)
--- a/include/validations.inc.php
+++ b/include/validations.inc.php
@@ -85,6 +85,10 @@ abstract class Validate
         $this->stamp  = date('YmdHis');
         $this->unique = $_unique;
         $this->type   = $_type;
+        $res = XDB::query("SELECT  promo
+                             FROM  profile_display
+                            WHERE  pid={?}", $this->user->id());
+        $this->promo = $res->fetchOneCell();
     }
 
     // }}}
@@ -215,7 +219,7 @@ abstract class Validate
                 $this->trigSuccess('Email de refus envoyé');
                 return true;
             } else {
-                $this->trigError('pas de motivation pour le refus !!!');
+                $this->trigError('Pas de motivation pour le refus !!!');
             }
         }
 
@@ -237,10 +241,8 @@ abstract class Validate
         $body = ($this->user->isFemale() ? "Chère camarade,\n\n" : "Cher camarade,\n\n")
               . $this->_mail_body($isok)
               . (Env::has('comm') ? "\n\n" . Env::v('comm') : '')
-              . "\n\nCordialement,\n-- \nL'équipe de Polytechnique.org\n";
-        if (!is_null($this->_mail_ps($isok))) {
-            $body .= $this->_mail_ps($isok);
-        }
+              . "\n\nCordialement,\n-- \nL'équipe de Polytechnique.org\n"
+              . $this->_mail_ps($isok);
 
         $mailer->setTxtBody(wordwrap($body));
         $mailer->send();
@@ -340,7 +342,7 @@ abstract class Validate
 
     protected function _mail_ps($isok)
     {
-        return null;
+        return '';
     }
 
     // }}}