X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fplatal.php;h=ce6e34f9483b1d12ddfcb7f718f7ca42d9d1c423;hb=08cce2ff528b38bde27cdec6d6bc28d6af4a42d4;hp=e4dd6c70e688989b10b88217a71a5daf0a2019a0;hpb=c9178c75cab8a35b0aa4b4000708569f9f3359c4;p=platal.git diff --git a/modules/platal.php b/modules/platal.php index e4dd6c7..ce6e34f 100644 --- a/modules/platal.php +++ b/modules/platal.php @@ -66,8 +66,6 @@ class PlatalModule extends PLModule if (logged()) { redirect("events"); } - - return PL_OK; } function handler_cacert(&$page) @@ -94,12 +92,12 @@ class PlatalModule extends PLModule if ($state) { $_SESSION['core_rss_hash'] = rand_url_id(16); - $globals->xdb->execute('UPDATE auth_user_quick + XDB::execute('UPDATE auth_user_quick SET core_rss_hash={?} WHERE user_id={?}', Session::get('core_rss_hash'), Session::getInt('uid')); } else { - $globals->xdb->execute('UPDATE auth_user_quick + XDB::execute('UPDATE auth_user_quick SET core_rss_hash="" WHERE user_id={?}', Session::getInt('uid')); Session::kill('core_rss_hash'); @@ -116,7 +114,7 @@ class PlatalModule extends PLModule if (Env::has('mail_fmt')) { $fmt = Env::get('mail_fmt'); if ($fmt != 'texte') $fmt = 'html'; - $globals->xdb->execute("UPDATE auth_user_quick + XDB::execute("UPDATE auth_user_quick SET core_mail_fmt = '$fmt' WHERE user_id = {?}", Session::getInt('uid')); @@ -129,8 +127,6 @@ class PlatalModule extends PLModule } $page->assign('prefs', $globals->hook->prefs()); - - return PL_OK; } function handler_webredir(&$page) @@ -145,13 +141,13 @@ class PlatalModule extends PLModule $url = Env::get('url'); if (Env::get('submit') == 'Valider' and Env::has('url')) { - $globals->xdb->execute('UPDATE auth_user_quick + 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") { - $globals->xdb->execute("UPDATE auth_user_quick + XDB::execute("UPDATE auth_user_quick SET redirecturl = '' WHERE user_id = {?}", Session::getInt('uid')); @@ -160,13 +156,11 @@ class PlatalModule extends PLModule $page->trig('Redirection supprimée'); } - $res = $globals->xdb->query('SELECT redirecturl + $res = XDB::query('SELECT redirecturl FROM auth_user_quick WHERE user_id = {?}', Session::getInt('uid')); $page->assign('carva', $res->fetchOneCell()); - - return PL_OK; } function handler_prefs_rss(&$page) @@ -181,8 +175,6 @@ class PlatalModule extends PLModule $this->__set_rss_state(true); $page->trig("Ton Fil RSS est activé."); } - - return PL_OK; } function handler_password(&$page) @@ -194,7 +186,7 @@ class PlatalModule extends PLModule $_SESSION['password'] = $password = Post::get('response2'); - $globals->xdb->execute('UPDATE auth_user_md5 + XDB::execute('UPDATE auth_user_md5 SET password={?} WHERE user_id={?}', $password, Session::getInt('uid')); @@ -213,8 +205,6 @@ class PlatalModule extends PLModule $page->changeTpl('motdepasse.tpl'); $page->addJsLink('javascript/motdepasse.js'); $page->assign('xorg_title','Polytechnique.org - Mon mot de passe'); - - return PL_OK; } function handler_smtppass(&$page) @@ -231,23 +221,21 @@ class PlatalModule extends PLModule if (Env::get('op') == "Valider" && strlen($pass) >= 6 && Env::get('smtppass1') == Env::get('smtppass2')) { - $globals->xdb->execute('UPDATE auth_user_md5 SET smtppass = {?} + 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") { - $globals->xdb->execute('UPDATE auth_user_md5 SET smtppass = "" + XDB::execute('UPDATE auth_user_md5 SET smtppass = "" WHERE user_id = {?}', $uid); $page->trig('Compte SMTP et NNTP supprimé'); $log->log("passwd_del"); } - $res = $globals->xdb->query("SELECT IF(smtppass != '', 'actif', '') + $res = XDB::query("SELECT IF(smtppass != '', 'actif', '') FROM auth_user_md5 WHERE user_id = {?}", $uid); $page->assign('actif', $res->fetchOneCell()); - - return PL_OK; } function handler_recovery(&$page) @@ -257,7 +245,7 @@ class PlatalModule extends PLModule $page->changeTpl('recovery.tpl'); if (!Env::has('login') || !Env::has('birth')) { - return PL_OK; + return; } if (!ereg('[0-3][0-9][0-1][0-9][1][9]([0-9]{2})', Env::get('birth'))) { @@ -270,7 +258,7 @@ class PlatalModule extends PLModule // 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 = $globals->xdb->query( + $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') @@ -281,8 +269,8 @@ class PlatalModule extends PLModule $page->assign('ok', true); $url = rand_url_id(); - $globals->xdb->execute('INSERT INTO perte_pass (certificat,uid,created) VALUES ({?},{?},NOW())', $url, $uid); - $res = $globals->xdb->query('SELECT email FROM emails WHERE uid = {?} AND NOT FIND_IN_SET("filter", flags)', $uid); + 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"; @@ -311,18 +299,16 @@ Mail envoy } else { $page->trig('Pas de résultat correspondant aux champs entrés dans notre base de données.'); } - - return PL_OK; } function handler_tmpPWD(&$page, $certif = null) { global $globals; - $globals->xdb->execute('DELETE FROM perte_pass + XDB::execute('DELETE FROM perte_pass WHERE DATE_SUB(NOW(), INTERVAL 380 MINUTE) > created'); - $res = $globals->xdb->query('SELECT uid FROM perte_pass WHERE certificat={?}', $certif); + $res = XDB::query('SELECT uid FROM perte_pass WHERE certificat={?}', $certif); $ligne = $res->fetchOneAssoc(); if (!$ligne) { $page->changeTpl('index.tpl'); @@ -333,18 +319,16 @@ Mail envoy if (Post::has('response2')) { $password = Post::get('response2'); $logger = new DiogenesCoreLogger($uid); - $globals->xdb->query('UPDATE auth_user_md5 SET password={?} + XDB::query('UPDATE auth_user_md5 SET password={?} WHERE user_id={?} AND perms IN("admin","user")', $password, $uid); - $globals->xdb->query('DELETE FROM perte_pass WHERE certificat={?}', $certif); + XDB::query('DELETE FROM perte_pass WHERE certificat={?}', $certif); $logger->log("passwd",""); $page->changeTpl('tmpPWD.success.tpl'); } else { $page->changeTpl('motdepasse.tpl'); $page->addJsLink('javascript/motdepasse.js'); } - - return PL_OK; } function handler_skin(&$page) @@ -359,7 +343,7 @@ Mail envoy $page->assign('xorg_title','Polytechnique.org - Skins'); if (Env::has('newskin')) { // formulaire soumis, traitons les données envoyées - $globals->xdb->execute('UPDATE auth_user_quick + XDB::execute('UPDATE auth_user_quick SET skin={?} WHERE user_id={?}', Env::getInt('newskin'), Session::getInt('uid')); @@ -371,8 +355,7 @@ 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', $globals->xdb->iterator($sql)); - return PL_OK; + $page->assign_by_ref('skins', XDB::iterator($sql)); } function handler_exit(&$page, $level = null) @@ -417,7 +400,6 @@ Mail envoy } else { $page->changeTpl('exit.tpl'); } - return PL_OK; } function handler_rss(&$page, $user = null, $hash = null) @@ -428,7 +410,7 @@ Mail envoy $uid = init_rss('rss.tpl', $user, $hash); - $rss = $globals->xdb->iterator( + $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) @@ -436,8 +418,6 @@ Mail envoy WHERE u.user_id = {?} AND FIND_IN_SET(e.flags, "valide") AND peremption >= NOW()', $uid); $page->assign('rss', $rss); - - return PL_OK; } }