X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fprofile.php;h=f5e92075270d44c2d28e985089e061709bf75289;hb=74f583b3308a61b2cdb5fa789595f322d8e190df;hp=b6cd6956b7f92f6004b2e1ab3034b6b90e365e95;hpb=f70f2bcdc077c220e40ecebaf569e097f6028743;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index b6cd695..f5e9207 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -125,6 +125,7 @@ class ProfileModule extends PLModule function handler_photo_change(&$page) { + global $globals; $page->changeTpl('profile/trombino.tpl'); require_once('validations.inc.php'); @@ -133,6 +134,8 @@ class ProfileModule extends PLModule .'/'.S::v('forlife').'.jpg'; if (Env::has('upload')) { + S::assert_xsrf_token(); + $upload = new PlUpload(S::v('forlife'), 'photo'); if (!$upload->upload($_FILES['userfile']) && !$upload->download(Env::v('photo'))) { $page->trigError('Une erreur est survenue lors du téléchargement du fichier'); @@ -143,6 +146,8 @@ class ProfileModule extends PLModule } } } elseif (Env::has('trombi')) { + S::assert_xsrf_token(); + $upload = new PlUpload(S::v('forlife'), 'photo'); if ($upload->copyFrom($trombi_x)) { $myphoto = new PhotoReq(S::v('uid'), $upload); @@ -152,18 +157,22 @@ class ProfileModule extends PLModule } } } elseif (Env::v('suppr')) { + S::assert_xsrf_token(); + XDB::execute('DELETE FROM photo WHERE uid = {?}', S::v('uid')); XDB::execute('DELETE FROM requests WHERE user_id = {?} AND type="photo"', S::v('uid')); - update_NbValid(); + $globals->updateNbValid(); } elseif (Env::v('cancel')) { + S::assert_xsrf_token(); + $sql = XDB::query('DELETE FROM requests WHERE user_id={?} AND type="photo"', S::v('uid')); - update_NbValid(); + $globals->updateNbValid(); } $sql = XDB::query('SELECT COUNT(*) @@ -189,19 +198,15 @@ class ProfileModule extends PLModule if (!S::logged() || Env::v('view') == 'public') $view = 'public'; if (S::logged() && Env::v('view') == 'ax') $view = 'ax'; - if (is_numeric($x)) { - $res = XDB::query( - "SELECT alias - FROM aliases AS a - INNER JOIN auth_user_md5 AS u ON (a.id=u.user_id AND a.type='a_vie') - WHERE matricule={?}", $x); - $login = $res->fetchOneCell(); - } else { - $login = get_user_forlife($x, S::logged() ? '_default_user_callback' - : '_silent_user_callback'); + $login = S::logged() ? User::get($x) : User::getSilent($x); + if (!$login) { + return PL_NOT_FOUND; } - if (empty($login)) { + $res = XDB::query("SELECT perms IN ('admin','user','disabled') + FROM auth_user_md5 + WHERE user_id = {?}", $login->id()); + if (!$res->fetchOneCell()) { $user = get_not_registered_user($x, true); if ($user->total() != 1) { return PL_NOT_FOUND; @@ -213,15 +218,15 @@ class ProfileModule extends PLModule $user['forlife'] = $x; } else { $new = Env::v('modif') == 'new'; - $user = get_user_details($login, S::v('uid'), $view); + $user = get_user_details($login->login(), S::v('uid'), $view); } if (S::logged()) { - S::logger()->log('view_profile', $login); + S::logger()->log('view_profile', $login->login()); } $title = $user['prenom'] . ' ' . ( empty($user['nom_usage']) ? $user['nom'] : $user['nom_usage'] ); - $page->assign('pl_title', $title); + $page->setTitle($title); // photo @@ -272,18 +277,17 @@ class ProfileModule extends PLModule function handler_ax(&$page, $user = null) { - require_once 'user.func.inc.php'; - $user = get_user_forlife($user); + $user = User::get($user); if (!$user) { return PL_NOT_FOUND; } - $res = XDB::query('SELECT matricule_ax - FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON (a.type = "a_vie" AND a.id = u.user_id) - WHERE a.alias = {?}', $user); + + $res = XDB::query("SELECT matricule_ax + FROM auth_user_md5 + WHERE user_id = {?}", $user->id()); $mat = $res->fetchOneCell(); if (!intval($mat)) { - $page->kill("Le matricule AX de $user est inconnu"); + $page->kill("Le matricule AX de {$user->login()} est inconnu"); } http_redirect("http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&anc_id=$mat"); } @@ -328,7 +332,7 @@ class ProfileModule extends PLModule . " la procédure de récupération de mot de passe si un jour tu le perdais"); } - $page->assign('pl_title', 'Polytechnique.org - Mon Profil'); + $page->setTitle('Polytechnique.org - Mon Profil'); } function handler_applis_js(&$page) @@ -459,6 +463,8 @@ class ProfileModule extends PLModule if (!Env::has('promo_sortie')) { return; + } else { + S::assert_xsrf_token(); } $promo_sortie = Env::i('promo_sortie'); @@ -559,7 +565,7 @@ class ProfileModule extends PLModule { require_once 'wiki.inc.php'; wiki_require_page('Docs.Emploi'); - $page->assign('pl_title', 'Polytechnique.org - Conseil Pro'); + $page->setTitle('Polytechnique.org - Conseil Pro'); //recuperation des noms de secteurs $res = XDB::iterRow("SELECT id, label FROM emploi_secteur"); @@ -661,6 +667,8 @@ class ProfileModule extends PLModule $page->assign('usage_req', $nom_usage); if (Env::has('submit') && ($nom_usage != $usage_old)) { + S::assert_xsrf_token(); + // on vient de recevoir une requete, differente de l'ancien nom d'usage if ($nom_usage == $nom) { $page->assign('same', true); @@ -680,7 +688,7 @@ class ProfileModule extends PLModule function handler_xnet(&$page) { $page->changeTpl('profile/groupesx.tpl'); - $page->assign('pl_title', 'Polytechnique.org - Promo, Groupes X, Binets'); + $page->setTitle('Polytechnique.org - Promo, Groupes X, Binets'); $req = XDB::query(' SELECT m.asso_id, a.nom, diminutif, a.logo IS NOT NULL AS has_logo, @@ -710,7 +718,7 @@ class ProfileModule extends PLModule function handler_admin_trombino(&$page, $uid = null, $action = null) { $page->changeTpl('profile/admin_trombino.tpl'); - $page->assign('pl_title','Polytechnique.org - Administration - Trombino'); + $page->setTitle('Polytechnique.org - Administration - Trombino'); $page->assign('uid', $uid); $q = XDB::query( @@ -721,7 +729,6 @@ class ProfileModule extends PLModule list($forlife, $promo) = $q->fetchOneRow(); switch ($action) { - case "original": header("Content-type: image/jpeg"); readfile("/home/web/trombino/photos".$promo."/".$forlife.".jpg"); @@ -729,6 +736,8 @@ class ProfileModule extends PLModule break; case "new": + S::assert_xsrf_token(); + $data = file_get_contents($_FILES['userfile']['tmp_name']); list($x, $y) = getimagesize($_FILES['userfile']['tmp_name']); $mimetype = substr($_FILES['userfile']['type'], 6); @@ -739,6 +748,8 @@ class ProfileModule extends PLModule break; case "delete": + S::assert_xsrf_token(); + XDB::execute('DELETE FROM photo WHERE uid = {?}', $uid); break; } @@ -746,7 +757,7 @@ class ProfileModule extends PLModule $page->assign('forlife', $forlife); } function handler_admin_binets(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Binets'); + $page->setTitle('Polytechnique.org - Administration - Binets'); $page->assign('title', 'Gestion des binets'); $table_editor = new PLTableEditor('admin/binets', 'binets_def', 'id'); $table_editor->add_join_table('binets_ins','binet_id',true); @@ -754,7 +765,7 @@ class ProfileModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_admin_formations(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Formations'); + $page->setTitle('Polytechnique.org - Administration - Formations'); $page->assign('title', 'Gestion des formations'); $table_editor = new PLTableEditor('admin/formations','applis_def','id'); $table_editor->add_join_table('applis_ins','aid',true); @@ -763,21 +774,21 @@ class ProfileModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_admin_sections(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Sections'); + $page->setTitle('Polytechnique.org - Administration - Sections'); $page->assign('title', 'Gestion des sections'); $table_editor = new PLTableEditor('admin/sections','sections','id'); $table_editor->describe('text','intitulé',true); $table_editor->apply($page, $action, $id); } function handler_admin_ss_secteurs(&$page, $action = 'list', $id = null) { - $page->assign('pl_title', 'Polytechnique.org - Administration - Sous-secteurs'); + $page->setTitle('Polytechnique.org - Administration - Sous-secteurs'); $page->assign('title', 'Gestion des sous-secteurs'); $table_editor = new PLTableEditor('admin/ss_secteurs', 'emploi_ss_secteur', 'id', true); $table_editor->describe('label', 'intitulé', true); $table_editor->apply($page, $action, $id); } function handler_admin_fonctions(&$page, $action = 'list', $id = null) { - $page->assign('pl_title', 'Polytechnique.org - Administration - Fonctions'); + $page->setTitle('Polytechnique.org - Administration - Fonctions'); $page->assign('title', 'Gestion des fonctions'); $table_editor = new PLTableEditor('admin/fonctions', 'fonctions_def', 'id', true); $table_editor->describe('fonction_fr', 'intitulé', true); @@ -786,14 +797,14 @@ class ProfileModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_admin_secteurs(&$page, $action = 'list', $id = null) { - $page->assign('pl_title', 'Polytechnique.org - Administration - Secteurs'); + $page->setTitle('Polytechnique.org - Administration - Secteurs'); $page->assign('title', 'Gestion des secteurs'); $table_editor = new PLTableEditor('admin/secteurs', 'emploi_secteur', 'id', true); $table_editor->describe('label', 'intitulé', true); $table_editor->apply($page, $action, $id); } function handler_admin_medals(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Distinctions'); + $page->setTitle('Polytechnique.org - Administration - Distinctions'); $page->assign('title', 'Gestion des Distinctions'); $table_editor = new PLTableEditor('admin/medals','profile_medals','id'); $table_editor->describe('text', 'intitulé', true);