X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fmarketing.php;h=96b2cf207bf0e61a9b8830abb4cc16ab3be10208;hb=b0e935d6af8eb37e423b8bb862e477d9e09af0f5;hp=aad71640655f3254d956d3db8f46536f7c2199cd;hpb=3c696b26901e971c2a0f20dbdee3e7af49a576b6;p=platal.git
diff --git a/modules/marketing.php b/modules/marketing.php
index aad7164..96b2cf2 100644
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@ -243,7 +243,6 @@ class MarketingModule extends PLModule
$page->trigError("Il faut que tu ajoutes un commentaire à ta proposition pour justifier le "
. "besoin de changer la redirection de {$user->fullName()}.");
} else {
- require_once 'validations.inc.php';
$valid = new BrokenReq(S::user(), $user, $email, trim(Post::v('comment')));
$valid->submit();
$page->assign('sent', true);
@@ -313,6 +312,7 @@ class MarketingModule extends PLModule
require_once 'marketing.inc.php';
$sender = User::getSilent(S::v('uid'));
+ $perso_signature = 'Cordialement,
--
' . $sender->fullName();
$market = new AnnuaireMarketing(null, true);
$text = $market->getText(array(
'sexe' => $user->isFemale(),
@@ -322,11 +322,10 @@ class MarketingModule extends PLModule
$text = str_replace('%%hash%%', '', $text);
$text = str_replace('%%personal_notes%%', '', $text);
$text = str_replace('%%sender%%',
- "" . $sender->fullName() . '', $text);
+ '' . $perso_signature . '', $text);
$page->assign('text', nl2br($text));
- // TODO (JAC): define a unique Xorg signature for all the emails we send.
- $page->assign('xorg_signature', "L'équipe de Polytechnique.org,
Le portail des élèves & anciens élèves de l'Ãcole polytechnique");
- $page->assign('perso_signature', $sender->fullName());
+ $page->assign('perso_signature', $perso_signature);
+ $page->assign('mail_part', 'escaped_html');
}
}