X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Freminder%2Fgapps.inc.php;h=a420070a21ede9269c783bf0c315a5ad81866403;hb=7c7d62fce3e3973b576ffbc4051ba443d6a6b849;hp=8df4c46f010daedef060d0269ddfba12b780d0c5;hpb=c3c43c0ebe734e2b43b5d5fdb6010d08358bc34b;p=platal.git

diff --git a/include/reminder/gapps.inc.php b/include/reminder/gapps.inc.php
index 8df4c46..a420070 100644
--- a/include/reminder/gapps.inc.php
+++ b/include/reminder/gapps.inc.php
@@ -25,7 +25,7 @@ class ReminderGapps extends Reminder
     {
         switch ($action) {
           case 'yes':
-            $this->UpdateOnYes();
+            $this->UpdateOnDismiss();
             pl_redirect('googleapps');
             break;
 
@@ -39,22 +39,26 @@ class ReminderGapps extends Reminder
         }
     }
 
-    public function text()
+    public function template()
     {
-        return "Polytechnique.org te fournit un compte Google Apps qui te permet
-            de disposer des applications web de Google (GMail, Google Calendar,
-            Google Docs, et bien d'autres) sur ton adresse Polytechnique.org
-            habituelle (en savoir plus).";
+        return 'reminder/gapps.tpl';
     }
     public function title()
     {
         return "Création d'un compte Google Apps";
     }
+    public function info()
+    {
+        return 'Xorg/GoogleApps';
+    }
 
     public static function IsCandidate(User &$user, $candidate)
     {
         require_once 'googleapps.inc.php';
         $isSubscribed = GoogleAppsAccount::account_status($user->id());
+        if ($isSubscribed == 'disabled') {
+            $isSubscribed = false;
+        }
         if ($isSubscribed) {
             Reminder::MarkCandidateAsAccepted($user->id(), $candidate);
         }