// }}}
// {{{ constructor
- public function __construct(User &$sender, User &$user, $email, $comment = null)
+ public function __construct(User $sender, User $user, $email, $comment = null)
{
parent::__construct($sender, false, 'broken');
$this->m_user = &$user;
protected function _mail_body($isok)
{
+ $your = ($this->formal ? 'votre' : 'ta');
if ($isok && !$this->m_reactive) {
return " Un email de contact vient d'être envoyé à {$this->m_user->fullName()}"
. " ({$this->m_user->promo()}) pour confirmer sa volonté de"
. " mettre à jour sa redirection Polytechnique.org !\n\n"
- . "Merci de ta participation !\n";
+ . "Merci de $your participation !\n";
} elseif ($isok) {
return " L'adresse de redirection {$this->m_email} de {$this->m_user->fullName()} ({$this->m_user->promo()}) "
."vient d'être réactivée. Un email lui a été envoyé pour l'en informer.\n\n"
- ."Merci de ta participation !\n";
+ ."Merci de $your participation !\n";
} else {
return " Nous n'utiliserons pas cette adresse pour contacter {$this->m_user->fullName()} ({$this->m_user->promo()}).";
}
global $globals;
$email = $this->m_user->bestEmail();
- XDB::execute("UPDATE emails
- SET flags = 'active', panne_level = 2
- WHERE uid = {?} AND email = {?}", $this->m_user->id(), $this->m_email);
+ XDB::execute('UPDATE email_redirect_account
+ SET flags = \'active\', broken_level = 2
+ WHERE uid = {?} AND redirect = {?}',
+ $this->m_user->id(), $this->m_email);
if (XDB::affectedRows() > 0) {
$this->m_reactive = true;
$mailer = new PlMailer();
$subject = "Ton adresse $email semble ne plus fonctionner";
$reason = "Nous avons été informés que ton adresse $email ne fonctionne plus correctement par un camarade";
} else {
- $res = XDB::iterRow("SELECT email FROM emails WHERE uid = {?} AND flags = 'panne'", $this->m_user->id());
+ $res = XDB::iterRow('SELECT redirect
+ FROM email_redirect_account
+ WHERE uid = {?} AND flags = \'broken\'',
+ $this->m_user->id());
$redirect = array();
while (list($red) = $res->next()) {
list(, $redirect[]) = explode('@', $red);