Minor bugfixes and coding style improvements

[platal.git] / include / reminder / email_backup.inc.php

diff --git a/include/reminder/email_backup.inc.php b/include/reminder/email_backup.inc.php
index 0dc5899..cdf266e 100644 (file)
--- a/include/reminder/email_backup.inc.php
+++ b/include/reminder/email_backup.inc.php
@@ -25,8 +25,7 @@ class ReminderEmailBackup extends Reminder
     {
         if ($action == 'yes') {
             require_once 'emails.inc.php';
-            $user = S::user();
-            $storage = new EmailStorage($user, 'imap');
+            $storage = new EmailStorage($this->user, 'imap');
             $storage->activate();
 
             $this->UpdateOnYes();
@@ -41,18 +40,25 @@ class ReminderEmailBackup extends Reminder
         }
     }
 
-    protected function GetDisplayText()
+    public function text()
     {
         return "Tu peux bénéficier d'une sauvegarde des emails. Cela permet
             d'avoir un accès de secours aux 30 derniers jours d'emails reçus
             sur ton adresse Polytechnique.org.";
     }
+    public function title()
+    {
+        return 'Sauvegarde de tes emails';
+    }
 
     public static function IsCandidate(User &$user, $candidate)
     {
         require_once 'emails.inc.php';
-        $storage = new EmailStorage($user, 'imap');
-        return $storage->active;
+        $storage  = new EmailStorage($user, 'imap');
+        if ($storage->active) {
+            Reminder::MarkCandidateAsAccepted($user->id(), $candidate);
+        }
+        return !$storage->active;
     }
 }