X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fplatal.php;h=fbb7a6537cf00abee4d045f99533461400716ccc;hb=1d10d3fd659fa8eb7c663d6bb599bc8bbc0feeb3;hp=6c9df4964634c9b150b975be82e1b6938006103c;hpb=bee33d93c402f9b5107c7e59e04ad686e43a40e7;p=platal.git diff --git a/modules/platal.php b/modules/platal.php index 6c9df49..fbb7a65 100644 --- a/modules/platal.php +++ b/modules/platal.php @@ -39,7 +39,7 @@ class PlatalModule extends PLModule { return array( 'index' => $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,6 +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), + 'deconnexion.php' => $this->make_hook('exit', AUTH_PUBLIC), // happenings related thingies 'rss' => $this->make_hook('rss', AUTH_PUBLIC), @@ -64,15 +65,19 @@ class PlatalModule extends PLModule function handler_index(&$page) { if (S::logged()) { - redirect("events"); + 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; } @@ -83,6 +88,7 @@ class PlatalModule extends PLModule $clog = htmlentities(file_get_contents(dirname(__FILE__).'/../ChangeLog')); $clog = preg_replace('!(#[0-9]+(,[0-9]+)*)!e', 'bugize("\1")', $clog); + $clog = preg_replace('!vim:.*$!', '', $clog); $page->assign('ChangeLog', $clog); } @@ -103,15 +109,11 @@ class PlatalModule extends PLModule function handler_prefs(&$page) { - global $globals; - - var_export($_POST); - $page->changeTpl('preferences.tpl'); $page->assign('xorg_title','Polytechnique.org - Mes préférences'); if (Post::has('mail_fmt')) { - $fmt = Post::get('mail_fmt'); + $fmt = Post::v('mail_fmt'); if ($fmt != 'texte') $fmt = 'html'; XDB::execute("UPDATE auth_user_quick SET core_mail_fmt = '$fmt' @@ -121,10 +123,8 @@ class PlatalModule extends PLModule } if (Post::has('rss')) { - $this->__set_rss_state(Post::getBool('rss')); + $this->__set_rss_state(Post::b('rss')); } - - $page->assign('prefs', $globals->hook->prefs()); } function handler_webredir(&$page) @@ -134,15 +134,15 @@ class PlatalModule extends PLModule $page->assign('xorg_title','Polytechnique.org - Redirection de page WEB'); $log =& S::v('log'); - $url = Env::get('url'); + $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, S::v('uid')); - $log->log('carva_add', 'http://'.Env::get('url')); + $log->log('carva_add', 'http://'.Env::v('url')); $page->trig("Redirection activée vers $url"); - } elseif (Env::get('submit') == "Supprimer") { + } elseif (Env::v('submit') == "Supprimer") { XDB::execute("UPDATE auth_user_quick SET redirecturl = '' WHERE user_id = {?}", @@ -163,9 +163,9 @@ class PlatalModule extends PLModule { $page->changeTpl('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é."); } @@ -176,7 +176,7 @@ 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={?} @@ -186,16 +186,17 @@ class PlatalModule extends PLModule $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->assign('now', strftime("%Y%m%d%H%M%S")); $page->run(); } $page->changeTpl('motdepasse.tpl'); - $page->addJsLink('javascript/motdepasse.js'); + $page->addJsLink('motdepasse.js'); $page->assign('xorg_title','Polytechnique.org - Mon mot de passe'); } @@ -205,17 +206,17 @@ class PlatalModule extends PLModule $page->assign('xorg_title','Polytechnique.org - Acces SMTP/NNTP'); $uid = S::v('uid'); - $pass = Env::get('smtppass1'); + $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é'); $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é'); @@ -238,12 +239,17 @@ class PlatalModule extends PLModule 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)); + + $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 @@ -251,7 +257,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(); @@ -275,19 +281,20 @@ 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::get('email') ? " +\"Le portail des élèves & anciens élèves de l'Ecole polytechnique\"".(Post::v('email') ? " Adresse de secours : - ".Post::get('email') : "")." + ".Post::v('email') : "")." -Mail envoyé à ".Env::get('login')); +Mail envoyé à ".Env::v('login')); $mymail->send(); // on cree un objet logger et on log l'evenement - $logger = $_SESSION['log'] = new DiogenesCoreLogger($uid); + $logger = $_SESSION['log'] = new CoreLogger($uid); $logger->log('recovery', $emails); } 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'); } } @@ -305,17 +312,18 @@ Mail envoy $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->assign('now', strftime("%Y%m%d%H%M%S")); } else { $page->changeTpl('motdepasse.tpl'); - $page->addJsLink('javascript/motdepasse.js'); + $page->addJsLink('motdepasse.js'); } } @@ -329,10 +337,14 @@ Mail envoy 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'), S::v('uid')); + 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 @@ -351,9 +363,9 @@ Mail envoy $log->log("suid_stop", S::v('forlife') . " by " . $suid['forlife']); $_SESSION = $suid; S::kill('suid'); - redirect($globals->baseurl.'/admin/utilisateurs.php?login='.$a4l); + pl_redirect('admin/utilisateurs.php', 'login='.$a4l); } else { - redirect("events"); + pl_redirect('events'); } } @@ -379,7 +391,7 @@ Mail envoy XorgSession::destroy(); if (Get::has('redirect')) { - redirect(rawurldecode(Get::get('redirect'))); + http_redirect(rawurldecode(Get::v('redirect'))); } else { $page->changeTpl('exit.tpl'); } @@ -392,10 +404,12 @@ Mail envoy $uid = init_rss('rss.tpl', $user, $hash); $rss = XDB::iterator( - 'SELECT e.id, e.titre, e.texte, e.creation_date + '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) ) + 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);