X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=c72a9c0ef4ee278646dd457773df1c01c4625413;hb=6dae45b393a59fd04713b9c651ff0970aeec84d7;hp=65f79cf30b4818e05fc6d80217580331c249658d;hpb=5fe7ec44fb7cf5fb9b88101707dd2aa3f34a0db3;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index 65f79cf..c72a9c0 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -1,6 +1,6 @@ $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/ajax/address' => $this->make_hook('ajax_address', AUTH_COOKIE, 'user', NO_AUTH), + 'profile/ajax/tel' => $this->make_hook('ajax_tel', AUTH_COOKIE, 'user', NO_AUTH), + 'profile/ajax/medal' => $this->make_hook('ajax_medal', AUTH_COOKIE, 'user', NO_AUTH), + 'profile/ajax/job' => $this->make_hook('ajax_job', AUTH_COOKIE, 'user', NO_AUTH), + 'profile/ajax/secteur' => $this->make_hook('ajax_secteur', AUTH_COOKIE, 'user', NO_AUTH), + 'profile/ajax/skill' => $this->make_hook('ajax_skill', AUTH_COOKIE, 'user', NO_AUTH), + 'javascript/applis.js' => $this->make_hook('applis_js', AUTH_COOKIE), + 'javascript/grades.js' => $this->make_hook('grades_js', AUTH_COOKIE), + 'profile/medal' => $this->make_hook('medal', AUTH_PUBLIC), '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), - 'trombi' => $this->make_hook('trombi', AUTH_COOKIE), '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'), ); @@ -56,30 +69,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)) { @@ -114,6 +103,24 @@ class ProfileModule extends PLModule exit; } + 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 = $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); + exit; + } + function handler_photo_change(&$page) { $page->changeTpl('profile/trombino.tpl'); @@ -124,42 +131,43 @@ class ProfileModule extends PLModule .'/'.S::v('forlife').'.jpg'; if (Env::has('upload')) { - if (isset($_FILES['userfile']['tmp_name']) - && !is_uploaded_file($_FILES['userfile']['tmp_name'])) { - $page->trig('Une erreur s\'est produite lors du transfert du fichier'); + $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'); } else { - $file = is_uploaded_file($_FILES['userfile']['tmp_name']) - ? $_FILES['userfile']['tmp_name'] - : Env::v('photo'); - if ($data = file_get_contents($file)) { - $myphoto = new PhotoReq(S::v('uid'), $data); + $myphoto = new PhotoReq(S::v('uid'), $upload); + if ($myphoto->isValid()) { $myphoto->submit(); - } else { - $page->trig('Fichier inexistant ou vide'); } } } elseif (Env::has('trombi')) { - $myphoto = new PhotoReq(S::v('uid'), - file_get_contents($trombi_x)); - if ($myphoto) { - $myphoto->commit(); - $myphoto->clean(); + $upload = new PlUpload(S::v('forlife'), 'photo'); + if ($upload->copyFrom($trombi_x)) { + $myphoto = new PhotoReq(S::v('uid'), $upload); + if ($myphoto->isValid()) { + $myphoto->commit(); + $myphoto->clean(); + } } } elseif (Env::v('suppr')) { - XDB::execute('DELETE FROM photo WHERE uid = {?}', - S::v('uid')); - XDB::execute('DELETE FROM requests - WHERE user_id = {?} AND type="photo"', - S::v('uid')); + 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(); } elseif (Env::v('cancel')) { - $sql = XDB::query('DELETE FROM requests - WHERE user_id={?} AND type="photo"', - S::v('uid')); + $sql = XDB::query('DELETE FROM requests + WHERE user_id={?} AND type="photo"', + S::v('uid')); + update_NbValid(); } - $sql = XDB::query('SELECT COUNT(*) FROM requests - WHERE user_id={?} AND type="photo"', - S::v('uid')); + $sql = XDB::query('SELECT COUNT(*) + FROM requests + WHERE user_id={?} AND type="photo"', + S::v('uid')); $page->assign('submited', $sql->fetchOneCell()); $page->assign('has_trombi_x', file_exists($trombi_x)); } @@ -173,7 +181,7 @@ class ProfileModule extends PLModule global $globals; require_once 'user.func.inc.php'; - $page->changeTpl('profile/fiche.tpl', SIMPLE); + $page->changeTpl('profile/profile.tpl', SIMPLE); $view = 'private'; if (!S::logged() || Env::v('view') == 'public') $view = 'public'; @@ -181,36 +189,36 @@ class ProfileModule extends PLModule if (is_numeric($x)) { $res = XDB::query( - "SELECT alias + "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); + $login = get_user_forlife($x, S::logged() ? '_default_user_callback' + : '_silent_user_callback'); } if (empty($login)) { - if (preg_match('/([-a-z]+)\.([-a-z]+)\.([0-9]{4})/i', $x, $matches)) { - $matches = str_replace('-', '_', $matches); - $res = XDB::query("SELECT user_id - FROM auth_user_md5 - WHERE prenom LIKE {?} AND nom LIKE {?} AND promo = {?} - AND perms = 'pending'", - $matches[1], $matches[2], $matches[3]); - if ($res->numRows() == 1) { - $uid = $res->fetchOneCell(); - pl_redirect('marketing/public/' . $uid); - } + $user = get_not_registered_user($x, true); + if ($user->total() != 1) { + return PL_NOT_FOUND; } - return PL_NOT_FOUND; + $user = $user->next(); + if (S::logged()) { + pl_redirect('marketing/public/' . $user['user_id']); + } + $user['forlife'] = $x; + } else { + $new = Env::v('modif') == 'new'; + $user = get_user_details($login, S::v('uid'), $view); + } + + if (S::logged()) { + $_SESSION['log']->log('view_profile', $login); } - $new = Env::v('modif') == 'new'; - $user = get_user_details($login, S::v('uid'), $view); - require_once('url_catcher.inc.php'); - $user['freetext'] = url_catcher($user['freetext'], false); - $title = $user['prenom'] . ' ' . empty($user['nom_usage']) ? $user['nom'] : $user['nom_usage']; + $title = $user['prenom'] . ' ' . ( empty($user['nom_usage']) ? $user['nom'] : $user['nom_usage'] ); $page->assign('xorg_title', $title); // photo @@ -254,134 +262,181 @@ class ProfileModule extends PLModule $user['forlife'].'@'.$globals->mail->domain, $user['forlife'].'@'.$globals->mail->domain2); $page->assign('virtualalias', $res->fetchOneCell()); + $page->assign('view', $view); $page->addJsLink('close_on_esc.js'); + header('Last-Modified: ' . date('r', strtotime($user['date']))); } - function handler_p_edit(&$page, $opened_tab = 'general') + function handler_ax(&$page, $user = null) { - global $globals; - - $page->changeTpl('profile/edit.tpl'); - - $page->addCssLink('profil.css'); - $page->assign('xorg_title', 'Polytechnique.org - Mon Profil'); - - require_once 'tabs.inc.php'; - require_once 'profil.func.inc.php'; - require_once 'synchro_ax.inc.php'; - - if (Post::v('register_from_ax_question')) { - XDB::execute('UPDATE auth_user_quick - SET profile_from_ax = 1 - WHERE user_id = {?}', - S::v('uid')); - } - if (Post::v('add_to_nl')) { - require_once 'newsletter.inc.php'; - subscribe_nl(); + require_once 'user.func.inc.php'; + $user = get_user_forlife($user); + if (!$user) { + return PL_NOT_FOUND; } - if (Post::v('add_to_promo')) { - $r = XDB::query('SELECT id FROM groupex.asso WHERE diminutif = {?}', - S::v('promo')); - $asso_id = $r->fetchOneCell(); - XDB::execute('REPLACE INTO groupex.membres (uid,asso_id) - VALUES ({?}, {?})', - S::v('uid'), $asso_id); - $mmlist = new MMList(S::v('uid'), S::v('password')); - $mmlist->subscribe("promo".S::v('promo')); + $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 = null, $mode = null) + { + global $globals; + // AX Synchronization + require_once 'synchro_ax.inc.php'; if (is_ax_key_missing()) { $page->assign('no_private_key', true); } - 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'); - } - - // pour tous les tabs, la date de naissance pour verifier - // quelle est bien rentree et la date. - $res = XDB::query( - "SELECT naissance, DATE_FORMAT(date, '%d.%m.%Y') - FROM auth_user_md5 - WHERE user_id={?}", S::v('uid')); - list($naissance, $date_modif_profil) = $res->fetchOneRow(); - - // lorsqu'on n'a pas la date de naissance en base de données - if (!$naissance) { - // la date de naissance n'existait pas et vient d'être soumise dans la variable - if (Env::has('birth')) { - //en cas d'erreur : - if (!ereg('[0-3][0-9][0-1][0-9][1][9]([0-9]{2})', Env::v('birth'))) { - $page->assign('etat_naissance', 'query'); - $page->trig('Date de naissance incorrecte ou incohérente.'); - return; - } - - //sinon - $birth = sprintf("%s-%s-%s", substr(Env::v('birth'), 4, 4), - substr(Env::v('birth'), 2, 2), - substr(Env::v('birth'), 0, 2)); - XDB::execute("UPDATE auth_user_md5 - SET naissance={?} - WHERE user_id={?}", $birth, - S::v('uid')); - $page->assign('etat_naissance', 'ok'); - return; - } - - $page->assign('etat_naissance', 'query'); - return; // on affiche le formulaire pour naissance - } + $page->trig('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'; + $wiz->addPage('ProfileGeneral', 'Général', 'general'); + $wiz->addPage('ProfileAddresses', 'Adresses personnelles', 'adresses'); + $wiz->addPage('ProfileGroups', 'Groupes X - Binets', 'poly'); + $wiz->addPage('ProfileDecos', 'Décorations - Medailles', 'deco'); + $wiz->addPage('ProfileJobs', 'Informations professionnelles', 'emploi'); + $wiz->addPage('ProfileSkills', 'Compétences diverses', 'skill'); + $wiz->addPage('ProfileMentor', 'Mentoring', 'mentor'); + $wiz->apply($page, 'profile/edit', $opened_tab, $mode); + + // Misc checks + $res = XDB::query("SELECT user_id + 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" + . " 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'); + } - //doit-on faire un update ? - if (Env::has('modifier') || Env::has('suivant')) { - require_once "profil/get_{$opened_tab}.inc.php"; - require_once "profil/verif_{$opened_tab}.inc.php"; + function handler_applis_js(&$page) + { + header('Content-Type: text/javascript; charset=utf-8'); + header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); + header('Last-Modified:' . gmdate('D, d M Y H:i:s') . ' GMT'); + header('Cache-Control: no-cache, must-revalidate'); + header('Pragma: no-cache'); + $page->changeTpl('profile/applis.js.tpl', NO_SKIN); + require_once "applis.func.inc.php"; + } - if($page->nb_errs()) { - require_once "profil/assign_{$opened_tab}.inc.php"; - $page->assign('onglet', $opened_tab); - $page->assign('onglet_tpl', "profile/$opened_tab.tpl"); - return; - } + function handler_grades_js(&$page) + { + header('Content-Type: text/javascript; charset=utf-8'); + header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); + header('Last-Modified:' . gmdate('D, d M Y H:i:s') . ' GMT'); + header('Cache-Control: no-cache, must-revalidate'); + header('Pragma: no-cache'); + $page->changeTpl('profile/grades.js.tpl', NO_SKIN); + $res = XDB::iterator("SELECT * + FROM profile_medals_grades + ORDER BY mid, pos"); + $grades = array(); + while ($tmp = $res->next()) { + $grades[$tmp['mid']][] = $tmp; + } + $page->assign('grades', $grades); + + $res = XDB::iterator("SELECT *, FIND_IN_SET('validation', flags) AS validate + FROM profile_medals + ORDER BY type, text"); + $mlist = array(); + while ($tmp = $res->next()) { + $mlist[$tmp['type']][] = $tmp; + } + $page->assign('medal_list', $mlist); + } - $date=date("Y-m-j");//nouvelle date de mise a jour + function handler_ajax_address(&$page, $adid) + { + header('Content-Type: text/html; charset=utf-8'); + $page->changeTpl('profile/adresses.address.tpl', NO_SKIN); + $page->assign('i', $adid); + $page->assign('adr', array()); + } - //On sauvegarde l'uid pour l'AX - /* on sauvegarde les changements dans user_changes : - * on a juste besoin d'insérer le user_id de la personne dans la table - */ - XDB::execute('REPLACE INTO user_changes SET user_id={?}', - S::v('uid')); + function handler_ajax_tel(&$page, $adid, $telid) + { + header('Content-Type: text/html; charset=utf-8'); + $page->changeTpl('profile/adresses.tel.tpl', NO_SKIN); + $page->assign('i', $adid); + $page->assign('adid', "addresses_$adid"); + $page->assign('adpref', "addresses[$adid]"); + $page->assign('t', $telid); + $page->assign('tel', array()); + } - if (!S::has('suid')) { - require_once 'notifs.inc.php'; - register_watch_op(S::v('uid'), WATCH_FICHE); - } + function handler_ajax_medal(&$page, $id) + { + header('Content-Type: text/html; charset=utf-8'); + $page->changeTpl('profile/deco.medal.tpl', NO_SKIN); + $page->assign('id', $id); + $page->assign('medal', array('valid' => 0, 'grade' => 0)); + } - // mise a jour des champs relatifs au tab ouvert - require_once "profil/update_{$opened_tab}.inc.php"; + function handler_ajax_job(&$page, $id) + { + header('Content-Type: text/html; charset=utf-8'); + $page->changeTpl('profile/jobs.job.tpl', NO_SKIN); + $page->assign('i', $id); + $page->assign('job', array()); + $page->assign('new', true); + $page->assign('secteurs', XDB::iterator("SELECT id, label + FROM emploi_secteur")); + $page->assign('fonctions', XDB::iterator("SELECT id, fonction_fr, FIND_IN_SET('titre', flags) AS title + FROM fonctions_def + ORDER BY id")); + } - $log =& $_SESSION['log']; - $log->log('profil', $opened_tab); - $page->assign('etat_update', 'ok'); - } + function handler_ajax_secteur(&$page, $id, $sect, $ssect = -1) + { + header('Content-Type: text/html; charset=utf-8'); + $res = XDB::iterator("SELECT id, label + FROM emploi_ss_secteur + WHERE secteur = {?}", $sect); + $page->changeTpl('profile/jobs.secteur.tpl', NO_SKIN); + $page->assign('id', $id); + $page->assign('ssecteurs', $res); + $page->assign('sel', $ssect); + } - if (Env::has('suivant')) { - pl_redirect('profile/edit/' . get_next_tab($opened_tab)); + function handler_ajax_skill(&$page, $cat, $id) + { + header('Content-Type: text/html; charset=utf-8'); + $page->changeTpl('profile/skill.skill.tpl', NO_SKIN); + $page->assign('cat', $cat); + $page->assign('id', $id); + if ($cat == 'competences') { + $page->assign('levels', array('initié' => 'initié', + 'bonne connaissance' => 'bonne connaissance', + 'expert' => 'expert')); + } else { + $page->assign('levels', array(1 => 'connaissance basique', + 2 => 'maîtrise des bases', + 3 => 'maîtrise limitée', + 4 => 'maîtrise générale', + 5 => 'bonne maîtrise', + 6 => 'maîtrise complète')); } - - require_once "profil/get_{$opened_tab}.inc.php"; - require_once "profil/verif_{$opened_tab}.inc.php"; - require_once "profil/assign_{$opened_tab}.inc.php"; - - $page->assign('onglet', $opened_tab); - $page->assign('onglet_tpl', "profile/$opened_tab.tpl"); - - return; } function handler_p_orange(&$page) @@ -407,19 +462,19 @@ class ProfileModule extends PLModule $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->trig('L\'année de sortie doit être un nombre de quatre chiffres'); } elseif ($promo_sortie < $promo + 3) { - $page->trig('Trop tôt'); + $page->trig('Trop tôt'); } elseif ($promo_sortie == $promo_sortie_old) { - $page->trig('Tu appartiens déjà à la promotion correspondante à cette année de sortie.'); + $page->trig('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={?} + "UPDATE auth_user_md5 set promo_sortie={?} WHERE user_id={?}", $promo_sortie, S::v('uid')); - $page->trig('Ton statut "orange" a été supprimé.'); + $page->trig('Ton statut "orange" a été supprimé.'); $page->assign('promo_sortie_old', $promo_sortie); } else { @@ -462,7 +517,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)); @@ -498,22 +553,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[''] = ''; @@ -522,92 +567,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) { + $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); - return; } + } + $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) @@ -629,7 +655,7 @@ class ProfileModule extends PLModule $page->assign('usage_old', $usage_old); $page->assign('alias_old', $alias_old); - $nom_usage = replace_accent(trim(Env::v('nom_usage'))); + $nom_usage = replace_accent(trim(Env::v('nom_usage'))); $nom_usage = strtoupper($nom_usage); $page->assign('usage_req', $nom_usage); @@ -637,7 +663,7 @@ class ProfileModule extends PLModule // on vient de recevoir une requete, differente de l'ancien nom d'usage if ($nom_usage == $nom) { $page->assign('same', true); - } else { // le nom de mariage est distinct du nom à l'X + } else { // le nom de mariage est distinct du nom à l'X // on calcule l'alias pour l'afficher $reason = Env::v('reason'); if ($reason == 'other') { @@ -650,44 +676,21 @@ class ProfileModule extends PLModule } } - function handler_trombi(&$page, $promo = null) - { - $page->changeTpl('profile/trombipromo.tpl'); - $page->assign('xorg_title', 'Polytechnique.org - Trombi Promo'); - - if (is_null($promo)) { - return; - } - - $this->promo = $promo = intval($promo); - - if ($promo >= 1900 && ($promo < intval(date('Y')) || ($promo == intval(date('Y')) && intval(date('m')) >= 9)) - || ($promo == -1 && S::has_perms())) - { - $trombi = new Trombi(array($this, '_trombi_getlist')); - $trombi->hidePromo(); - $trombi->setAdmin(); - $page->assign_by_ref('trombi', $trombi); - } else { - $page->trig('Promotion incorrecte (saisir au format YYYY). Recommence.'); - } - } - function handler_xnet(&$page) { $page->changeTpl('profile/groupesx.tpl'); $page->assign('xorg_title', 'Polytechnique.org - Promo, Groupes X, Binets'); - + $req = XDB::query(' - SELECT m.asso_id, a.nom, diminutif, a.logo IS NOT NULL AS has_logo, + SELECT m.asso_id, a.nom, diminutif, a.logo IS NOT NULL AS has_logo, COUNT(e.eid) AS events, mail_domain AS lists - FROM groupex.membres AS m + FROM groupex.membres AS m INNER JOIN groupex.asso AS a ON(m.asso_id = a.id) LEFT JOIN groupex.evenements AS e ON(e.asso_id = m.asso_id AND e.archive = 0) WHERE uid = {?} GROUP BY m.asso_id ORDER BY a.nom', S::i('uid')); $page->assign('assos', $req->fetchAllAssoc()); } - + function handler_vcard(&$page, $x = null) { if (is_null($x)) { @@ -700,7 +703,6 @@ class ProfileModule extends PLModule $x = substr($x, 0, strlen($x) - 4); } - require_once('vcard.inc.php'); $vcard = new VCard($x); $vcard->do_page($page); } @@ -709,22 +711,22 @@ class ProfileModule extends PLModule $page->changeTpl('profile/admin_trombino.tpl'); $page->assign('xorg_title','Polytechnique.org - Administration - Trombino'); $page->assign('uid', $uid); - + $q = XDB::query( "SELECT a.alias,promo FROM auth_user_md5 AS u INNER JOIN aliases AS a ON ( u.user_id = a.id AND type='a_vie' ) WHERE user_id = {?}", $uid); list($forlife, $promo) = $q->fetchOneRow(); - + switch ($action) { - + case "original": header("Content-type: image/jpeg"); readfile("/home/web/trombino/photos".$promo."/".$forlife.".jpg"); exit; break; - + case "new": $data = file_get_contents($_FILES['userfile']['tmp_name']); list($x, $y) = getimagesize($_FILES['userfile']['tmp_name']); @@ -734,12 +736,12 @@ class ProfileModule extends PLModule "REPLACE INTO photo SET uid={?}, attachmime = {?}, attach={?}, x={?}, y={?}", $uid, $mimetype, $data, $x, $y); break; - + case "delete": XDB::execute('DELETE FROM photo WHERE uid = {?}', $uid); break; } - + $page->assign('forlife', $forlife); } function handler_admin_binets(&$page, $action = 'list', $id = null) { @@ -747,54 +749,64 @@ class ProfileModule extends PLModule $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); - $table_editor->describe('text','intitulé',true); + $table_editor->describe('text','intitulé',true); $table_editor->apply($page, $action, $id); } function handler_admin_formations(&$page, $action = 'list', $id = null) { $page->assign('xorg_title','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); - $table_editor->describe('text','intitulé',true); + $table_editor->add_join_table('applis_ins','aid',true); + $table_editor->describe('text','intitulé',true); $table_editor->describe('url','site web',false); $table_editor->apply($page, $action, $id); - } - function handler_admin_groupesx(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Groupes X'); - $page->assign('title', 'Gestion des Groupes X'); - $table_editor = new PLTableEditor('admin/groupes-x','groupesx_def','id'); - $table_editor->add_join_table('groupesx_ins','gid',true); - $table_editor->describe('text','intitulé',true); - $table_editor->describe('url','site web',false); + } + 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'); $table_editor = new PLTableEditor('admin/medals','profile_medals','id'); - $table_editor->describe('text', 'intitulé', true); + $table_editor->describe('text', 'intitulé', true); $table_editor->describe('img', 'nom de l\'image', false); $table_editor->describe('flags', 'valider', true); $table_editor->apply($page, $action, $id); if ($id && $action == 'edit') { $page->changeTpl('profile/admin_decos.tpl'); - + $mid = $id; - + if (Post::v('act') == 'del') { - XDB::execute('DELETE FROM profile_medals_grades WHERE mid={?} AND gid={?}', $mid, Post::i('gid')); + 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({?},{?})', + 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={?}', $_POST['pos'][$gid], $text, $gid); + 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); $page->assign('grades', $res); } - } + } } +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>