projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/platal-0.10.2'
[platal.git]
/
include
/
reminder
/
gapps.inc.php
diff --git
a/include/reminder/gapps.inc.php
b/include/reminder/gapps.inc.php
index
aa4921d
..
a420070
100644
(file)
--- a/
include/reminder/gapps.inc.php
+++ b/
include/reminder/gapps.inc.php
@@
-25,7
+25,7
@@
class ReminderGapps extends Reminder
{
switch ($action) {
case 'yes':
{
switch ($action) {
case 'yes':
- $this->UpdateOn
Ye
s();
+ $this->UpdateOn
Dismis
s();
pl_redirect('googleapps');
break;
pl_redirect('googleapps');
break;
@@
-39,18
+39,26
@@
class ReminderGapps extends Reminder
}
}
}
}
- protected function GetDisplayText()
+ public function template()
+ {
+ return 'reminder/gapps.tpl';
+ }
+ public function title()
{
{
- 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 "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());
}
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);
}
if ($isSubscribed) {
Reminder::MarkCandidateAsAccepted($user->id(), $candidate);
}