X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fmarketing.inc.php;h=97ccdad93d57adfdda836ff189266255e3cd401c;hb=fb813fb52d5ab65ca9a5b92b5cb9089523380d79;hp=52988c244827f90438dbe9aa436f9096b2ab14f2;hpb=56081a9c7569245bf06ac582a7657d84c73dc839;p=platal.git diff --git a/include/marketing.inc.php b/include/marketing.inc.php index 52988c2..97ccdad 100644 --- a/include/marketing.inc.php +++ b/include/marketing.inc.php @@ -1,6 +1,6 @@ user = $this->getUser($uid, $email); $this->sender_mail = $this->getFrom($from, $sender); - $this->engine =& $this->getEngine($type, $data, $from == 'user' ? $sender : null); + $this->engine =& $this->getEngine($type, $data, $from == 'user' ? $sender : null, $personal_notes); $this->type = $type; $this->data = $data; $this->from = $from; $this->sender = $sender; + $this->personal_notes = $personal_notes; } private function getUser($uid, $email) @@ -60,12 +62,13 @@ class Marketing 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 . '>', ); } @@ -76,16 +79,16 @@ class Marketing if ($from == 'staff' || !($user = User::getSilent($sender))) { return '"L\'équipe de Polytechnique.org" mail->domain . '>'; } - return sprintf('"%s" <%s>', $user->fullName(), $user->bestEmail()); + return '"' . $user->fullName() . '" <' . $user->bestEmail() . '>'; } - private function &getEngine($type, $data, $from) + private function &getEngine($type, $data, $from, $personal_notes) { $class = $type . 'Marketing'; if (!class_exists($class, false)) { $class= 'DefaultMarketing'; } - $engine = new $class($data, $from); + $engine = new $class($data, $from, $personal_notes); if (!$engine instanceof MarketingEngine) { $engine = null; } @@ -112,9 +115,8 @@ class Marketing $text = $this->engine->getText($this->user); } $sender = substr($this->sender_mail, 1, strpos($this->sender_mail, '"', 2)-1); - $text = str_replace(array("%%hash%%", "%%sender%%"), - array($this->hash, $this->sender_mail), - $text); + $text = str_replace(array('%%hash%%', '%%sender%%', '%%personal_notes%%'), + array($this->hash, $this->sender_mail, ''), $text); $mailer = new PlMailer(); $mailer->setFrom($this->sender_mail); $mailer->addTo($this->user['mail']); @@ -127,15 +129,15 @@ class Marketing public function add($valid = true) { XDB::execute('INSERT IGNORE INTO register_marketing - (uid, sender, email, date, last, nb, type, hash, message, message_data) - VALUES ({?}, {?}, {?}, NOW(), 0, 0, {?}, {?}, {?}, {?})', + (uid, sender, email, date, last, nb, type, hash, message, message_data, personal_notes) + VALUES ({?}, {?}, {?}, NOW(), 0, 0, {?}, {?}, {?}, {?}, {?})', $this->user['id'], $this->sender, $this->user['mail'], $this->from, $this->hash, - $this->type, $this->data); + $this->type, $this->data, $this->personal_notes); $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, $this->personal_notes); $valid->submit(); } return true; @@ -162,7 +164,7 @@ class Marketing static public function get($uid, $email, $recentOnly = false) { - $res = XDB::query("SELECT uid, email, message, message_data, type, sender + $res = XDB::query("SELECT uid, email, message, message_data, type, sender, personal_notes FROM register_marketing WHERE uid = {?} AND email = {?}".( @@ -171,8 +173,8 @@ class Marketing if ($res->numRows() == 0) { return null; } - list ($uid, $email, $type, $data, $from, $sender) = $res->fetchOneRow(); - return new Marketing($uid, $email, $type, $data, $from, $sender); + list ($uid, $email, $type, $data, $from, $senderi, $personal_notes) = $res->fetchOneRow(); + return new Marketing($uid, $email, $type, $data, $from, $sender, $personal_notes); } static public function clear($uid, $email = null) @@ -184,27 +186,33 @@ class Marketing } } - static public function relance($uid, $nbx = -1) + static public function getAliveUsersCount() + { + $uf = new UserFilter(new UFC_Not(new UFC_Dead())); + return $uf->getTotalCount(); + } + + static public function relance(PlUser &$user, $nbx = -1) { global $globals; if ($nbx < 0) { - $res = XDB::query("SELECT COUNT(*) FROM auth_user_md5 WHERE deces=0"); - $nbx = $res->fetchOneCell(); + $nbx = self::getAliveUsersCount(); } - $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); - if (!list($date, $promo, $nom, $prenom, $email, $alias) = $res->fetchOneRow()) { + $res = XDB::fetchOneCell('SELECT r.date, r.email, r.bestalias + FROM register_pending + WHERE r.hash = \'INSCRIT\' AND uid = {?}', + $user->id()); + if (!$res) { return false; + } else { + list($date, $email, $alias) = $res; } - require_once('secure_hash.inc.php'); $hash = rand_url_id(12); $pass = rand_pass(); - $pass_encrypted = hash_encrypt($pass); + $pass_encrypted = sha1($pass); $fdate = strftime('%d %B %Y', strtotime($date)); $mymail = new PlMailer('marketing/relance.mail.tpl'); @@ -219,27 +227,27 @@ class Marketing $mymail->send(); XDB::execute('UPDATE register_pending SET hash={?}, password={?}, relance=NOW() - WHERE uid={?}', $hash, $pass_encrypted, $uid); - return "$prenom $nom ($promo)"; + WHERE uid={?}', $hash, $pass_encrypted, $user->id()); + return $user->fullName(); } } interface MarketingEngine { - public function __construct($data, $from); + public function __construct($data, $from, $personal_notes = null); public function getTitle(); public function getText(array $user); public function process(array $user); } -// class AnnuaireMarketing implements MarketingEngine { protected $titre; protected $intro; protected $signature; + protected $personal_notes; - public function __construct($data, $from) + public function __construct($data, $from, $personal_notes = null) { $this->titre = "Rejoins la communauté polytechnicienne sur Internet"; $this->intro = " Tu n'as pas de fiche dans l'annuaire des polytechniciens sur Internet. " @@ -251,6 +259,11 @@ class AnnuaireMarketing implements MarketingEngine } else { $this->signature = "%%sender%%"; } + if (is_null($personal_notes) || $personal_notes == '') { + $this->personal_notes = '%%personal_notes%%'; + } else { + $this->personal_notes = "\n" . $personal_notes . "\n"; + } } public function getTitle() @@ -268,13 +281,18 @@ class AnnuaireMarketing implements MarketingEngine return $this->signature; } + public function getPersonalNotes() + { + return $this->personal_notes; + } + protected function prepareText(PlPage &$page, array $user) { $page->assign('intro', $this->getIntro()); $page->assign('u', $user); $page->assign('sign', $this->getSignature()); - $res = XDB::query("SELECT COUNT(*) FROM auth_user_md5 WHERE perms IN ('user', 'admin') AND deces = 0"); - $page->assign('num_users', $res->fetchOneCell()); + $page->assign('num_users', self::getAliveUsersCount()); + $page->assign('personal_notes', $this->getPersonalNotes()); } public function getText(array $user) @@ -294,7 +312,7 @@ class ListMarketing extends AnnuaireMarketing { private $name; private $domain; - public function __construct($data, $from) + public function __construct($data, $from, $personal_notes = null) { list($this->name, $this->domain) = explode('@', $data); if ($from && ($user = User::getSilent($from))) { @@ -325,7 +343,7 @@ class ListMarketing extends AnnuaireMarketing class GroupMarketing extends AnnuaireMarketing { private $group; - public function __construct($data, $from) + public function __construct($data, $from, $personal_notes = null) { $this->group = $data; if ($from && ($user = User::getSilent($from))) {