projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix fetching of phones for user addresses
[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
53eb021
..
957422a
100644
(file)
--- a/
include/reminder/email_backup.inc.php
+++ b/
include/reminder/email_backup.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-20
09
Polytechnique.org *
+ * Copyright (C) 2003-20
10
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-25,8
+25,7
@@
class ReminderEmailBackup extends Reminder
{
if ($action == 'yes') {
require_once 'emails.inc.php';
{
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();
$storage->activate();
$this->UpdateOnYes();
@@
-41,18
+40,29
@@
class ReminderEmailBackup extends Reminder
}
}
}
}
- p
rotected function GetDisplayT
ext()
+ p
ublic function t
ext()
{
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.";
}
{
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 function info()
+ {
+ return 'Xorg/IMAP';
+ }
- public static function IsCandidate(User &$user)
+ public static function IsCandidate(User &$user
, $candidate
)
{
require_once 'emails.inc.php';
{
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;
}
}
}
}