X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fmarketing.inc.php;h=7a5398943dd2c6f5258b3ca488076cdbfdc68362;hb=1f58ccb1e75eca08fbd04971d617ea372bc77b5a;hp=699fb541250a78aaa1eca06cb6e57cada3f5b6fd;hpb=24490a67bad1c8975d26ab2e6e0b94be49007a1c;p=platal.git diff --git a/include/marketing.inc.php b/include/marketing.inc.php index 699fb54..7a53989 100644 --- a/include/marketing.inc.php +++ b/include/marketing.inc.php @@ -1,6 +1,6 @@ type = $type; $this->data = $data; $this->from = $from; - $this->sender = $sender; + $this->sender = $sender; } private function getUser($uid, $email) { - require_once("xorg.misc.inc.php"); - $res = XDB::query("SELECT FIND_IN_SET('femme', flags) AS sexe, nom, prenom, promo - FROM auth_user_md5 - WHERE user_id = {?}", $uid); - if ($res->numRows() == 0) { + $user = User::getSilent($uid); + if (!$user) { return null; - } - $user = $res->fetchOneAssoc(); - $user['id'] = $uid; - $user['forlife'] = make_forlife($user['prenom'], $user['nom'], $user['promo']); - $user['mail'] = $email; - $user['to'] = '"' . $user['prenom'] . ' ' . $user['nom'] . '" <' . $email . '>'; - return $user; + } + + global $globals; + return array( + '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, + ); } private function getFrom($from, $sender) { global $globals; - - if ($from == 'staff') { + + if ($from == 'staff' || !($user = User::getSilent($sender))) { return '"L\'équipe de Polytechnique.org" mail->domain . '>'; - } else { - $res = XDB::query("SELECT u.nom, u.prenom, a.alias - FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON (a.id = u.user_id AND FIND_IN_SET('bestalias', a.flags)) - WHERE u.user_id = {?}", $sender); - if (!$res->numRows()) { - return '"L\'équipe de Polytechnique.org" mail->domain . '>'; - } - $sender = $res->fetchOneAssoc(); - return '"' . $sender['prenom'] . ' ' . $sender['nom'] . '" <' . $sender['alias'] . '@' . $globals->mail->domain . '>'; } + return '"' . $user->fullName() . '" <' . $user->bestEmail() . '>'; } private function &getEngine($type, $data, $from) @@ -142,8 +135,8 @@ class Marketing $this->engine->process($this->user); if ($valid) { require_once 'validations.inc.php'; - $valid = new MarkReq($this->sender, $this->user['id'], $this->user['mail'], - $this->from == 'user', $this->type, $this->data); + $valid = new MarkReq(User::getSilent($this->sender), $this->user['user'], $this->user['mail'], + $this->from == 'user', $this->type, $this->data); $valid->submit(); } return true; @@ -188,7 +181,7 @@ class Marketing if (!$email) { XDB::execute("DELETE FROM register_marketing WHERE uid = {?}", $uid); } else { - XDB::execute("DELETE FROM register_marketing WHERE uid = {?} AND email = {?}", $uid, $email); + XDB::execute("DELETE FROM register_marketing WHERE uid = {?} AND email = {?}", $uid, $email); } } @@ -200,22 +193,24 @@ class Marketing $res = XDB::query("SELECT COUNT(*) FROM auth_user_md5 WHERE deces=0"); $nbx = $res->fetchOneCell(); } - + $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; } - + require_once('secure_hash.inc.php'); $hash = rand_url_id(12); $pass = rand_pass(); $pass_encrypted = hash_encrypt($pass); $fdate = strftime('%d %B %Y', strtotime($date)); - - $mymail = new PlMailer('marketing/mail.relance.tpl'); + + $mymail = new PlMailer('marketing/relance.mail.tpl'); $mymail->assign('nbdix', $nbx); $mymail->assign('fdate', $fdate); $mymail->assign('lusername', $alias); @@ -227,7 +222,7 @@ class Marketing $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)"; } } @@ -240,7 +235,7 @@ interface MarketingEngine public function process(array $user); } -// +// class AnnuaireMarketing implements MarketingEngine { protected $titre; @@ -276,7 +271,7 @@ class AnnuaireMarketing implements MarketingEngine return $this->signature; } - protected function prepareText(PlatalPage &$page, array $user) + protected function prepareText(PlPage &$page, array $user) { $page->assign('intro', $this->getIntro()); $page->assign('u', $user); @@ -287,7 +282,8 @@ class AnnuaireMarketing implements MarketingEngine public function getText(array $user) { - $page = new XorgPage('marketing/mail.marketing.tpl', NO_SKIN); + $page = new XorgPage(); + $page->changeTpl('marketing/marketing.mail.tpl', NO_SKIN); $this->prepareText($page, $user); return $page->raw(); } @@ -304,12 +300,8 @@ class ListMarketing extends AnnuaireMarketing public function __construct($data, $from) { list($this->name, $this->domain) = explode('@', $data); - $res = XDB::query("SELECT prenom, IF (nom_usage != '', nom_usage, nom) - FROM auth_user_md5 - WHERE user_id = {?} AND user_id != 0", $from ? $from : 0); - if ($res->numRows()) { - list($prenom, $nom) = $res->fetchOneRow(); - $from = "$prenom $nom"; + if ($from && ($user = User::getSilent($from))) { + $from = $user->fullName(); } else { $from = "Je"; } @@ -339,12 +331,8 @@ class GroupMarketing extends AnnuaireMarketing public function __construct($data, $from) { $this->group = $data; - $res = XDB::query("SELECT prenom, IF (nom_usage != '', nom_usage, nom) - FROM auth_user_md5 - WHERE user_id = {?} AND user_id != 0", $from ? $from : 0); - if ($res->numRows()) { - list($prenom, $nom) = $res->fetchOneRow(); - $from = "$prenom $nom vient"; + if ($from && ($user = User::getSilent($from))) { + $from = $user->fullName() . " vient"; } else { $from = "Je viens"; }