X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fmarketing.php;h=d5f9ed8b8d3ade24c8ffb4e3a9bdbf412529d1e0;hb=28c20b86be8b40cecba0d83080879f81c49e07ad;hp=eea4a83fb873eebfb1b6d7cfaa4bb0a67854a98e;hpb=3c9043937a80d8e0fc64bf918b0d37fc0cc64c0c;p=platal.git

diff --git a/modules/marketing.php b/modules/marketing.php
index eea4a83..d5f9ed8 100644
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@ -123,8 +123,8 @@ class MarketingModule extends PLModule
         $res = XDB::iterator(
                 "SELECT  r.*, a.alias
                    FROM  register_marketing AS r
-              LEFT JOIN  aliases            AS a ON (r.sender=a.id AND a.type = 'a_vie')
-                  WHERE  uid={?}
+              LEFT JOIN  aliases            AS a ON (r.sender = a.uid AND a.type = 'a_vie')
+                  WHERE  r.uid = {?}
                ORDER BY  date", $user->id());
         $page->assign('addr', $res);
 
@@ -205,7 +205,7 @@ class MarketingModule extends PLModule
         $page->changeTpl('marketing/promo.tpl');
 
         if (is_null($promo)) {
-            $promo = S::v('promo');
+            $promo = S::v('promo', S::user()->promo());
         }
         $page->assign('promo', $promo);
 
@@ -301,11 +301,13 @@ class MarketingModule extends PLModule
 
 
         if (!is_null($promo)) {
-            $it = XDB::iterator('SELECT  m.uid, m.email
+            $it = XDB::iterator('SELECT  m.uid, m.email, s.alias AS forlife
                                    FROM  register_marketing AS m
                              INNER JOIN  account_profiles AS ap ON (m.uid = ap.uid AND FIND_IN_SET(\'owner\', ap.perms))
                              INNER JOIN  profile_display AS pd ON (pd.pid = ap.pid)
-                                  WHERE  pd.promo = {?}', $promo);
+                              LEFT JOIN  aliases AS s ON (m.sender = s.uid AND s.type = \'a_vie\')
+                                  WHERE  pd.promo = {?}
+                               ORDER BY  pd.sort_name', $promo);
             $page->assign('addr', $it);
         }
     }