X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Femail.php;h=feb1870713b3095163fa79026b25a8481b4d97de;hb=d655dba1a05100bdd309200eb20409e848abf98c;hp=5bd204668023b89824e6f650fa6965e1d2310832;hpb=cab0809050d58f8484608e91f7555ebd69dcb451;p=platal.git diff --git a/modules/email.php b/modules/email.php index 5bd2046..feb1870 100644 --- a/modules/email.php +++ b/modules/email.php @@ -30,6 +30,8 @@ class EmailModule extends PLModule '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') ); } @@ -47,7 +49,7 @@ class EmailModule extends PLModule // there will be maximum 8 bits in flags : 255 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::get('best')); + $uid, Post::v('best')); } // on regarde si on a affaire à un homonyme @@ -116,9 +118,9 @@ class EmailModule extends PLModule 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); @@ -188,6 +190,8 @@ class EmailModule extends PLModule $uid = S::v('uid'); $forlife = S::v('forlife'); + $page->assign('eleve', S::i('promo') >= date("Y") - 5); + $redirect = new Redirect(S::v('uid')); if ($action == 'remove' && $email) { @@ -195,14 +199,14 @@ class EmailModule extends PLModule } 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()))); } } @@ -236,7 +240,7 @@ class EmailModule extends PLModule $bogo = new Bogo(S::v('uid')); if (Env::has('statut_filtre')) { - $bogo->change(S::v('uid'), Env::getInt('statut_filtre')); + $bogo->change(S::v('uid'), Env::i('statut_filtre')); } $page->assign('filtre',$bogo->level()); } @@ -250,15 +254,15 @@ class EmailModule extends PLModule $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."); @@ -272,6 +276,7 @@ class EmailModule extends PLModule 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é."); @@ -344,7 +349,7 @@ L' $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); @@ -367,13 +372,112 @@ L' if ($x = $sel->fetchOneAssoc()) { // on écrit dans la base que l'adresse est cassée if (!$x['panne']) { - XDB::execute("UPDATE emails SET panne=NOW() WHERE email = {?}", $email); + XDB::execute("UPDATE emails + SET panne=NOW(), + last=NOW(), + panne_level = 1 + WHERE email = {?}", $email); + } else { + XDB::execute("UPDATE emails + SET panne_level = 1 + WHERE email = {?} AND panne_level = 0"); } $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 + LEFT JOIN emails AS e USING(email) + LEFT 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 + LEFT JOIN aliases AS a1 ON (a1.id = w.uid AND a1.type = 'a_vie') + LEFT JOIN emails AS e ON (w.email = e.email) + LEFT 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); + } + } } ?>