X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fplatal.php;h=16bd8be8c1f27998f750ca4b2fb5b76f167ab2e9;hb=323e53dc4e0b4d0a65182b179fd27880de0c3ff7;hp=30cc13dcd2474f2a863fe1c5a5c7c5bd2b88933e;hpb=9408f15503913897949b55bf654b1db67af073c0;p=platal.git diff --git a/modules/platal.php b/modules/platal.php index 30cc13d..16bd8be 100644 --- a/modules/platal.php +++ b/modules/platal.php @@ -1,6 +1,6 @@ $this->make_hook('index', AUTH_PUBLIC), - 'cacert.pem' => $this->make_hook('cacert', AUTH_PUBLIC), + 'cacert.pem' => $this->make_hook('cacert', AUTH_PUBLIC), 'changelog' => $this->make_hook('changelog', AUTH_PUBLIC), // Preferences thingies @@ -55,9 +55,7 @@ class PlatalModule extends PLModule 'password/smtp' => $this->make_hook('smtppass', AUTH_MDP), 'recovery' => $this->make_hook('recovery', AUTH_PUBLIC), 'exit' => $this->make_hook('exit', AUTH_PUBLIC), - - // happenings related thingies - 'rss' => $this->make_hook('rss', AUTH_PUBLIC), + 'deconnexion.php' => $this->make_hook('exit', AUTH_PUBLIC), ); } @@ -70,16 +68,20 @@ class PlatalModule extends PLModule function handler_cacert(&$page) { - $data = file_get_contents('/etc/ssl/xorgCA/cacert.pem'); - header('Content-Type: application/x-x509-ca-cert'); - header('Content-Length: '.strlen($data)); + $data = file_get_contents("/etc/ssl/xorgCA/cacert.pem","r"); + header("Pragma:"); + header("Set-Cookie:"); + header("Cache-Control:"); + header("Expires:"); + header("Content-Type: application/x-x509-ca-cert"); + header("Content-Length: ".strlen($data)); echo $data; exit; } 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); @@ -104,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')) { @@ -124,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'); @@ -156,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')); @@ -185,18 +187,18 @@ class PlatalModule extends PLModule setcookie('ORGaccess', hash_encrypt($password), (time()+25920000), '/', '' ,0); } - $page->changeTpl('motdepasse.success.tpl'); + $page->changeTpl('platal/motdepasse.success.tpl'); $page->run(); } - $page->changeTpl('motdepasse.tpl'); - $page->addJsLink('javascript/motdepasse.js'); + $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'); @@ -227,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; @@ -251,7 +253,7 @@ class PlatalModule extends PLModule $res = XDB::query( "SELECT user_id, naissance FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON (u.user_id=a.id AND type!='homonyme') + INNER JOIN aliases AS a ON (u.user_id=a.id AND type != 'homonyme') WHERE a.alias={?} AND u.perms IN ('admin','user') AND u.deces=0", $mailorg); list($uid, $naissance) = $res->fetchOneRow(); @@ -259,12 +261,21 @@ 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()); - - require_once "diogenes/diogenes.hermes.inc.php"; - $mymail = new HermesMailer(); + 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); $mymail->setSubject('Ton certificat d\'authentification'); @@ -275,19 +286,18 @@ 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 DiogenesCoreLogger($uid); - $logger->log('recovery', $emails); + $logger = $_SESSION['log'] = new CoreLogger($uid); + $logger->log('recovery', $mails); } else { - $page->trig('Pas de résultat correspondant aux champs entrés dans notre base de données.'); + $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'); } } @@ -299,23 +309,23 @@ 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."); } $uid = $ligne["uid"]; if (Post::has('response2')) { $password = Post::v('response2'); - $logger = new DiogenesCoreLogger($uid); + $logger = new CoreLogger($uid); XDB::query('UPDATE auth_user_md5 SET password={?} WHERE user_id={?} AND perms IN("admin","user")', $password, $uid); XDB::query('DELETE FROM perte_pass WHERE certificat={?}', $certif); $logger->log("passwd",""); - $page->changeTpl('tmpPWD.success.tpl'); + $page->changeTpl('platal/tmpPWD.success.tpl'); } else { - $page->changeTpl('motdepasse.tpl'); - $page->addJsLink('javascript/motdepasse.js'); + $page->changeTpl('platal/motdepasse.tpl'); + $page->addJsLink('motdepasse.js'); } } @@ -323,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 @@ -342,23 +352,19 @@ Mail envoy LEFT JOIN auth_user_quick AS a ON s.id=a.skin WHERE skin_tpl != '' AND ext != '' GROUP BY id ORDER BY s.date DESC"; - $page->assign_by_ref('skins', XDB::iterator($sql)); + $page->assign('skins', XDB::iterator($sql)); } function handler_exit(&$page, $level = null) { if (S::has('suid')) { - if (S::has('suid')) { - $a4l = S::v('forlife'); - $suid = S::v('suid'); - $log = S::v('log'); - $log->log("suid_stop", S::v('forlife') . " by " . $suid['forlife']); - $_SESSION = $suid; - S::kill('suid'); - pl_redirect('admin/utilisateurs.php', 'login='.$a4l); - } else { - pl_redirect('events'); - } + $a4l = S::v('forlife'); + $suid = S::v('suid'); + $log = S::v('log'); + $log->log("suid_stop", S::v('forlife') . " by " . $suid['forlife']); + $_SESSION = $suid; + S::kill('suid'); + pl_redirect('admin/user/' . $a4l); } if ($level == 'forget' || $level == 'forgetall') { @@ -385,25 +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 - 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) ) - WHERE u.user_id = {?} AND FIND_IN_SET(e.flags, "valide") - AND peremption >= NOW()', $uid); - $page->assign('rss', $rss); - } } ?>