X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Femail.php;h=5bd204668023b89824e6f650fa6965e1d2310832;hb=cab0809050d58f8484608e91f7555ebd69dcb451;hp=881b2c01de1a2ac2ff67bf3f886c5a99b3c7349e;hpb=fd8f77de8bc10d40395990e3f8e96e0b4a186b46;p=platal.git diff --git a/modules/email.php b/modules/email.php index 881b2c0..5bd2046 100644 --- a/modules/email.php +++ b/modules/email.php @@ -40,13 +40,13 @@ class EmailModule extends PLModule $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={?}", + 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')); } @@ -57,17 +57,17 @@ class EmailModule extends PLModule 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) @@ -86,14 +86,14 @@ class EmailModule extends PLModule $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) @@ -102,14 +102,14 @@ class EmailModule extends PLModule } //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); @@ -135,7 +135,7 @@ class EmailModule extends PLModule 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é. @@ -164,11 +164,11 @@ class EmailModule extends PLModule && ($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; @@ -185,10 +185,10 @@ class EmailModule extends PLModule $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)); @@ -206,7 +206,7 @@ class EmailModule extends PLModule } } - $res = $globals->xdb->query( + $res = XDB::query( "SELECT alias FROM virtual INNER JOIN virtual_redirect USING(vid) @@ -219,7 +219,7 @@ class EmailModule extends PLModule $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') @@ -234,9 +234,9 @@ class EmailModule extends PLModule $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::getInt('statut_filtre')); } $page->assign('filtre',$bogo->level()); } @@ -275,22 +275,22 @@ class EmailModule extends PLModule $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()); } @@ -305,7 +305,7 @@ class EmailModule extends PLModule 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 @@ -318,7 +318,7 @@ class EmailModule extends PLModule $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 ! @@ -354,7 +354,7 @@ L' $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 @@ -367,7 +367,7 @@ L' 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); }