<?php
/***************************************************************************
- * Copyright (C) 2003-2008 Polytechnique.org *
+ * Copyright (C) 2003-2009 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
global $globals;
return array(
- 'id' => $user->id(),
- 'sexe' => $user->isFemale(),
- 'mail' => $email,
- 'forlife_email' => $user->login() . '@' . $globals->mail->domain,
+ 'user' => $user,
+ 'id' => $user->id(),
+ 'sexe' => $user->isFemale(),
+ 'mail' => $email,
+ 'to' => '"' . $user->fullName() . '" <' . $email . '>',
+ 'forlife_email' => $user->login() . '@' . $globals->mail->domain,
'forlife_email2' => $user->login() . '@' . $globals->mail->domain2,
- 'to' => '"' . $user->fullName() . '" <' . $email . '>',
);
}
if ($from == 'staff' || !($user = User::getSilent($sender))) {
return '"L\'équipe de Polytechnique.org" <register@' . $globals->mail->domain . '>';
}
- return sprintf('"%s" <%s>', $user->fullName(), $user->bestEmail());
+ return '"' . $user->fullName() . '" <' . $user->bestEmail() . '>';
}
private function &getEngine($type, $data, $from)
$this->engine->process($this->user);
if ($valid) {
require_once 'validations.inc.php';
- $valid = new MarkReq($this->sender, $this->user['id'], $this->user['mail'],
+ $valid = new MarkReq(User::getSilent($this->sender), $this->user['user'], $this->user['mail'],
$this->from == 'user', $this->type, $this->data);
$valid->submit();
}
$res = XDB::query("SELECT r.date, u.promo, u.nom, u.prenom, r.email, r.bestalias
FROM register_pending AS r
INNER JOIN auth_user_md5 AS u ON u.user_id = r.uid
- WHERE hash!='INSCRIT' AND uid={?} AND TO_DAYS(relance) < TO_DAYS(NOW())", $uid);
+ WHERE hash != 'INSCRIT' AND uid = {?} AND
+ (TO_DAYS(relance) IS NULL OR TO_DAYS(relance) < TO_DAYS(NOW()))",
+ $uid);
if (!list($date, $promo, $nom, $prenom, $email, $alias) = $res->fetchOneRow()) {
return false;
}
$mymail->send();
XDB::execute('UPDATE register_pending
SET hash={?}, password={?}, relance=NOW()
- WHERE uid={?}', $hash, $pass_encrypted, $uid);
+ WHERE uid={?}', $hash, $pass_encrypted, $uid);
return "$prenom $nom ($promo)";
}
}