X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fplatal.php;h=16bd8be8c1f27998f750ca4b2fb5b76f167ab2e9;hb=323e53dc4e0b4d0a65182b179fd27880de0c3ff7;hp=234b9257b888ca3fed408f0df8996d4e10b9500c;hpb=a3afa47c1b1d9ee8ad932aa3cd1523dbbfba3d24;p=platal.git diff --git a/modules/platal.php b/modules/platal.php index 234b925..16bd8be 100644 --- a/modules/platal.php +++ b/modules/platal.php @@ -1,6 +1,6 @@ $this->make_hook('recovery', AUTH_PUBLIC), 'exit' => $this->make_hook('exit', AUTH_PUBLIC), 'deconnexion.php' => $this->make_hook('exit', AUTH_PUBLIC), - - // happenings related thingies - 'rss' => $this->make_hook('rss', AUTH_PUBLIC), ); } @@ -84,7 +81,7 @@ class PlatalModule extends PLModule function handler_changelog(&$page) { - $page->changeTpl('changeLog.tpl'); + $page->changeTpl('platal/changeLog.tpl'); $clog = htmlentities(file_get_contents(dirname(__FILE__).'/../ChangeLog')); $clog = preg_replace('!(#[0-9]+(,[0-9]+)*)!e', 'bugize("\1")', $clog); @@ -109,7 +106,7 @@ class PlatalModule extends PLModule function handler_prefs(&$page) { - $page->changeTpl('preferences.tpl'); + $page->changeTpl('platal/preferences.tpl'); $page->assign('xorg_title','Polytechnique.org - Mes préférences'); if (Post::has('mail_fmt')) { @@ -129,7 +126,7 @@ class PlatalModule extends PLModule function handler_webredir(&$page) { - $page->changeTpl('webredirect.tpl'); + $page->changeTpl('platal/webredirect.tpl'); $page->assign('xorg_title','Polytechnique.org - Redirection de page WEB'); @@ -161,7 +158,7 @@ class PlatalModule extends PLModule function handler_prefs_rss(&$page) { - $page->changeTpl('filrss.tpl'); + $page->changeTpl('platal/filrss.tpl'); $page->assign('goback', Env::v('referer', 'login')); @@ -190,19 +187,18 @@ class PlatalModule extends PLModule setcookie('ORGaccess', hash_encrypt($password), (time()+25920000), '/', '' ,0); } - $page->changeTpl('motdepasse.success.tpl'); - $page->assign('now', strftime("%Y%m%d%H%M%S")); + $page->changeTpl('platal/motdepasse.success.tpl'); $page->run(); } - $page->changeTpl('motdepasse.tpl'); + $page->changeTpl('platal/motdepasse.tpl'); $page->addJsLink('motdepasse.js'); $page->assign('xorg_title','Polytechnique.org - Mon mot de passe'); } function handler_smtppass(&$page) { - $page->changeTpl('acces_smtp.tpl'); + $page->changeTpl('platal/acces_smtp.tpl'); $page->assign('xorg_title','Polytechnique.org - Acces SMTP/NNTP'); $uid = S::v('uid'); @@ -233,7 +229,7 @@ class PlatalModule extends PLModule { global $globals; - $page->changeTpl('recovery.tpl'); + $page->changeTpl('platal/recovery.tpl'); if (!Env::has('login') || !Env::has('birth')) { return; @@ -265,10 +261,20 @@ class PlatalModule extends PLModule $page->assign('ok', true); $url = rand_url_id(); - XDB::execute('INSERT INTO perte_pass (certificat,uid,created) VALUES ({?},{?},NOW())', $url, $uid); - $res = XDB::query('SELECT email FROM emails WHERE uid = {?} AND NOT FIND_IN_SET("filter", flags)', $uid); - $mails = implode(', ', $res->fetchColumn()); - + XDB::execute('INSERT INTO perte_pass (certificat,uid,created) + VALUES ({?},{?},NOW())', $url, $uid); + $res = XDB::query('SELECT email + FROM emails + WHERE uid = {?} AND email = {?}', + $uid, Post::v('email')); + if ($res->numRows()) { + $mails = $res->fetchOneCell(); + } else { + $res = XDB::query('SELECT email + FROM emails + WHERE uid = {?} AND NOT FIND_IN_SET("filter", flags)', $uid); + $mails = implode(', ', $res->fetchColumn()); + } $mymail = new PlMailer(); $mymail->setFrom('"Gestion des mots de passe" '); $mymail->addTo($mails); @@ -280,17 +286,15 @@ Si en cliquant dessus tu n'y arrives pas, copie int -- Polytechnique.org -\"Le portail des élèves & anciens élèves de l'Ecole polytechnique\"".(Post::v('email') ? " - -Adresse de secours : - ".Post::v('email') : "")." +\"Le portail des élèves & anciens élèves de l'Ecole polytechnique\" -Mail envoyé à ".Env::v('login')); +Mail envoyé à ".Env::v('login') . (Post::has('email') ? " +Adresse de secours : " . Post::v('email') : "")); $mymail->send(); // on cree un objet logger et on log l'evenement $logger = $_SESSION['log'] = new CoreLogger($uid); - $logger->log('recovery', $emails); + $logger->log('recovery', $mails); } else { $page->trig('Les informations que tu as rentrées ne permettent pas de récupérer ton mot de passe.
'. 'Si tu as un homonyme, utilise prenom.nom.promo comme login'); @@ -305,7 +309,7 @@ Mail envoy $res = XDB::query('SELECT uid FROM perte_pass WHERE certificat={?}', $certif); $ligne = $res->fetchOneAssoc(); if (!$ligne) { - $page->changeTpl('index.tpl'); + $page->changeTpl('platal/index.tpl'); $page->kill("Cette adresse n'existe pas ou n'existe plus sur le serveur."); } @@ -318,10 +322,9 @@ Mail envoy $password, $uid); XDB::query('DELETE FROM perte_pass WHERE certificat={?}', $certif); $logger->log("passwd",""); - $page->changeTpl('tmpPWD.success.tpl'); - $page->assign('now', strftime("%Y%m%d%H%M%S")); + $page->changeTpl('platal/tmpPWD.success.tpl'); } else { - $page->changeTpl('motdepasse.tpl'); + $page->changeTpl('platal/motdepasse.tpl'); $page->addJsLink('motdepasse.js'); } } @@ -330,7 +333,7 @@ Mail envoy { global $globals; - $page->changeTpl('skins.tpl'); + $page->changeTpl('platal/skins.tpl'); $page->assign('xorg_title','Polytechnique.org - Skins'); if (Env::has('newskin')) { // formulaire soumis, traitons les données envoyées @@ -388,27 +391,9 @@ Mail envoy if (Get::has('redirect')) { http_redirect(rawurldecode(Get::v('redirect'))); } else { - $page->changeTpl('exit.tpl'); + $page->changeTpl('platal/exit.tpl'); } } - - function handler_rss(&$page, $user = null, $hash = null) - { - require_once 'rss.inc.php'; - - $uid = init_rss('rss.tpl', $user, $hash); - - $rss = XDB::iterator( - 'SELECT e.id, e.titre, e.texte, e.creation_date, - IF(u2.nom_usage = "", u2.nom, u2.nom_usage) AS nom, u2.prenom, u2.promo - FROM auth_user_md5 AS u - INNER JOIN evenements AS e ON ( (e.promo_min = 0 || e.promo_min <= u.promo) - AND (e.promo_max = 0 || e.promo_max >= u.promo) ) - INNER JOIN auth_user_md5 AS u2 ON (u2.user_id = e.user_id) - WHERE u.user_id = {?} AND FIND_IN_SET(e.flags, "valide") - AND peremption >= NOW()', $uid); - $page->assign('rss', $rss); - } } ?>