X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fplatal.php;h=6077f507ce9f8da3fe9eefea6403d78b0981f36b;hb=1f5f2526f9b351e53f8b07e511da1d074a682529;hp=5ebb7be150c64de555b06a0c2939dce2c78bfd5b;hpb=a3a049fc80d3707bcc76903ab89f73974c470c0c;p=platal.git diff --git a/modules/platal.php b/modules/platal.php index 5ebb7be..6077f50 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 - 'prefs' => $this->make_hook('prefs', AUTH_COOKIE), - 'prefs/rss' => $this->make_hook('prefs_rss', AUTH_COOKIE), + 'prefs' => $this->make_hook('prefs', AUTH_COOKIE), + 'prefs/rss' => $this->make_hook('prefs_rss', AUTH_COOKIE), 'prefs/webredirect' - => $this->make_hook('webredir', AUTH_MDP), - 'skin' => $this->make_hook('skin', AUTH_COOKIE), + => $this->make_hook('webredir', AUTH_MDP), + 'prefs/skin' => $this->make_hook('skin', AUTH_COOKIE), // password related thingies 'password' => $this->make_hook('password', AUTH_MDP), @@ -55,34 +55,47 @@ 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), ); } function handler_index(&$page) { - if (logged()) { - redirect("events"); + if (S::logged()) { + pl_redirect('events'); } } 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'); - - $clog = htmlentities(file_get_contents(dirname(__FILE__).'/../ChangeLog')); + $page->changeTpl('platal/changeLog.tpl'); + + $clog = pl_entities(file_get_contents(dirname(__FILE__).'/../ChangeLog')); + // url catch only (not all wiki syntax) + $clog = preg_replace(array( + '/((?:https?|ftp):\/\/(?:\.*,*[\w@~%$£µ&i#\-+=_\/\?;])*)/ui', + '/(\s|^)www\.((?:\.*,*[\w@~%$£µ&i#\-+=_\/\?;])*)/iu', + '/(?:mailto:)?([a-z0-9.\-+_]+@([\-.+_]?[a-z0-9])+)/i'), + array( + '\\0', + '\\1www.\\2', + '\\0'), + $clog); $clog = preg_replace('!(#[0-9]+(,[0-9]+)*)!e', 'bugize("\1")', $clog); + $clog = preg_replace('!vim:.*$!', '', $clog); $page->assign('ChangeLog', $clog); } @@ -92,82 +105,76 @@ class PlatalModule extends PLModule $_SESSION['core_rss_hash'] = rand_url_id(16); XDB::execute('UPDATE auth_user_quick SET core_rss_hash={?} WHERE user_id={?}', - Session::get('core_rss_hash'), - Session::getInt('uid')); + S::v('core_rss_hash'), S::v('uid')); } else { XDB::execute('UPDATE auth_user_quick SET core_rss_hash="" WHERE user_id={?}', - Session::getInt('uid')); - Session::kill('core_rss_hash'); + S::v('uid')); + S::kill('core_rss_hash'); } } function handler_prefs(&$page) { - global $globals; + $page->changeTpl('platal/preferences.tpl'); + $page->assign('xorg_title','Polytechnique.org - Mes préférences'); - $page->changeTpl('preferences.tpl'); - $page->assign('xorg_title','Polytechnique.org - Mes préférences'); - - if (Env::has('mail_fmt')) { - $fmt = Env::get('mail_fmt'); + if (Post::has('mail_fmt')) { + $fmt = Post::v('mail_fmt'); if ($fmt != 'texte') $fmt = 'html'; XDB::execute("UPDATE auth_user_quick SET core_mail_fmt = '$fmt' WHERE user_id = {?}", - Session::getInt('uid')); + S::v('uid')); $_SESSION['mail_fmt'] = $fmt; - redirect($globals->baseurl.'/preferences'); } - if (Env::has('rss')) { - $this->__set_rss_state(Env::getBool('rss')); + if (Post::has('rss')) { + $this->__set_rss_state(Post::b('rss')); } - - $page->assign('prefs', $globals->hook->prefs()); } function handler_webredir(&$page) { - $page->changeTpl('webredirect.tpl'); + $page->changeTpl('platal/webredirect.tpl'); $page->assign('xorg_title','Polytechnique.org - Redirection de page WEB'); - $log =& Session::getMixed('log'); - $url = Env::get('url'); + $log =& S::v('log'); + $url = Env::v('url'); - if (Env::get('submit') == 'Valider' and Env::has('url')) { + if (Env::v('submit') == 'Valider' and Env::has('url')) { XDB::execute('UPDATE auth_user_quick SET redirecturl = {?} WHERE user_id = {?}', - $url, Session::getInt('uid')); - $log->log('carva_add', 'http://'.Env::get('url')); - $page->trig("Redirection activée vers $url"); - } elseif (Env::get('submit') == "Supprimer") { + $url, S::v('uid')); + $log->log('carva_add', 'http://'.Env::v('url')); + $page->trig("Redirection activée vers $url"); + } elseif (Env::v('submit') == "Supprimer") { XDB::execute("UPDATE auth_user_quick SET redirecturl = '' WHERE user_id = {?}", - Session::getInt('uid')); + S::v('uid')); $log->log("carva_del", $url); Post::kill('url'); - $page->trig('Redirection supprimée'); + $page->trig('Redirection supprimée'); } $res = XDB::query('SELECT redirecturl FROM auth_user_quick WHERE user_id = {?}', - Session::getInt('uid')); + S::v('uid')); $page->assign('carva', $res->fetchOneCell()); } function handler_prefs_rss(&$page) { - $page->changeTpl('filrss.tpl'); + $page->changeTpl('platal/filrss.tpl'); - $page->assign('goback', Env::get('referer', 'login')); + $page->assign('goback', Env::v('referer', 'login')); - if (Env::get('act_rss') == 'Activer') { + if (Env::v('act_rss') == 'Activer') { $this->__set_rss_state(true); - $page->trig("Ton Fil RSS est activé."); + $page->trig("Ton Fil RSS est activé."); } } @@ -176,49 +183,53 @@ class PlatalModule extends PLModule if (Post::has('response2')) { require_once 'secure_hash.inc.php'; - $_SESSION['password'] = $password = Post::get('response2'); + $_SESSION['password'] = $password = Post::v('response2'); XDB::execute('UPDATE auth_user_md5 - SET password={?} - WHERE user_id={?}', $password, - Session::getInt('uid')); + SET password={?} + WHERE user_id={?}', $password, + S::v('uid')); - $log =& Session::getMixed('log'); + $log =& S::v('log'); $log->log('passwd', ''); - if (Cookie::get('ORGaccess')) { + if (Cookie::v('ORGaccess')) { 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'); + + require_once 'wiki.inc.php'; + wiki_require_page('Xorg.SMTPSécurisé'); + wiki_require_page('Xorg.NNTPSécurisé'); - $uid = Session::getInt('uid'); - $pass = Env::get('smtppass1'); - $log = Session::getMixed('log'); + $uid = S::v('uid'); + $pass = Env::v('smtppass1'); + $log = S::v('log'); - if (Env::get('op') == "Valider" && strlen($pass) >= 6 - && Env::get('smtppass1') == Env::get('smtppass2')) + if (Env::v('op') == "Valider" && strlen($pass) >= 6 + && Env::v('smtppass1') == Env::v('smtppass2')) { XDB::execute('UPDATE auth_user_md5 SET smtppass = {?} WHERE user_id = {?}', $pass, $uid); - $page->trig('Mot de passe enregistré'); + $page->trig('Mot de passe enregistré'); $log->log("passwd_ssl"); - } elseif (Env::get('op') == "Supprimer") { + } elseif (Env::v('op') == "Supprimer") { XDB::execute('UPDATE auth_user_md5 SET smtppass = "" WHERE user_id = {?}', $uid); - $page->trig('Compte SMTP et NNTP supprimé'); + $page->trig('Compte SMTP et NNTP supprimé'); $log->log("passwd_del"); } @@ -232,62 +243,84 @@ class PlatalModule extends PLModule { global $globals; - $page->changeTpl('recovery.tpl'); + $page->changeTpl('platal/recovery.tpl'); if (!Env::has('login') || !Env::has('birth')) { return; } - if (!ereg('[0-3][0-9][0-1][0-9][1][9]([0-9]{2})', Env::get('birth'))) { - $page->trig_run('Date de naissance incorrecte ou incohérente'); + if (!ereg('[0-3][0-9][0-1][0-9][1][9]([0-9]{2})', Env::v('birth'))) { + $page->trig('Date de naissance incorrecte ou incohérente'); + return; } - $birth = sprintf('%s-%s-%s', substr(Env::get('birth'),4,4), substr(Env::get('birth'),2,2), substr(Env::get('birth'),0,2)); - $mailorg = strtok(Env::get('login'), '@'); + $birth = sprintf('%s-%s-%s', + substr(Env::v('birth'), 4, 4), + substr(Env::v('birth'), 2, 2), + substr(Env::v('birth'), 0, 2)); - // paragraphe rajouté : si la date de naissance dans la base n'existe pas, on l'update - // avec celle fournie ici en espérant que c'est la bonne + $mailorg = strtok(Env::v('login'), '@'); + + // paragraphe rajouté : si la date de naissance dans la base n'existe pas, on l'update + // avec celle fournie ici en espérant que c'est la bonne $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(); if ($naissance == $birth) { + $res = XDB::query("SELECT COUNT(*) + FROM emails + WHERE uid = {?} AND flags != 'panne' AND flags != 'filter'", $uid); + $count = intval($res->fetchOneCell()); + if ($count == 0) { + $page->assign('no_addr', true); + return; + } + $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'); $mymail->setTxtBody("Visite la page suivante qui expire dans six heures : {$globals->baseurl}/tmpPWD/$url -Si en cliquant dessus tu n'y arrives pas, copie intégralement l'adresse dans la barre de ton navigateur. +Si en cliquant dessus tu n'y arrives pas, copie intégralement l'adresse dans la barre de ton navigateur. -- Polytechnique.org -\"Le portail des élèves & anciens élèves de l'Ecole polytechnique\"".(Post::get('email') ? " - -Adresse de secours : - ".Post::get('email') : "")." +\"Le portail des élèves & anciens élèves de l'Ecole polytechnique\" -Mail envoyé à ".Env::get('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 +332,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::get('response2'); - $logger = new DiogenesCoreLogger($uid); + $password = Post::v('response2'); + $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,43 +356,38 @@ Mail envoy { global $globals; - if (!$globals->skin->enable) { - redirect('./'); - } - - $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 + if (Env::has('newskin')) { // formulaire soumis, traitons les données envoyées XDB::execute('UPDATE auth_user_quick - SET skin={?} WHERE user_id={?}', - Env::getInt('newskin'), - Session::getInt('uid')); + SET skin={?} WHERE user_id={?}', + Env::i('newskin'), S::v('uid')); + S::kill('skin'); set_skin(); } + $res = XDB::query('SELECT id FROM skins WHERE skin_tpl={?}', S::v('skin')); + $page->assign('skin_id', $res->fetchOneCell()); + $sql = "SELECT s.*,auteur,count(*) AS nb FROM skins AS s 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 (Session::has('suid')) { - if (Session::has('suid')) { - $a4l = Session::get('forlife'); - $suid = Session::getMixed('suid'); - $log = Session::getMixed('log'); - $log->log("suid_stop", Session::get('forlife') . " by " . $suid['forlife']); - $_SESSION = $suid; - Session::kill('suid'); - redirect($globals->baseurl.'/admin/utilisateurs.php?login='.$a4l); - } else { - redirect("events"); - } + 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/user/' . $a4l); } if ($level == 'forget' || $level == 'forgetall') { @@ -384,27 +412,12 @@ Mail envoy XorgSession::destroy(); if (Get::has('redirect')) { - redirect(rawurldecode(Get::get('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); - } } +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>