class EmailModule extends PLModule
{
- function menu_entries()
- {
- return array();
- }
-
function handlers()
{
return array(
'emails/broken' => $this->make_hook('broken', AUTH_COOKIE),
'emails/redirect' => $this->make_hook('redirect', AUTH_MDP),
'emails/send' => $this->make_hook('send', AUTH_MDP),
+
+ 'admin/emails/duplicated' => $this->make_hook('duplicated', AUTH_MDP, 'admin')
);
}
$page->changeTpl('emails/index.tpl');
$page->assign('xorg_title','Polytechnique.org - Mes emails');
- $uid = Session::getInt('uid');
+ $uid = S::v('uid');
if (Post::has('best')) {
// bestalias is the first bit : 1
// there will be maximum 8 bits in flags : 255
- $globals->xdb->execute("UPDATE aliases SET flags=flags & (255 - 1) WHERE id={?}", $uid);
- $globals->xdb->execute("UPDATE aliases SET flags=flags | 1 WHERE id={?} AND alias={?}",
- $uid, Post::get('best'));
+ XDB::execute("UPDATE aliases SET flags=flags & (255 - 1) WHERE id={?}", $uid);
+ XDB::execute("UPDATE aliases SET flags=flags | 1 WHERE id={?} AND alias={?}",
+ $uid, Post::v('best'));
}
// on regarde si on a affaire à un homonyme
FROM aliases
WHERE id = {?} AND type!='homonyme'
ORDER BY LENGTH(alias)";
- $page->assign('aliases', $globals->xdb->iterator($sql, $uid));
+ $page->assign('aliases', XDB::iterator($sql, $uid));
$sql = "SELECT email
FROM emails
WHERE uid = {?} AND FIND_IN_SET('active', flags)";
- $page->assign('mails', $globals->xdb->iterator($sql, $uid));
+ $page->assign('mails', XDB::iterator($sql, $uid));
// on regarde si l'utilisateur a un alias et si oui on l'affiche !
- $forlife = Session::get('forlife');
- $res = $globals->xdb->query(
+ $forlife = S::v('forlife');
+ $res = XDB::query(
"SELECT alias
FROM virtual AS v
INNER JOIN virtual_redirect AS vr USING(vid)
AND alias LIKE '%@{$globals->mail->alias_dom}'",
$forlife.'@'.$globals->mail->domain, $forlife.'@'.$globals->mail->domain2);
$page->assign('melix', $res->fetchOneCell());
- return PL_OK;
}
function handler_alias(&$page, $action = null, $value = null)
$page->changeTpl('emails/alias.tpl');
$page->assign('xorg_title','Polytechnique.org - Alias melix.net');
- $uid = Session::getInt('uid');
- $forlife = Session::get('forlife');
+ $uid = S::v('uid');
+ $forlife = S::v('forlife');
$page->assign('demande', AliasReq::get_request($uid));
if ($action == 'suppr' && $value) {
//Suppression d'un alias
- $globals->xdb->execute(
+ XDB::execute(
'DELETE virtual, virtual_redirect
FROM virtual
INNER JOIN virtual_redirect USING (vid)
}
//Récupération des alias éventuellement existants
- $res = $globals->xdb->query(
+ $res = XDB::query(
"SELECT alias, emails_alias_pub
FROM auth_user_quick, virtual
INNER JOIN virtual_redirect USING(vid)
WHERE ( redirect={?} OR redirect= {?} )
AND alias LIKE '%@{$globals->mail->alias_dom}' AND user_id = {?}",
$forlife.'@'.$globals->mail->domain,
- $forlife.'@'.$globals->mail->domain2, Session::getInt('uid'));
+ $forlife.'@'.$globals->mail->domain2, S::v('uid'));
list($alias, $visibility) = $res->fetchOneRow();
$page->assign('actuel', $alias);
if ($action == 'ask' && Env::has('alias') and Env::has('raison')) {
//Si l'utilisateur vient de faire une damande
- $alias = Env::get('alias');
- $raison = Env::get('raison');
- $public = (Env::get('public', 'off') == 'on')?"public":"private";
+ $alias = Env::v('alias');
+ $raison = Env::v('raison');
+ $public = (Env::v('public', 'off') == 'on')?"public":"private";
$page->assign('r_alias', $alias);
$page->assign('r_raison', $raison);
Vérifie qu'elle comporte entre 3 et 20 caractères
et qu'elle ne contient que des lettres non accentuées,
des chiffres ou les caractères - et .");
- return PL_OK;
+ return;
} else {
//vérifier que l'alias n'est pas déja pris
- $res = $globals->xdb->query('SELECT COUNT(*) FROM virtual WHERE alias={?}',
+ $res = XDB::query('SELECT COUNT(*) FROM virtual WHERE alias={?}',
$alias.'@'.$globals->mail->alias_dom);
if ($res->fetchOneCell() > 0) {
$page->trig("L'alias $alias@{$globals->mail->alias_dom} a déja été attribué.
Tu ne peux donc pas l'obtenir.");
- return PL_OK;
+ return;
}
//vérifier que l'alias n'est pas déja en demande
if ($req->type == "alias" and $req->alias == $alias) {
$page->trig("L'alias $alias@{$globals->mail->alias_dom} a déja été demandé.
Tu ne peux donc pas l'obtenir pour l'instant.");
- return PL_OK;
+ return ;
}
}
$myalias = new AliasReq($uid, $alias, $raison, $public);
$myalias->submit();
$page->assign('success',$alias);
- return PL_OK;
+ return;
}
}
elseif ($action == 'set'
&& ($value == 'public' || $value == 'private'))
{
if ($value == 'public') {
- $globals->xdb->execute("UPDATE auth_user_quick SET emails_alias_pub = 'public'
- WHERE user_id = {?}", Session::getInt('uid'));
+ XDB::execute("UPDATE auth_user_quick SET emails_alias_pub = 'public'
+ WHERE user_id = {?}", S::v('uid'));
} else {
- $globals->xdb->execute("UPDATE auth_user_quick SET emails_alias_pub = 'private'
- WHERE user_id = {?}", Session::getInt('uid'));
+ XDB::execute("UPDATE auth_user_quick SET emails_alias_pub = 'private'
+ WHERE user_id = {?}", S::v('uid'));
}
$visibility = $value;
}
$page->assign('mail_public', ($visibility == 'public'));
-
- return PL_OK;
}
function handler_redirect(&$page, $action = null, $email = null)
$page->changeTpl('emails/redirect.tpl');
- $uid = Session::getInt('uid');
- $forlife = Session::get('forlife');
+ $uid = S::v('uid');
+ $forlife = S::v('forlife');
- $redirect = new Redirect(Session::getInt('uid'));
+ $redirect = new Redirect(S::v('uid'));
if ($action == 'remove' && $email) {
$page->assign('retour', $redirect->delete_email($email));
}
if (Env::has('emailop')) {
- $actifs = Env::getMixed('emails_actifs', Array());
- if (Env::get('emailop') == "ajouter" && Env::has('email')) {
- $page->assign('retour', $redirect->add_email(Env::get('email')));
+ $actifs = Env::v('emails_actifs', Array());
+ if (Env::v('emailop') == "ajouter" && Env::has('email')) {
+ $page->assign('retour', $redirect->add_email(Env::v('email')));
} elseif (empty($actifs)) {
$page->assign('retour', ERROR_INACTIVE_REDIRECTION);
} elseif (is_array($actifs)) {
$page->assign('retour', $redirect->modify_email($actifs,
- Env::getMixed('emails_rewrite',Array())));
+ Env::v('emails_rewrite',Array())));
}
}
- $res = $globals->xdb->query(
+ $res = XDB::query(
"SELECT alias
FROM virtual
INNER JOIN virtual_redirect USING(vid)
$page->assign('melix',$melix);
}
- $res = $globals->xdb->query(
+ $res = XDB::query(
"SELECT alias,expire
FROM aliases
WHERE id={?} AND (type='a_vie' OR type='alias')
ORDER BY !FIND_IN_SET('usage',flags), LENGTH(alias)", $uid);
$page->assign('alias', $res->fetchAllAssoc());
$page->assign('emails',$redirect->emails);
-
- return PL_OK;
}
function handler_antispam(&$page)
$page->changeTpl('emails/antispam.tpl');
- $bogo = new Bogo(Session::getInt('uid'));
+ $bogo = new Bogo(S::v('uid'));
if (Env::has('statut_filtre')) {
- $bogo->change(Session::getInt('uid'), Env::getInt('statut_filtre'));
+ $bogo->change(S::v('uid'), Env::i('statut_filtre'));
}
$page->assign('filtre',$bogo->level());
-
- return PL_OK;
}
function handler_send(&$page)
$page->assign('xorg_title','Polytechnique.org - Envoyer un email');
// action si on recoit un formulaire
- if (Env::get('submit') == 'Envoyer')
+ if (Env::v('submit') == 'Envoyer')
{
- $to2 = join(', ', Env::getMixed('contacts', Array()));
- $txt = str_replace('^M', '', Env::get('contenu'));
- $to = Env::get('to');
- $subj = Env::get('sujet');
- $from = Env::get('from');
- $cc = Env::get('cc');
- $bcc = Env::get('bcc');
+ $to2 = join(', ', Env::v('contacts', Array()));
+ $txt = str_replace('^M', '', Env::v('contenu'));
+ $to = Env::v('to');
+ $subj = Env::v('sujet');
+ $from = Env::v('from');
+ $cc = Env::v('cc');
+ $bcc = Env::v('bcc');
if (empty($to) && empty($cc) && empty($to2)) {
$page->trig("Indique au moins un destinataire.");
if (!empty($cc)) { $mymail->addCc($cc); }
if (!empty($bcc)) { $mymail->addBcc($bcc); }
if (!empty($to2)) { $mymail->addTo($to2); }
+ $mymail->addHeader('X-XOrg-Login', S::v('bestalias') . '@' . $globals->mail->domain);
$mymail->setTxtBody(wordwrap($txt,72,"\n"));
if ($mymail->send()) {
$page->trig("Ton mail a bien été envoyé.");
- $_REQUEST = array('bcc' => Session::get('bestalias').'@'.$globals->mail->domain);
+ $_REQUEST = array('bcc' => S::v('bestalias').'@'.$globals->mail->domain);
} else {
$page->trig("Erreur lors de l'envoi du courriel, réessaye.");
}
}
} else {
- $_REQUEST['bcc'] = Session::get('bestalias').'@'.$globals->mail->domain;
+ $_REQUEST['bcc'] = S::v('bestalias').'@'.$globals->mail->domain;
}
- $res = $globals->xdb->query(
+ $res = XDB::query(
"SELECT u.prenom, u.nom, u.promo, a.alias as forlife
FROM auth_user_md5 AS u
INNER JOIN contacts AS c ON (u.user_id = c.contact)
INNER JOIN aliases AS a ON (u.user_id=a.id AND FIND_IN_SET('bestalias',a.flags))
WHERE c.uid = {?}
- ORDER BY u.nom, u.prenom", Session::getInt('uid'));
+ ORDER BY u.nom, u.prenom", S::v('uid'));
$page->assign('contacts', $res->fetchAllAssoc());
-
- return PL_OK;
}
function handler_broken(&$page, $warn = null, $email = null)
if ($warn == 'warn' && $email) {
$email = valide_email($email);
// vérifications d'usage
- $sel = $globals->xdb->query(
+ $sel = XDB::query(
"SELECT e.uid, a.alias
FROM emails AS e
INNER JOIN auth_user_md5 AS u ON e.uid = u.user_id
$message = "Bonjour !
Ce mail a été généré automatiquement par le service de patte cassée de
-Polytechnique.org car un autre utilisateur, ".Session::get('prenom').' '.Session::get('nom').",
+Polytechnique.org car un autre utilisateur, ".S::v('prenom').' '.S::v('nom').",
nous a signalé qu'en t'envoyant un mail, il avait reçu un message d'erreur
indiquant que ton adresse de redirection $email
ne fonctionnait plus !
Nous te suggérons de vérifier cette adresse, et le cas échéant de mettre
-à jour sur le site <{$globals->baseurl}/emails.php> tes adresses
+à jour sur le site <{$globals->baseurl}/emails> tes adresses
de redirection...
Pour plus de rensignements sur le service de patte cassée, n'hésites pas à
-consulter la page <{$globals->baseurl}/emails/broken.php>.
+consulter la page <{$globals->baseurl}/emails/broken>.
A bientôt sur Polytechnique.org !
$page->trig("Mail envoyé ! :o)");
}
} elseif (Post::has('email')) {
- $email = valide_email(Post::get('email'));
+ $email = valide_email(Post::v('email'));
list(,$fqdn) = explode('@', $email);
$fqdn = strtolower($fqdn);
$page->assign('neuneu', true);
} else {
$page->assign('email',$email);
- $sel = $globals->xdb->query(
+ $sel = XDB::query(
"SELECT e1.uid, e1.panne != 0 AS panne, count(e2.uid) AS nb_mails,
u.nom, u.prenom, u.promo
FROM emails as e1
if ($x = $sel->fetchOneAssoc()) {
// on écrit dans la base que l'adresse est cassée
if (!$x['panne']) {
- $globals->xdb->execute("UPDATE emails SET panne=NOW() WHERE email = {?}", $email);
+ XDB::execute("UPDATE emails SET panne=NOW() WHERE email = {?}", $email);
}
$page->assign_by_ref('x', $x);
}
}
}
}
+
+ function handler_duplicated(&$page, $action = 'list', $email = null)
+ {
+ $page->changeTpl('emails/duplicated.tpl');
+
+ $states = array('pending' => 'En attente...',
+ 'safe' => 'Pas d\'inquiétude',
+ 'unsafe' => 'Recherches en cours',
+ 'dangerous' => 'Usurpations par cette adresse');
+ $page->assign('states', $states);
+
+ switch (Post::v('action')) {
+ case 'create':
+ if (trim(Post::v('emailN')) != '') {
+ Xdb::execute('INSERT IGNORE INTO emails_watch (email, state, detection, last, uid, description)
+ VALUES ({?}, {?}, CURDATE(), NOW(), {?}, {?})',
+ trim(Post::v('emailN')), Post::v('stateN'), S::i('uid'), Post::v('descriptionN'));
+ };
+ break;
+
+ case 'edit':
+ Xdb::execute('UPDATE emails_watch
+ SET state = {?}, last = NOW(), uid = {?}, description = {?}
+ WHERE email = {?}', Post::v('stateN'), S::i('uid'), Post::v('descriptionN'), Post::v('emailN'));
+ break;
+
+ default:
+ if ($action == 'delete' && !is_null($email)) {
+ Xdb::execute('DELETE FROM emails_watch WHERE email = {?}', $email);
+ }
+ }
+ if ($action != 'create' && $action != 'edit') {
+ $action = 'list';
+ }
+ $page->assign('action', $action);
+
+ if ($action == 'list') {
+ $sql = "SELECT w.email, w.detection, w.state, a.alias AS forlife
+ FROM emails_watch AS w
+ INNER JOIN emails AS e USING(email)
+ INNER JOIN aliases AS a ON (a.id = e.uid AND a.type = 'a_vie')
+ ORDER BY w.state, w.email, a.alias";
+ $it = Xdb::iterRow($sql);
+
+ $table = array();
+ $props = array();
+ while (list($email, $date, $state, $forlife) = $it->next()) {
+ if (count($props) == 0 || $props['mail'] != $email) {
+ if (count($props) > 0) {
+ $table[] = $props;
+ }
+ $props = array('mail' => $email,
+ 'detection' => $date,
+ 'state' => $state,
+ 'users' => array($forlife));
+ } else {
+ $props['users'][] = $forlife;
+ }
+ }
+ if (count($props) > 0) {
+ $table[] = $props;
+ }
+ $page->assign('table', $table);
+ } elseif ($action == 'edit') {
+ $sql = "SELECT w.detection, w.state, w.last, w.description,
+ a1.alias AS edit, a2.alias AS forlife
+ FROM emails_watch AS w
+ INNER JOIN emails AS e USING(email)
+ LEFT JOIN aliases AS a1 ON (a1.id = w.uid AND a1.type = 'a_vie')
+ INNER JOIN aliases AS a2 ON (a2.id = e.uid AND a2.type = 'a_vie')
+ WHERE w.email = {?}
+ ORDER BY a2.alias";
+ $it = Xdb::iterRow($sql, $email);
+
+ $props = array();
+ while (list($detection, $state, $last, $description, $edit, $forlife) = $it->next()) {
+ if (count($props) == 0) {
+ $props = array('mail' => $email,
+ 'detection' => $detection,
+ 'state' => $state,
+ 'last' => $last,
+ 'description' => $description,
+ 'edit' => $edit,
+ 'users' => array($forlife));
+ } else {
+ $props['users'][] = $forlife;
+ }
+ }
+ $page->assign('doublon', $props);
+ }
+ }
}
?>
projects / platal.git / blobdiff