projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'xorg/maint' into xorg/master
[platal.git]
/
modules
/
platal.php
diff --git
a/modules/platal.php
b/modules/platal.php
index
baa18b1
..
3c4776a
100644
(file)
--- a/
modules/platal.php
+++ b/
modules/platal.php
@@
-370,9
+370,14
@@
class PlatalModule extends PLModule
$mymail->setFrom('"Gestion des mots de passe" <support+password@' . $globals->mail->domain . '>');
if (is_null($to)) {
$mymail->addTo($user);
$mymail->setFrom('"Gestion des mots de passe" <support+password@' . $globals->mail->domain . '>');
if (is_null($to)) {
$mymail->addTo($user);
- $mymail->addTo($inactives_to);
+ $log_to = $user->bestEmail();
+ if (!is_null($inactives_to)) {
+ $log_to = $inactives_to . ', ' . $log_to;
+ $mymail->addTo($inactives_to);
+ }
} else {
$mymail->addTo($to);
} else {
$mymail->addTo($to);
+ $log_to = $to;
}
$mymail->setSubject("Ton certificat d'authentification");
$mymail->setTxtBody("Visite la page suivante qui expire dans six heures :
}
$mymail->setSubject("Ton certificat d'authentification");
$mymail->setTxtBody("Visite la page suivante qui expire dans six heures :
@@
-388,7
+393,7
@@
Email envoyé à ".Env::v('login') . (is_null($to) ? '' : '
Adresse de secours : ' . $to));
$mymail->send();
Adresse de secours : ' . $to));
$mymail->send();
- S::logger($user->id())->log('recovery',
is_null($to) ? $inactives_to . ', ' . $user->bestEmail() : $
to);
+ S::logger($user->id())->log('recovery',
$log_
to);
}
function handler_recovery_ext($page)
}
function handler_recovery_ext($page)