X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=013199d1bb9cb4707a40a3edf50c19a5a6dee844;hb=35aedff220db98c5ef8267502d7288c5cdc17f4a;hp=c47b3e6a1f473ea4b1356ce5041b438e4f0661a5;hpb=90ccb0625d5bdeafaf852ab5c9fb25ef230778b2;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index c47b3e6..013199d 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -30,20 +30,26 @@ class ProfileModule extends PLModule 'fiche.php' => $this->make_hook('fiche', AUTH_PUBLIC), 'profile' => $this->make_hook('profile', AUTH_PUBLIC), 'profile/private' => $this->make_hook('profile', AUTH_COOKIE), + 'profile/ax' => $this->make_hook('ax', AUTH_COOKIE, 'admin'), 'profile/edit' => $this->make_hook('p_edit', AUTH_MDP), 'profile/orange' => $this->make_hook('p_orange', AUTH_MDP), 'profile/usage' => $this->make_hook('p_usage', AUTH_MDP), 'referent' => $this->make_hook('referent', AUTH_COOKIE), + 'emploi' => $this->make_hook('ref_search', AUTH_COOKIE), 'referent/search' => $this->make_hook('ref_search', AUTH_COOKIE), + 'referent/ssect' => $this->make_hook('ref_sect', AUTH_COOKIE, 'user', NO_AUTH), + 'referent/country' => $this->make_hook('ref_country', AUTH_COOKIE, 'user', NO_AUTH), 'groupes-x' => $this->make_hook('xnet', AUTH_COOKIE), - 'vcard' => $this->make_hook('vcard', AUTH_COOKIE), + 'vcard' => $this->make_hook('vcard', AUTH_COOKIE, 'user', NO_HTTPS), 'admin/binets' => $this->make_hook('admin_binets', AUTH_MDP, 'admin'), 'admin/medals' => $this->make_hook('admin_medals', AUTH_MDP, 'admin'), 'admin/formations' => $this->make_hook('admin_formations', AUTH_MDP, 'admin'), 'admin/groupes-x' => $this->make_hook('admin_groupesx', AUTH_MDP, 'admin'), + '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'), ); @@ -55,30 +61,6 @@ class ProfileModule extends PLModule return $this->handler_profile($page, Env::v('user')); } - - function _trombi_getlist($offset, $limit) - { - $where = ( $this->promo > 0 ? "WHERE promo='{$this->promo}'" : "" ); - - $res = XDB::query( - "SELECT COUNT(*) - FROM auth_user_md5 AS u - RIGHT JOIN photo AS p ON u.user_id=p.uid - $where"); - $pnb = $res->fetchOneCell(); - - $res = XDB::query( - "SELECT promo, user_id, a.alias AS forlife, - IF (nom_usage='', nom, nom_usage) AS nom, prenom - FROM photo AS p - INNER JOIN auth_user_md5 AS u ON u.user_id=p.uid - INNER JOIN aliases AS a ON ( u.user_id=a.id AND a.type='a_vie' ) - $where - ORDER BY promo, nom, prenom LIMIT {?}, {?}", $offset*$limit, $limit); - - return array($pnb, $res->fetchAllAssoc()); - } - function handler_photo(&$page, $x = null, $req = null) { if (is_null($x)) { @@ -205,8 +187,8 @@ class ProfileModule extends PLModule $new = Env::v('modif') == 'new'; $user = get_user_details($login, S::v('uid'), $view); $user['freetext'] = MiniWiki::WikiToHTML($user['freetext']); - $user['cv'] = MiniWiki::WikiToHTML($user['cv']); - $title = $user['prenom'] . ' ' . empty($user['nom_usage']) ? $user['nom'] : $user['nom_usage']; + $user['cv'] = MiniWiki::WikiToHTML($user['cv'], true); + $title = $user['prenom'] . ' ' . ( empty($user['nom_usage']) ? $user['nom'] : $user['nom_usage'] ); $page->assign('xorg_title', $title); // photo @@ -255,6 +237,24 @@ class ProfileModule extends PLModule header('Last-Modified: ' . date('r', strtotime($user['date']))); } + function handler_ax(&$page, $user = null) + { + require_once 'user.func.inc.php'; + $user = get_user_forlife($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); + $mat = $res->fetchOneCell(); + if (!intval($mat)) { + $page->kill("Le matricule AX de $user est inconnu"); + } + http_redirect("http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&anc_id=$mat"); + } + function handler_p_edit(&$page, $opened_tab = 'general') { global $globals; @@ -475,7 +475,7 @@ class ProfileModule extends PLModule $page->assign('prenom', $prenom); $page->assign('nom', $nom); $page->assign('promo', $promo); - $page->assign('cv', $cv); + $page->assign('cv', MiniWiki::WikiToHTML($cv, true)); $page->assign('bestalias', $bestalias); $page->assign('adr_pro', get_user_details_pro($user_id)); @@ -511,22 +511,12 @@ class ProfileModule extends PLModule $page->addJsLink('close_on_esc.js'); } - function handler_ref_search(&$page) + function handler_ref_search(&$page, $action = null, $subaction = null) { - $page->changeTpl('profile/referent.tpl'); - + require_once 'wiki.inc.php'; + wiki_require_page('Docs.Emploi'); $page->assign('xorg_title', 'Polytechnique.org - Conseil Pro'); - $secteur_sel = Post::v('secteur'); - $ss_secteur_sel = Post::v('ss_secteur'); - $pays_sel = Post::v('pays', '00'); - $expertise_champ = Post::v('expertise'); - - $page->assign('pays_sel', $pays_sel); - $page->assign('expertise_champ', $expertise_champ); - $page->assign('secteur_sel', $secteur_sel); - $page->assign('ss_secteur_sel', $ss_secteur_sel); - //recuperation des noms de secteurs $res = XDB::iterRow("SELECT id, label FROM emploi_secteur"); $secteurs[''] = ''; @@ -535,92 +525,73 @@ class ProfileModule extends PLModule } $page->assign_by_ref('secteurs', $secteurs); - //on recupere les sous-secteurs si necessaire - $ss_secteurs[''] = ''; - if (!empty($secteur_sel)) { - $res = XDB::iterRow("SELECT id, label FROM emploi_ss_secteur - WHERE secteur = {?}", $secteur_sel); - while (list($tmp_id, $tmp_label) = $res->next()) { - $ss_secteurs[$tmp_id] = $tmp_label; - } - } - $page->assign_by_ref('ss_secteurs', $ss_secteurs); - - //recuperation des noms de pays - $res = XDB::iterRow("SELECT a2, pays FROM geoloc_pays - WHERE pays <> '' ORDER BY pays"); - $pays['00'] = ''; - while (list($tmp_id, $tmp_label) = $res->next()) { - $pays[$tmp_id] = $tmp_label; - } - $page->assign_by_ref('pays', $pays); - // nb de mentors $res = XDB::query("SELECT count(*) FROM mentor"); $page->assign('mentors_number', $res->fetchOneCell()); - if (!Env::has('Chercher')) { - return; - } - // On vient d'un formulaire - $where = array(); - - if ($pays_sel != '00') { - $where[] = "mp.pid = '".addslashes($pays_sel)."'"; - } - if ($secteur_sel) { - $where[] = "ms.secteur = '".addslashes($secteur_sel)."'"; - if ($ss_secteur_sel) { - $where[] = "ms.ss_secteur = '".addslashes($ss_secteur_sel)."'"; + $where = array(); + $pays_sel = XDB::escape(Env::v('pays_sel')); + $secteur_sel = XDB::escape(Env::v('secteur')); + $ss_secteur_sel = XDB::escape(Env::v('ss_secteur')); + $expertise_champ = XDB::escape(Env::v('expertise')); + + if ($pays_sel != "''") { + $where[] = "mp.pid = $pays_sel"; + } + if ($secteur_sel != "''") { + $where[] = "ms.secteur = $secteur_sel"; + if ($ss_secteur_sel != "''") { + $where[] = "ms.ss_secteur = $ss_secteur_sel"; } } - if ($expertise_champ) { - $where[] = "MATCH(m.expertise) AGAINST('".addslashes($expertise_champ)."')"; + if ($expertise_champ != "''") { + $where[] = "MATCH(m.expertise) AGAINST($expertise_champ)"; } if ($where) { $where = join(' AND ', $where); - $sql = "SELECT m.uid, a.prenom, a.nom, a.promo, - l.alias AS bestalias, m.expertise, mp.pid, - ms.secteur, ms.ss_secteur - FROM mentor AS m - LEFT JOIN auth_user_md5 AS a ON(m.uid = a.user_id) - INNER JOIN aliases AS l ON (a.user_id=l.id AND - FIND_IN_SET('bestalias', l.flags)) - LEFT JOIN mentor_pays AS mp ON(m.uid = mp.uid) - LEFT JOIN mentor_secteurs AS ms ON(m.uid = ms.uid) - WHERE $where - GROUP BY uid - ORDER BY RAND({?})"; - $res = XDB::iterator($sql, S::v('uid')); - - if ($res->total() == 0) { - $page->assign('recherche_trop_large', true); - return; + $set = new UserSet("INNER JOIN mentor AS m ON (m.uid = u.user_id) + LEFT JOIN mentor_pays AS mp ON (mp.uid = m.uid) + LEFT JOIN mentor_secteurs AS ms ON (ms.uid = m.uid)", + $where); + $set->addMod('mentor', 'Référents'); + $set->apply('referent/search', $page, $action, $subaction); + if ($set->count() > 100) { + $page->assign('recherche_trop_large', true); } + } + $page->changeTpl('profile/referent.tpl'); + } - $nb_max_res_total = 100; - $nb_max_res_ppage = 10; - - $curpage = Env::i('curpage', 1); - $personnes = array(); - $i = 0; - - while (($pers = $res->next()) && count($personnes) < $nb_max_res_total) { - $the_page = intval($i / $nb_max_res_ppage) + 1; - if ($the_page == $curpage) { - $personnes[] = $pers; - } - $i ++; - } + function handler_ref_sect(&$page, $sect) + { + header('Content-Type: text/html; charset=utf-8'); + $page->changeTpl('include/field.select.tpl', NO_SKIN); + $page->assign('onchange', 'setSSecteurs()'); + $page->assign('id', 'ssect_field'); + $page->assign('name', 'ss_secteur'); + $it = XDB::iterator("SELECT id,label AS field + FROM emploi_ss_secteur + WHERE secteur = {?}", $sect); + $page->assign('list', $it); + } - $page->assign('personnes', $personnes); - $page->assign('curpage', $curpage); - $page->assign('nb_pages_total', - intval($res->total() / $nb_max_res_ppage) + 1); - } + function handler_ref_country(&$page, $sect, $ssect = '') + { + header('Content-Type: text/html; charset=utf-8'); + $page->changeTpl('include/field.select.tpl', NO_SKIN); + $page->assign('name', 'pays_sel'); + $where = ($ssect ? ' AND ms.ss_secteur = {?}' : ''); + $it = XDB::iterator("SELECT a2 AS id, pays AS field + FROM geoloc_pays AS g + INNER JOIN mentor_pays AS mp ON (mp.pid = g.a2) + INNER JOIN mentor_secteurs AS ms ON (ms.uid = mp.uid) + WHERE ms.secteur = {?} $where + GROUP BY a2 + ORDER BY pays", $sect, $ssect); + $page->assign('list', $it); } function handler_p_usage(&$page) @@ -757,6 +728,20 @@ class ProfileModule extends PLModule $table_editor->describe('url','site web',false); $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'); + $table_editor = new PLTableEditor('admin/sections','sections','id'); + $table_editor->describe('text','intitulé',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); + $table_editor->apply($page, $action, $id); + } function handler_admin_medals(&$page, $action = 'list', $id = null) { $page->assign('xorg_title','Polytechnique.org - Administration - Distinctions'); $page->assign('title', 'Gestion des Distinctions');