X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Freminder%2Fgapps.inc.php;h=f82a407510fbad2b54c28e0982b88c2d8b963eba;hb=c10e9a24b920cb34b3950306b5db941f8fc6ab59;hp=976399db259568f0118ab1d591e70332d74db4ed;hpb=0e4b87b287fc40f2d33be0379980e16d6fa30055;p=platal.git

diff --git a/include/reminder/gapps.inc.php b/include/reminder/gapps.inc.php
index 976399d..f82a407 100644
--- a/include/reminder/gapps.inc.php
+++ b/include/reminder/gapps.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 ReminderGapps extends Reminder
     {
         switch ($action) {
           case 'yes':
-            $this->UpdateOnYes();
+            $this->UpdateOnDismiss();
             pl_redirect('googleapps');
             break;
 
@@ -39,18 +39,34 @@ class ReminderGapps extends Reminder
         }
     }
 
-    protected function GetDisplayText()
+    public function template()
+    {
+        return 'reminder/gapps.tpl';
+    }
+    public function title()
+    {
+        return "Création d'un compte Google Apps";
+    }
+    public function info()
     {
-        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 'Xorg/GoogleApps';
     }
 
-    public static function IsCandidate(User &$user, $candidate)
+    public static function IsCandidate(User $user, $candidate)
     {
+        if (!$user->checkPerms(User::PERM_MAIL)) {
+            return false;
+        }
+
         require_once 'googleapps.inc.php';
-        return GoogleAppsAccount::account_status($user->id());
+        $isSubscribed = GoogleAppsAccount::account_status($user->id());
+        if ($isSubscribed == 'disabled') {
+            $isSubscribed = false;
+        }
+        if ($isSubscribed) {
+            Reminder::MarkCandidateAsAccepted($user->id(), $candidate);
+        }
+        return !$isSubscribed;
     }
 }