X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fplatal.php;h=55e55cbe4afa2441d747bcd76bf09a76050b24a1;hb=2c0315bc77abc3c53b5891d2a8c5d4943fd27143;hp=646656fe7f0925f6ef829ccbc06ba06f136e849c;hpb=cab0809050d58f8484608e91f7555ebd69dcb451;p=platal.git diff --git a/modules/platal.php b/modules/platal.php index 646656f..55e55cb 100644 --- a/modules/platal.php +++ b/modules/platal.php @@ -43,11 +43,11 @@ class PlatalModule extends PLModule '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), @@ -64,7 +64,7 @@ class PlatalModule extends PLModule function handler_index(&$page) { if (S::logged()) { - redirect("events"); + pl_redirect('events'); } } @@ -103,27 +103,22 @@ class PlatalModule extends PLModule function handler_prefs(&$page) { - global $globals; - $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 = {?}", 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) @@ -133,15 +128,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 = {?}", @@ -162,9 +157,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é."); } @@ -175,7 +170,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={?} @@ -185,7 +180,7 @@ 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); } @@ -204,17 +199,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é'); @@ -237,12 +232,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 @@ -274,12 +274,12 @@ 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 @@ -304,7 +304,7 @@ Mail envoy $uid = $ligne["uid"]; if (Post::has('response2')) { - $password = Post::get('response2'); + $password = Post::v('response2'); $logger = new DiogenesCoreLogger($uid); XDB::query('UPDATE auth_user_md5 SET password={?} WHERE user_id={?} AND perms IN("admin","user")', @@ -322,21 +322,20 @@ Mail envoy { global $globals; - if (!$globals->skin->enable) { - redirect('./'); - } - $page->changeTpl('skins.tpl'); $page->assign('xorg_title','Polytechnique.org - Skins'); 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')); + 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 @@ -355,9 +354,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'); } } @@ -383,7 +382,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'); }