<?php
/***************************************************************************
- * Copyright (C) 2003-2008 Polytechnique.org *
+ * Copyright (C) 2003-2010 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
private $data;
private $from;
private $sender;
+ private $personal_notes;
private $hash = '';
- public function __construct($uid, $email, $type, $data, $from, $sender = null)
+ public function __construct($uid, $email, $type, $data, $from, $sender = null, $personal_notes = null)
{
$this->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)
{
- $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" <register@' . $globals->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" <register@' . $globals->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)
+ 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;
}
$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']);
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;
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 = {?}".(
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)
$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)";
}
}
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. "
} 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()
return $this->signature;
}
+ public function getPersonalNotes()
+ {
+ return $this->personal_notes;
+ }
+
protected function prepareText(PlPage &$page, array $user)
{
$page->assign('intro', $this->getIntro());
$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('personal_notes', $this->getPersonalNotes());
}
public function getText(array $user)
{
private $name;
private $domain;
- public function __construct($data, $from)
+ public function __construct($data, $from, $personal_notes = null)
{
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";
}
class GroupMarketing extends AnnuaireMarketing
{
private $group;
- public function __construct($data, $from)
+ public function __construct($data, $from, $personal_notes = null)
{
$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";
}
projects / platal.git / blobdiff