Merge branch 'profile_edit'

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

diff --git a/include/validations/marketing.inc.php b/include/validations/marketing.inc.php
index 83ca858..adf3fd0 100644 (file)
--- a/include/validations/marketing.inc.php
+++ b/include/validations/marketing.inc.php
@@ -32,26 +32,30 @@ class MarkReq extends Validate
     public $m_prenom;
     public $m_promo;
     public $m_relance;
     public $m_prenom;
     public $m_promo;
     public $m_relance;

+    public $m_type;
+    public $m_data;

 
 

-    public $rules = "Accepter si l'adresse mail parait correcte, et pas absurde (ou si le marketeur est de confiance). Si le 
+    public $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.
     demandeur marque sa propre adresse mail, refuser dans tous les cas.

-    Ne pas marqueter au nom de Polytechnique.org plus d'une 
+    Ne pas marqueter au nom de Polytechnique.org plus d'une

     fois par an.";
     // }}}
     // {{{ constructor
 
     fois par an.";
     // }}}
     // {{{ constructor
 

-    public function __construct($sender, $mark_id, $email, $perso = false)
+    public function __construct($sender, $mark_id, $email, $perso, $type, $data)

     {
         parent::__construct($sender, false, 'marketing');
         $this->m_id    = $mark_id;
         $this->m_email = $email;
         $this->perso   = $perso;
     {
         parent::__construct($sender, false, 'marketing');
         $this->m_id    = $mark_id;
         $this->m_email = $email;
         $this->perso   = $perso;

+        $this->m_type  = $type;
+        $this->m_data  = $data;

 
         $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);
 
         $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(); 
+        list ($this->m_nom, $this->m_prenom, $this->m_promo) = $res->fetchOneRow();

     }
 
     // }}}
     }
 
     // }}}


@@ -71,7 +75,7 @@ class MarkReq extends Validate
 
     // }}}
     // {{{ function _mail_subj
 
     // }}}
     // {{{ function _mail_subj

-    
+

     protected function _mail_subj()
     {
         return "[Polytechnique.org] Marketing de {$this->m_prenom} {$this->m_nom} ({$this->m_promo})";
     protected function _mail_subj()
     {
         return "[Polytechnique.org] Marketing de {$this->m_prenom} {$this->m_nom} ({$this->m_promo})";


@@ -97,8 +101,11 @@ class MarkReq extends Validate
 
     public function commit()
     {
 
     public function commit()
     {

-        require_once('marketing.inc.php');
-        mark_send_mail($this->m_id, $this->m_email,(!$this->perso)?"staff":"user");
+        $market = Marketing::get($this->m_id, $this->m_email);
+        if ($market == null) {
+            return false;
+        }
+        $market->send();

         return true;
     }
 
         return true;
     }