X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=5b7839beff267410c7a3d43d988fb64a8049b6c4;hb=f3df6d384c72871c814d607cd9122eba03666543;hp=bde1cf20b0f758f72e0e219699779d6d88244dc3;hpb=24f4c06a1bfdc57d45e4dae8ce5085a9f62b76e1;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index bde1cf2..5b7839b 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -59,6 +59,8 @@ class ProfileModule extends PLModule 'admin/sections' => $this->make_hook('admin_sections', AUTH_MDP, 'admin'), 'admin/secteurs' => $this->make_hook('admin_secteurs', AUTH_MDP, 'admin'), 'admin/trombino' => $this->make_hook('admin_trombino', AUTH_MDP, 'admin'), + 'admin/ss_secteurs' => $this->make_hook('admin_ss_secteurs', AUTH_MDP, 'admin'), + 'admin/fonctions' => $this->make_hook('admin_fonctions', AUTH_MDP, 'admin'), ); } @@ -105,11 +107,16 @@ class ProfileModule extends PLModule function handler_medal(&$page, $mid) { + $thumb = ($mid == 'thumb'); + $mid = $thumb ? @func_get_arg(2) : $mid; + $res = XDB::query("SELECT img FROM profile_medals WHERE id = {?}", $mid); - $img = dirname(__FILE__).'/../htdocs/images/medals/' . $res->fetchOneCell(); + $img = $thumb ? + dirname(__FILE__).'/../htdocs/images/medals/thumb/' . $res->fetchOneCell() : + dirname(__FILE__).'/../htdocs/images/medals/' . $res->fetchOneCell(); $type = mime_content_type($img); header("Content-Type: $type"); echo file_get_contents($img); @@ -118,6 +125,7 @@ class ProfileModule extends PLModule function handler_photo_change(&$page) { + global $globals; $page->changeTpl('profile/trombino.tpl'); require_once('validations.inc.php'); @@ -126,9 +134,11 @@ 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->trig('Une erreur est survenue lors du téléchargement du fichier'); + $page->trigError('Une erreur est survenue lors du téléchargement du fichier'); } else { $myphoto = new PhotoReq(S::v('uid'), $upload); if ($myphoto->isValid()) { @@ -136,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); @@ -145,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(*) @@ -182,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; @@ -206,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()) { - $_SESSION['log']->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('xorg_title', $title); + $page->setTitle($title); // photo @@ -253,7 +265,7 @@ class ProfileModule extends PLModule INNER JOIN auth_user_quick ON ( user_id = {?} AND emails_alias_pub = 'public' ) WHERE ( redirect={?} OR redirect={?} ) AND alias LIKE '%@{$globals->mail->alias_dom}'", - S::v('uid'), + $user['user_id'], $user['forlife'].'@'.$globals->mail->domain, $user['forlife'].'@'.$globals->mail->domain2); $page->assign('virtualalias', $res->fetchOneCell()); @@ -265,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"); } @@ -292,16 +303,17 @@ class ProfileModule extends PLModule } if (Env::v('synchro_ax') == 'confirm' && !is_ax_key_missing()) { ax_synchronize(S::v('bestalias'), S::v('uid')); - $page->trig('Ton profil a été synchronisé avec celui du site polytechniciens.com'); + $page->trigSuccess('Ton profil a été synchronisé avec celui du site polytechniciens.com'); } // Build the page $page->addJsLink('ajax.js'); - $page->addJsLink('profile.js'); $page->addJsLink('applis.js'); $page->addJsLink('grades.js'); - $wiz = new PlWizard('Profil', 'core/plwizard.tpl', true, true); - require_once dirname(__FILE__) . '/profile/page.inc.php'; + $page->addJsLink('profile.js'); + $page->addJsLink('jquery.autocomplete.js'); + $wiz = new PlWizard('Profil', PlPage::getCoreTpl('plwizard.tpl'), true, true); + $this->load('page.inc.php'); $wiz->addPage('ProfileGeneral', 'Général', 'general'); $wiz->addPage('ProfileAddresses', 'Adresses personnelles', 'adresses'); $wiz->addPage('ProfileGroups', 'Groupes X - Binets', 'poly'); @@ -316,11 +328,11 @@ class ProfileModule extends PLModule FROM auth_user_md5 WHERE user_id = {?} AND naissance = '0000-00-00'", S::i('uid')); if ($res->numRows()) { - $page->trig("Ta date de naissance n'est pas renseignée, ce qui t'empêcheras de réaliser" + $page->trigWarning("Ta date de naissance n'est pas renseignée, ce qui t'empêcheras de réaliser" . " la procédure de récupération de mot de passe si un jour tu le perdais"); } - $page->assign('xorg_title', 'Polytechnique.org - Mon Profil'); + $page->setTitle('Mon Profil'); } function handler_applis_js(&$page) @@ -439,7 +451,6 @@ class ProfileModule extends PLModule $page->changeTpl('profile/orange.tpl'); require_once 'validations.inc.php'; - require_once 'xorg.misc.inc.php'; $res = XDB::query( "SELECT u.promo, u.promo_sortie @@ -452,24 +463,26 @@ class ProfileModule extends PLModule if (!Env::has('promo_sortie')) { return; + } else { + S::assert_xsrf_token(); } $promo_sortie = Env::i('promo_sortie'); if ($promo_sortie < 1000 || $promo_sortie > 9999) { - $page->trig('L\'année de sortie doit être un nombre de quatre chiffres'); + $page->trigError('L\'année de sortie doit être un nombre de quatre chiffres'); } elseif ($promo_sortie < $promo + 3) { - $page->trig('Trop tôt'); + $page->trigError('Trop tôt'); } elseif ($promo_sortie == $promo_sortie_old) { - $page->trig('Tu appartiens déjà à la promotion correspondante à cette année de sortie.'); + $page->trigWarning('Tu appartiens déjà à la promotion correspondante à cette année de sortie.'); } elseif ($promo_sortie == $promo + 3) { XDB::execute( "UPDATE auth_user_md5 set promo_sortie={?} WHERE user_id={?}", $promo_sortie, S::v('uid')); - $page->trig('Ton statut "orange" a été supprimé.'); + $page->trigSuccess('Ton statut "orange" a été supprimé.'); $page->assign('promo_sortie_old', $promo_sortie); } else { @@ -550,9 +563,10 @@ class ProfileModule extends PLModule function handler_ref_search(&$page, $action = null, $subaction = null) { - require_once 'wiki.inc.php'; - wiki_require_page('Docs.Emploi'); - $page->assign('xorg_title', 'Polytechnique.org - Conseil Pro'); + $wp = new PlWikiPage('Docs.Emploi'); + $wp->buildCache(); + + $page->setTitle('Conseil Pro'); //recuperation des noms de secteurs $res = XDB::iterRow("SELECT id, label FROM emploi_secteur"); @@ -636,7 +650,6 @@ class ProfileModule extends PLModule $page->changeTpl('profile/nomusage.tpl'); require_once 'validations.inc.php'; - require_once 'xorg.misc.inc.php'; $res = XDB::query( "SELECT u.nom, u.nom_usage, u.flags, e.alias @@ -646,7 +659,7 @@ class ProfileModule extends PLModule WHERE user_id={?}", S::v('uid')); list($nom, $usage_old, $flags, $alias_old) = $res->fetchOneRow(); - $flags = new flagset($flags); + $flags = new PlFlagSet($flags); $page->assign('usage_old', $usage_old); $page->assign('alias_old', $alias_old); @@ -655,6 +668,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); @@ -674,7 +689,7 @@ class ProfileModule extends PLModule function handler_xnet(&$page) { $page->changeTpl('profile/groupesx.tpl'); - $page->assign('xorg_title', 'Polytechnique.org - Promo, Groupes X, Binets'); + $page->setTitle('Promo, Groupes X, Binets'); $req = XDB::query(' SELECT m.asso_id, a.nom, diminutif, a.logo IS NOT NULL AS has_logo, @@ -704,7 +719,7 @@ class ProfileModule extends PLModule function handler_admin_trombino(&$page, $uid = null, $action = null) { $page->changeTpl('profile/admin_trombino.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - Trombino'); + $page->setTitle('Administration - Trombino'); $page->assign('uid', $uid); $q = XDB::query( @@ -715,7 +730,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"); @@ -723,6 +737,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); @@ -733,6 +749,8 @@ class ProfileModule extends PLModule break; case "delete": + S::assert_xsrf_token(); + XDB::execute('DELETE FROM photo WHERE uid = {?}', $uid); break; } @@ -740,7 +758,7 @@ class ProfileModule extends PLModule $page->assign('forlife', $forlife); } function handler_admin_binets(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Binets'); + $page->setTitle('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); @@ -748,7 +766,7 @@ class ProfileModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_admin_formations(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Formations'); + $page->setTitle('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); @@ -757,21 +775,37 @@ class ProfileModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_admin_sections(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Sections'); - $page->assign('title', 'Gestion des Sections'); + $page->setTitle('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->setTitle('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->setTitle('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); + $table_editor->describe('fonction_en', 'intitulé (ang)', true); + $table_editor->describe('flags', 'titre', true); + $table_editor->apply($page, $action, $id); + } function handler_admin_secteurs(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Secteurs'); - $page->assign('title', 'Gestion des Secteurs'); - $table_editor = new PLTableEditor('admin/secteurs','emploi_secteur','id'); - $table_editor->describe('label','intitulé',true); + $page->setTitle('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('xorg_title','Polytechnique.org - Administration - Distinctions'); + $page->setTitle('Administration - Distinctions'); $page->assign('title', 'Gestion des Distinctions'); $table_editor = new PLTableEditor('admin/medals','profile_medals','id'); $table_editor->describe('text', 'intitulé', true); @@ -786,15 +820,24 @@ class ProfileModule extends PLModule if (Post::v('act') == 'del') { XDB::execute('DELETE FROM profile_medals_grades WHERE mid={?} AND gid={?}', $mid, Post::i('gid')); - } elseif (Post::v('act') == 'new') { - XDB::execute('INSERT INTO profile_medals_grades (mid,gid) - VALUES ({?},{?})', - $mid, max(array_keys(Post::v('grades', array(0))))+1); } else { foreach (Post::v('grades', array()) as $gid=>$text) { - XDB::execute('UPDATE profile_medals_grades - SET pos={?}, text={?} - WHERE gid={?} AND mid={?}', $_POST['pos'][$gid], $text, $gid, $mid); + if ($gid === 0) { + if (!empty($text)) { + $res = XDB::query('SELECT MAX(gid) + FROM profile_medals_grades + WHERE mid = {?}', $mid); + $gid = $res->fetchOneCell() + 1; + + XDB::execute('INSERT INTO profile_medals_grades (mid, gid, text, pos) + VALUES ({?}, {?}, {?}, {?})', + $mid, $gid, $text, $_POST['pos']['0']); + } + } else { + XDB::execute('UPDATE profile_medals_grades + SET pos={?}, text={?} + WHERE gid={?} AND mid={?}', $_POST['pos'][$gid], $text, $gid, $mid); + } } } $res = XDB::iterator('SELECT gid, text, pos FROM profile_medals_grades WHERE mid={?} ORDER BY pos', $mid);