X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Freminder%2Fnl.inc.php;h=d03c42809536de31778bbd617ffd08f6f42dc1fc;hb=9756357a151d461e49699938c8baee6ec81f1611;hp=fe3d704aed91bde3268e10cdabc1f98f345bddf9;hpb=fa07eee0d6d2a6536ee68846c65cb5c32ccbbdd1;p=platal.git

diff --git a/include/reminder/nl.inc.php b/include/reminder/nl.inc.php
index fe3d704..d03c428 100644
--- a/include/reminder/nl.inc.php
+++ b/include/reminder/nl.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -25,7 +25,7 @@ class ReminderNl extends Reminder
     {
         if ($action == 'yes') {
             require_once 'newsletter.inc.php';
-            Newsletter::subscribe();
+            NewsLetter::forGroup(NewsLetter::GROUP_XORG)->subscribe();
             $this->UpdateOnYes();
         }
 
@@ -38,17 +38,25 @@ class ReminderNl extends Reminder
         }
     }
 
-    protected function GetDisplayText()
+    public function text()
     {
         return "La lettre mensuelle de Polytechnique.org te permet de recevoir
             chaque mois des informations sur les activités et nouvelles de la
             communauté des X.";
     }
+    public function title()
+    {
+        return "Inscription à la lettre mensuelle";
+    }
 
-    public static function IsCandidate(User &$user)
+    public static function IsCandidate(User $user, $candidate)
     {
         require_once 'newsletter.inc.php';
-        return !(Newsletter::subscriptionState());
+        $isSubscribed = NewsLetter::forGroup(NewsLetter::GROUP_XORG)->subscriptionState();
+        if ($isSubscribed) {
+            Reminder::MarkCandidateAsAccepted($user->id(), $candidate);
+        }
+        return !$isSubscribed;
     }
 }