Uses user's visibility limitations to display vcards (Closes #1478).

[platal.git] / modules / marketing.php

diff --git a/modules/marketing.php b/modules/marketing.php
index 822b7ae..e6d3aff 100644 (file)
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@ -261,8 +261,9 @@ class MarketingModule extends PLModule
         $page->assign('promo', $promo);
 
         $uf = new UserFilter(new PFC_And(new UFC_Promo('=', UserFilter::DISPLAY, $promo),
-                                            new PFC_Not(new UFC_Registered())),
-                                array(new UFO_Name(Profile::LASTNAME), new UFO_Name(Profile::FIRSTNAME)));
+                                         new PFC_Not(new UFC_Registered()),
+                                         new PFC_Not(new UFC_Dead())),
+                             array(new UFO_Name(Profile::LASTNAME), new UFO_Name(Profile::FIRSTNAME)));
         $users = $uf->getUsers();
         $page->assign('nonins', $users);
     }
@@ -315,8 +316,8 @@ class MarketingModule extends PLModule
             $market = new AnnuaireMarketing(null, true);
             $text = $market->getText(array(
                 'sexe'           => $user->isFemale(),
-                'forlife_email'  => $user->login() . '@' . $globals->mail->domain,
-                'forlife_email2' => $user->login() . '@' . $globals->mail->domain2
+                'forlife_email'  => $user->forlifeEmail(),
+                'forlife_email2' => $user->forlifeEmailAlternate()
             ));
             $text = str_replace('%%hash%%', '', $text);
             $text = str_replace('%%personal_notes%%', '<em id="personal_notes_display"></em>', $text);