Moving to GitHub.

[platal.git] / modules / marketing.php

diff --git a/modules/marketing.php b/modules/marketing.php
index 5086e96..a939a6a 100644 (file)
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2011 Polytechnique.org                              *
+ *  Copyright (C) 2003-2014 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -24,13 +24,13 @@ class MarketingModule extends PLModule
     function handlers()
     {
         return array(
-            'marketing'            => $this->make_hook('marketing',  AUTH_MDP,    'admin'),
-            'marketing/promo'      => $this->make_hook('promo',      AUTH_MDP,    'admin'),
-            'marketing/relance'    => $this->make_hook('relance',    AUTH_MDP,    'admin'),
-            'marketing/this_week'  => $this->make_hook('week',       AUTH_MDP,    'admin'),
-            'marketing/volontaire' => $this->make_hook('volontaire', AUTH_MDP,    'admin'),
+            'marketing'            => $this->make_hook('marketing',  AUTH_PASSWD, 'admin'),
+            'marketing/promo'      => $this->make_hook('promo',      AUTH_PASSWD, 'admin'),
+            'marketing/relance'    => $this->make_hook('relance',    AUTH_PASSWD, 'admin'),
+            'marketing/this_week'  => $this->make_hook('week',       AUTH_PASSWD, 'admin'),
+            'marketing/volontaire' => $this->make_hook('volontaire', AUTH_PASSWD, 'admin'),
 
-            'marketing/private'    => $this->make_hook('private',    AUTH_MDP,    'admin'),
+            'marketing/private'    => $this->make_hook('private',    AUTH_PASSWD, 'admin'),
             'marketing/public'     => $this->make_hook('public',     AUTH_COOKIE, 'user'),
             'marketing/broken'     => $this->make_hook('broken',     AUTH_COOKIE, 'user'),
         );
@@ -237,7 +237,7 @@ class MarketingModule extends PLModule
         if (Post::has('mail')) {
             $email = valide_email(Post::v('mail'));
         }
-        if (Post::has('valide') && isvalid_email_redirection($email)) {
+        if (Post::has('valide') && isvalid_email_redirection($email, $user)) {
             S::assert_xsrf_token();
 
             // security stuff
@@ -303,7 +303,7 @@ class MarketingModule extends PLModule
             $email = trim(Post::v('mail'));
 
             require_once 'emails.inc.php';
-            if (!isvalid_email_redirection($email)) {
+            if (!isvalid_email_redirection($email, $user)) {
                 $page->trigError('Email invalide&nbsp;!');
             } else {
                 // On cherche les marketings précédents sur cette adresse
@@ -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);
@@ -401,5 +401,5 @@ class MarketingModule extends PLModule
     }
 }
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
 ?>