X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fvalidations%2Fmarketing.inc.php;h=317b84fb7933b4c46cd94e841483c8156fa9995c;hb=5ddeb07cc787dd1dc3630a31f1528f5cc7c4d9b9;hp=401cbd5e292931db8a576c188093dcd12836971c;hpb=a3a049fc80d3707bcc76903ab89f73974c470c0c;p=platal.git

diff --git a/include/validations/marketing.inc.php b/include/validations/marketing.inc.php
index 401cbd5..317b84f 100644
--- a/include/validations/marketing.inc.php
+++ b/include/validations/marketing.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -19,7 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-// {{{ class MarkReq
 
 class MarkReq extends Validate
 {
@@ -32,6 +31,7 @@ class MarkReq extends Validate
     var $m_nom;
     var $m_prenom;
     var $m_promo;
+    var $m_relance;
 
     var $rules = "Accepter si l'adresse mail parait correcte, et pas absurde (ou si le marketeur est de confiance). Si le 
     demandeur marque sa propre adresse mail, refuser dans tous les cas.
@@ -46,7 +46,10 @@ class MarkReq extends Validate
         $this->m_email = $email;
         $this->perso   = $perso;
 
-        $res = XDB::query('SELECT nom, prenom, promo FROM auth_user_md5 WHERE user_id = {?}', $mark_id);
+        $res = XDB::query('SELECT  u.nom, u.prenom, u.promo,
+                             FROM  auth_user_md5      AS u
+                            WHERE  user_id = {?}
+                         GROUP BY  u.user_id', $mark_id);
         list ($this->m_nom, $this->m_prenom, $this->m_promo) = $res->fetchOneRow(); 
     }
 
@@ -54,7 +57,16 @@ class MarkReq extends Validate
     // {{{ function formu()
 
     function formu()
-    { return 'include/form.valid.mark.tpl'; }
+    {
+        $res = XDB::query('SELECT  IF(MAX(m.last)>p.relance, MAX(m.last), p.relance)
+                             FROM  auth_user_md5      AS u
+                        LEFT JOIN  register_pending   AS p ON p.uid = u.user_id
+                        LEFT JOIN  register_marketing AS m ON m.uid = u.user_id
+                            WHERE  user_id = {?}',
+                            $this->m_id);
+        $this->m_relance = $res->fetchOneCell();
+        return 'include/form.valid.mark.tpl';
+    }
 
     // }}}
     // {{{ function _mail_subj
@@ -92,7 +104,5 @@ class MarkReq extends Validate
     // }}}
 }
 
-// }}}
-
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
 ?>