X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Femails.inc.php;h=1e328409e6807bd613af2effe181b13660b5ea70;hb=65fae027e8ae613d174d2875825b83c7bae86c6a;hp=5a05f61a011f710a0432da7f21d667ef863bf09a;hpb=105427e9fd39bad5e5fa972528d77032e2cd4b93;p=platal.git diff --git a/include/emails.inc.php b/include/emails.inc.php index 5a05f61..1e32840 100644 --- a/include/emails.inc.php +++ b/include/emails.inc.php @@ -30,7 +30,7 @@ function require_email_update(User $user, $new_email) { Platal::assert(!is_null($user), 'User cannot be null.'); - return !$user->checkPerms(User::PERM_MAIL) && $new_email != $user->forlifeEmail(); + return !$user->checkPerms(User::PERM_MAIL) && strtolower($new_email) != strtolower($user->forlifeEmail()); } function format_email_alias($email) @@ -189,7 +189,7 @@ function mark_broken_email($email, $admin = false) return; } - $user = XDB::fetchOneAssoc('SELECT r1.uid, r1.broken_level != 0 AS broken, COUNT(r2.uid) AS nb_mails, + $user = XDB::fetchOneAssoc('SELECT r1.uid, a.hruid, a.full_name, r1.broken_level != 0 AS broken, COUNT(r2.uid) AS nb_mails, s.email AS alias, DATE_ADD(r1.last, INTERVAL 14 DAY) < CURDATE() as notify FROM email_redirect_account AS r1 INNER JOIN accounts AS a ON (a.uid = r1.uid)