From: Victor Berger <victor.berger@m4x.org>
Date: Sun, 2 Feb 2014 18:39:13 +0000 (+0100)
Subject: Fix incorrect forlife in marketing email.
X-Git-Tag: xorg/1.1.12~33
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=c3d234916ceb4e8d400a624f61d2972c4259aa9b;p=platal.git

Fix incorrect forlife in marketing email.

Signed-off-by: Victor Berger <victor.berger@m4x.org>
---

diff --git a/include/marketing.inc.php b/include/marketing.inc.php
index 4132296..d314831 100644
--- a/include/marketing.inc.php
+++ b/include/marketing.inc.php
@@ -67,8 +67,8 @@ class Marketing
             'sexe'           => $user->isFemale(),
             'mail'           => $email,
             'to'             => '"' . $user->fullName() . '" <' . $email . '>',
-            'forlife_email'  => $user->forlifeEmail(),
-            'forlife_email2' => $user->forlifeEmailAlternate()
+            'forlife_email'  => $user->hruid . "@" . $user->mainEmailDomain(),
+            'forlife_email2' => $user->hruid . "@" . $user->alternateEmailDomain()
         );
     }
 
diff --git a/modules/marketing.php b/modules/marketing.php
index d907798..a939a6a 100644
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@ -328,8 +328,8 @@ class MarketingModule extends PLModule
             $market = new AnnuaireMarketing(null, true);
             $text = $market->getText(array(
                 'sexe'           => $user->isFemale(),
-                'forlife_email'  => $user->forlifeEmail(),
-                'forlife_email2' => $user->forlifeEmailAlternate()
+                'forlife_email'  => $user->hruid . "@" . $user->mainEmailDomain(),
+                'forlife_email2' => $user->hruid . "@" . $user->alternateEmailDomain()
             ));
             $text = str_replace('%%hash%%', '', $text);
             $text = str_replace('%%personal_notes%%', '<em id="personal_notes_display"></em>', $text);