X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=97c5ddfa0119af87bff6d144dddf162a7a608c86;hb=5b2c99878fc75a6acffb2239e284f2cb1782142c;hp=e8ba7bf62b626064cdd161e56c12fbee40af87e0;hpb=f497128a7c26c25a64e05453ea479520149e2cb7;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index e8ba7bf..97c5ddf 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -1,6 +1,6 @@ $this->make_hook('networking', AUTH_PUBLIC), '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/ssecteur' => $this->make_hook('ajax_ssecteur', AUTH_COOKIE, 'user', NO_AUTH), 'profile/ajax/skill' => $this->make_hook('ajax_skill', AUTH_COOKIE, 'user', NO_AUTH), 'profile/ajax/searchname' => $this->make_hook('ajax_searchname', AUTH_COOKIE, 'user', NO_AUTH), + 'profile/ajax/buildnames' => $this->make_hook('ajax_buildnames', AUTH_COOKIE, 'user', NO_AUTH), 'javascript/education.js' => $this->make_hook('education_js', AUTH_COOKIE), 'javascript/grades.js' => $this->make_hook('grades_js', AUTH_COOKIE), 'profile/medal' => $this->make_hook('medal', AUTH_PUBLIC), + 'profile/name_info' => $this->make_hook('name_info', 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), @@ -68,6 +70,9 @@ class ProfileModule extends PLModule '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'), + 'admin/corps_enum' => $this->make_hook('admin_corps_enum', AUTH_MDP, 'admin'), + 'admin/corps_rank' => $this->make_hook('admin_corps_rank', AUTH_MDP, 'admin'), + 'admin/names' => $this->make_hook('admin_names', AUTH_MDP, 'admin'), ); } @@ -80,35 +85,40 @@ class ProfileModule extends PLModule function handler_photo(&$page, $x = null, $req = null) { - if (is_null($x)) { + if (!$x || !($user = User::getSilent($x))) { return PL_NOT_FOUND; } - $res = XDB::query("SELECT id, pub FROM aliases - LEFT JOIN photo ON(id = uid) - WHERE alias = {?}", $x); - list($uid, $photo_pub) = $res->fetchOneRow(); + // Retrieve the photo and its mime type. + $photo_data = null; + $photo_type = null; if ($req && S::logged()) { include 'validations.inc.php'; - $myphoto = PhotoReq::get_request($uid); - Header('Content-type: image/'.$myphoto->mimetype); - echo $myphoto->data; + $myphoto = PhotoReq::get_request($user->id()); + if ($myphoto) { + $photo_data = $myphoto->data; + $photo_type = $myphoto->mimetype; + } } else { $res = XDB::query( - "SELECT attachmime, attach + "SELECT attachmime, attach, pub FROM photo - WHERE uid={?}", $uid); - - if ((list($type, $data) = $res->fetchOneRow()) - && ($photo_pub == 'public' || S::logged())) { - Header("Content-type: image/$type"); - echo $data; - } else { - Header('Content-type: image/png'); - echo file_get_contents(dirname(__FILE__).'/../htdocs/images/none.png'); + WHERE uid = {?}", $user->id()); + list($photo_type, $photo_data, $photo_pub) = $res->fetchOneRow(); + if ($photo_pub != 'public' && !S::logged()) { + $photo_type = $photo_data = null; } } + + // Display the photo, or a default one when not available. + if ($photo_type && $photo_data != null) { + header('Content-type: image/' . $photo_type); + echo $photo_data; + } else { + header('Content-type: image/png'); + echo file_get_contents(dirname(__FILE__).'/../htdocs/images/none.png'); + } exit; } @@ -130,6 +140,19 @@ class ProfileModule extends PLModule exit; } + function handler_name_info(&$page) + { + header('Content-Type: text/html; charset=utf-8'); + $page->changeTpl('profile/name_info.tpl', SIMPLE); + $res = XDB::iterator("SELECT name, explanations, + FIND_IN_SET('public', flags) AS public, + FIND_IN_SET('has_particle', flags) AS has_particle + FROM profile_name_enum + WHERE NOT FIND_IN_SET('not_displayed', flags) + ORDER BY NOT FIND_IN_SET('public', flags)"); + $page->assign('types', $res); + } + function handler_networking(&$page, $mid) { $res = XDB::query("SELECT icon @@ -150,17 +173,15 @@ class ProfileModule extends PLModule require_once('validations.inc.php'); - $trombi_x = '/home/web/trombino/photos'.S::v('promo') - .'/'.S::v('forlife').'.jpg'; - + $trombi_x = '/home/web/trombino/photos' . S::v('promo') . '/' . S::user()->login() . '.jpg'; if (Env::has('upload')) { S::assert_xsrf_token(); - $upload = new PlUpload(S::v('forlife'), 'photo'); + $upload = new PlUpload(S::user()->login(), 'photo'); if (!$upload->upload($_FILES['userfile']) && !$upload->download(Env::v('photo'))) { $page->trigError('Une erreur est survenue lors du téléchargement du fichier'); } else { - $myphoto = new PhotoReq(S::v('uid'), $upload); + $myphoto = new PhotoReq(S::user(), $upload); if ($myphoto->isValid()) { $myphoto->submit(); } @@ -168,9 +189,9 @@ class ProfileModule extends PLModule } elseif (Env::has('trombi')) { S::assert_xsrf_token(); - $upload = new PlUpload(S::v('forlife'), 'photo'); + $upload = new PlUpload(S::user()->login(), 'photo'); if ($upload->copyFrom($trombi_x)) { - $myphoto = new PhotoReq(S::v('uid'), $upload); + $myphoto = new PhotoReq(S::user(), $upload); if ($myphoto->isValid()) { $myphoto->commit(); $myphoto->clean(); @@ -205,56 +226,69 @@ class ProfileModule extends PLModule function handler_profile(&$page, $x = null) { + // TODO/note for upcoming developers: + // We currently maintain both $user and $login; $user is the old way of + // obtaining information, and eventually everything will be loaded + // through $login. That is the reason why in the template $user is named + // $x, and $login $user (sorry for the confusion). + + // Determines which user to display the profile of, and retrieves basic + // information on this user. if (is_null($x)) { return PL_NOT_FOUND; } - global $globals; - require_once 'user.func.inc.php'; + $login = (!is_numeric($x) || S::has_perms()) ? Profile::get($x) : null; + if (!$login) { + if (S::logged()) { + $page->trigError($x . ' inconnu dans l\'annuaire'); + } + return PL_NOT_FOUND; + } + // Now that we know this is the profile of an existing user, we can + // switch to the appropriate template. $page->changeTpl('profile/profile.tpl', SIMPLE); + require_once 'user.func.inc.php'; - $view = 'private'; - 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(); + // Determines the access level at which the profile will be displayed. + if (!S::logged() || Env::v('view') == 'public') { + $view = 'public'; + } else if (S::logged() && Env::v('view') == 'ax') { + $view = 'ax'; } else { - $login = get_user_forlife($x, S::logged() ? '_default_user_callback' - : '_silent_user_callback'); + $view = 'private'; } - if (empty($login)) { - $user = get_not_registered_user($x, true); - if ($user->total() != 1) { - return PL_NOT_FOUND; - } - $user = $user->next(); + // Determines is the user is registered, and fetches the user infos in + // the appropriate way. + $owner = $login->owner(); + if (!$owner || $owner->state != 'pending') { + $new = Env::v('modif') == 'new'; + // XXX: Deprecated... + $user = get_user_details($login->hrid(), S::i('uid'), $view); + } else { + $new = false; + $user = array(); if (S::logged()) { - pl_redirect('marketing/public/' . $user['user_id']); + pl_redirect('marketing/public/' . $owner->login()); } - $user['forlife'] = $x; - } else { - $new = Env::v('modif') == 'new'; - $user = get_user_details($login, S::v('uid'), $view); } + // Profile view are logged. if (S::logged()) { - S::logger()->log('view_profile', $login); + S::logger()->log('view_profile', $login->hrid()); } - $title = $user['prenom'] . ' ' . ( empty($user['nom_usage']) ? $user['nom'] : $user['nom_usage'] ); - $page->setTitle($title); - - // photo + // Sets the title of the html page. + $page->setTitle($login->fullName()); - $photo = 'photo/'.$user['forlife'].($new ? '/req' : ''); + // Prepares the display of the user's mugshot. + $photo = 'photo/' . $login->hrid() . ($new ? '/req' : ''); + if (!isset($user['photo_pub']) || !has_user_right($user['photo_pub'], $view)) { + $photo = ""; + } + $page->assign('photo_url', $photo); if (!isset($user['y']) and !isset($user['x'])) { list($user['x'], $user['y']) = getimagesize("images/none.png"); @@ -274,61 +308,56 @@ class ProfileModule extends PLModule $user['x'] = 160; } - $page->assign('logged', has_user_right('private', $view)); - if (!has_user_right($user['photo_pub'], $view)) { - $photo = ""; + // Determines and displays the virtual alias. + global $globals; + $owner = $login->owner(); + if ($owner) { + $page->assign('virtualalias', $owner->emailAlias()); } + // Adds miscellaneous properties to the display. + // Adds the global user property array to the display. $page->assign_by_ref('x', $user); - $page->assign('photo_url', $photo); - // alias virtual - $res = XDB::query( - "SELECT alias - FROM virtual - INNER JOIN virtual_redirect USING(vid) - INNER JOIN auth_user_quick ON ( user_id = {?} AND emails_alias_pub = 'public' ) - WHERE ( redirect={?} OR redirect={?} ) - AND alias LIKE '%@{$globals->mail->alias_dom}'", - $user['user_id'], - $user['forlife'].'@'.$globals->mail->domain, - $user['forlife'].'@'.$globals->mail->domain2); - $page->assign('virtualalias', $res->fetchOneCell()); + $page->assign_by_ref('user', $owner); + $page->assign('logged', has_user_right('private', $view)); $page->assign('view', $view); $page->addJsLink('close_on_esc.js'); - header('Last-Modified: ' . date('r', strtotime($user['date']))); + if (isset($user['date'])) { + 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); + $user = Profile::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); - $mat = $res->fetchOneCell(); - if (!intval($mat)) { - $page->kill("Le matricule AX de $user est inconnu"); + if (!$user->ax_id) { + $page->kill("Le matricule AX de {$user->hrid()} est inconnu"); } - http_redirect("http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&anc_id=$mat"); + http_redirect("http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&anc_id=" . $user->ax_id); } - function handler_p_edit(&$page, $opened_tab = null, $mode = null) + function handler_p_edit(&$page, $user = null, $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->trigSuccess('Ton profil a été synchronisé avec celui du site polytechniciens.com'); + if (is_null($user)) { + $user = S::user(); + if (!$user->hasProfile()) { + return PL_NOT_FOUND; + } else { + pl_redirect('profile/edit/' . $user->profile()->hrid()); + } + } else { + $user = Profile::get($user); + if (!$user) { + return PL_NOT_FOUND; + } else if (!S::user()->canEdit($user) && Platal::notAllowed()) { + return PL_FORBIDDEN; + } } // Build the page @@ -337,7 +366,9 @@ class ProfileModule extends PLModule $page->addJsLink('grades.js'); $page->addJsLink('profile.js'); $page->addJsLink('jquery.autocomplete.js'); - $wiz = new PlWizard('Profil', PlPage::getCoreTpl('plwizard.tpl'), true, true); + $wiz = new PlWizard('Profil', PlPage::getCoreTpl('plwizard.tpl'), true, true, false); + $wiz->addUserData('profile', $user); + $wiz->addUserData('owner', $user->owner()); $this->load('page.inc.php'); $wiz->addPage('ProfileGeneral', 'Général', 'general'); $wiz->addPage('ProfileAddresses', 'Adresses personnelles', 'adresses'); @@ -346,15 +377,11 @@ class ProfileModule extends PLModule $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); + $wiz->apply($page, 'profile/edit/' . $user->hrid(), $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()) { + if (!$user->birthdate) { $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"); + . " la procédure de récupération de mot de passe si un jour tu le perdais."); } $page->setTitle('Mon Profil'); @@ -398,12 +425,12 @@ class ProfileModule extends PLModule $page->assign('medal_list', $mlist); } - function handler_ajax_address(&$page, $adid) + function handler_ajax_address(&$page, $id) { header('Content-Type: text/html; charset=utf-8'); $page->changeTpl('profile/adresses.address.tpl', NO_SKIN); - $page->assign('i', $adid); - $page->assign('adr', array()); + $page->assign('i', $id); + $page->assign('address', array()); } function handler_ajax_tel(&$page, $prefid, $prefname, $telid) @@ -419,7 +446,7 @@ class ProfileModule extends PLModule function handler_ajax_edu(&$page, $eduid, $class) { header('Content-Type: text/html; charset=utf-8'); - $page->changeTpl('profile/edu.tpl', NO_SKIN); + $page->changeTpl('profile/general.edu.tpl', NO_SKIN); $res = XDB::iterator("SELECT id, field FROM profile_education_field_enum ORDER BY field"); @@ -444,23 +471,44 @@ class ProfileModule extends PLModule $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")); - } - - function handler_ajax_secteur(&$page, $id, $sect, $ssect = -1) + $res = XDB::query("SELECT id, name AS label + FROM profile_job_sector_enum"); + $page->assign('secteurs', $res->fetchAllAssoc()); + $res = XDB::query("SELECT id, fonction_fr, FIND_IN_SET('titre', flags) AS title + FROM fonctions_def + ORDER BY id"); + $page->assign('fonctions', $res->fetchAllAssoc()); + require_once "emails.combobox.inc.php"; + fill_email_combobox($page); + } + + function handler_ajax_secteur(&$page, $id, $jobid, $jobpref, $sect, $ssect = -1) { header('Content-Type: text/html; charset=utf-8'); - $res = XDB::iterator("SELECT id, label - FROM emploi_ss_secteur - WHERE secteur = {?}", $sect); + $res = XDB::iterator("SELECT id, name AS label, FIND_IN_SET('optgroup', flags) AS optgroup + FROM profile_job_subsector_enum + WHERE sectorid = {?}", $sect); $page->changeTpl('profile/jobs.secteur.tpl', NO_SKIN); $page->assign('id', $id); $page->assign('ssecteurs', $res); $page->assign('sel', $ssect); + if ($id != -1) { + $page->assign('change', 1); + $page->assign('jobid', $jobid); + $page->assign('jobpref', $jobpref); + } + } + + function handler_ajax_ssecteur(&$page, $id, $ssect, $sssect = -1) + { + header('Content-Type: text/html; charset=utf-8'); + $res = XDB::iterator("SELECT id, name AS label + FROM profile_job_subsubsector_enum + WHERE subsectorid = {?}", $ssect); + $page->changeTpl('profile/jobs.soussecteur.tpl', NO_SKIN); + $page->assign('id', $id); + $page->assign('sssecteurs', $res); + $page->assign('sel', $sssect); } function handler_ajax_skill(&$page, $cat, $id) @@ -483,29 +531,39 @@ class ProfileModule extends PLModule } } - function handler_ajax_searchname(&$page, $snid) + function handler_ajax_searchname(&$page, $id) { header('Content-Type: text/html; charset=utf-8'); $page->changeTpl('profile/general.searchname.tpl', NO_SKIN); - $page->assign('i', $snid); - $page->assign('sn', array()); - $page->assign('newsn', true); + $res = XDB::query("SELECT id, name, FIND_IN_SET('public', flags) AS pub + FROM profile_name_enum + WHERE NOT FIND_IN_SET('not_displayed', flags) + AND NOT FIND_IN_SET('always_displayed', flags)"); + $page->assign('sn_type_list', $res->fetchAllAssoc()); + $page->assign('i', $id); } - - function handler_p_orange(&$page) + + function handler_ajax_buildnames(&$page, $data) + { + header('Content-Type: text/html; charset=utf-8'); + $page->changeTpl('profile/general.buildnames.tpl', NO_SKIN); + require_once 'name.func.inc.php'; + $page->assign('names', build_javascript_names($data)); + } + + function handler_p_orange(&$page, $pid = null) { $page->changeTpl('profile/orange.tpl'); require_once 'validations.inc.php'; - - $res = XDB::query( - "SELECT u.promo, u.promo_sortie - FROM auth_user_md5 AS u - WHERE user_id={?}", S::v('uid')); - - list($promo, $promo_sortie_old) = $res->fetchOneRow(); - $page->assign('promo_sortie_old', $promo_sortie_old); - $page->assign('promo', $promo); + $profile = Profile::get($pid); + if (is_null($profile)) { + return PL_NOT_FOUND; + } + $page->assign('promo_sortie_old', $profile->grad_year); + $page->assign('promo', $profile->entry_year); + $page->assign('promo_display', $profile->promo()); + $page->assign('sexe', $profile->isFemale()); if (!Env::has('promo_sortie')) { return; @@ -514,81 +572,61 @@ class ProfileModule extends PLModule } $promo_sortie = Env::i('promo_sortie'); - + $promo = $profile->entry_year; if ($promo_sortie < 1000 || $promo_sortie > 9999) { - $page->trigError('L\'année de sortie doit être un nombre de quatre chiffres'); - } - elseif ($promo_sortie < $promo + 3) { - $page->trigError('Trop tôt'); - } - elseif ($promo_sortie == $promo_sortie_old) { + $page->trigError('L\'année de sortie doit être un nombre de quatre chiffres.'); + } elseif ($promo_sortie < $promo + 3) { + $page->trigError('Trop tôt !'); + } elseif ($promo_sortie == $promo_sortie_old) { $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->trigSuccess('Ton statut "orange" a été supprimé.'); - $page->assign('promo_sortie_old', $promo_sortie); - } - else { + } elseif ($promo_sortie == $promo + 3) { + XDB::execute('UPDATE profile_education + SET grad_year = {?} + WHERE uid = {?} AND FIND_IN_SET(\'primary\', flags)', + $promo_sortie, $profile->id()); + $page->trigSuccess('Ton statut "orange" a été supprimé.'); + $page->assign('promo_sortie_old', $promo_sortie); + } else { $page->assign('promo_sortie', $promo_sortie); if (Env::has('submit')) { - $myorange = new OrangeReq(S::v('uid'), - $promo_sortie); + $myorange = new OrangeReq(S::user(), $promo_sortie); $myorange->submit(); $page->assign('myorange', $myorange); } } } - function handler_referent(&$page, $x = null) + function handler_referent(&$page, $user) { require_once 'user.func.inc.php'; - - if (is_null($x)) { - return PL_NOT_FOUND; - } - $page->changeTpl('profile/fiche_referent.tpl', SIMPLE); - $res = XDB::query( - "SELECT prenom, nom, user_id, promo, cv, a.alias AS bestalias - FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON (u.user_id=a.id - AND FIND_IN_SET('bestalias', a.flags)) - INNER JOIN aliases AS a1 ON (u.user_id=a1.id - AND a1.alias = {?} - AND a1.type!='homonyme')", $x); - - if ($res->numRows() != 1) { + $user = Profile::get($user); + if (!$user) { return PL_NOT_FOUND; } - list($prenom, $nom, $user_id, $promo, $cv, $bestalias) = $res->fetchOneRow(); - - $page->assign('prenom', $prenom); - $page->assign('nom', $nom); - $page->assign('promo', $promo); - $page->assign('cv', MiniWiki::WikiToHTML($cv, true)); - $page->assign('bestalias', $bestalias); - $page->assign('adr_pro', get_user_details_pro($user_id)); + $page->assign_by_ref('user', $user); + $page->assign('cv', MiniWiki::WikiToHTML($user->cv, true)); + //TODO: waiting for job refactoring to be done + //$page->assign('adr_pro', get_user_details_pro($user->id())); ///// recuperations infos referent //expertise - $res = XDB::query("SELECT expertise FROM mentor WHERE uid = {?}", $user_id); + $res = XDB::query('SELECT expertise + FROM profile_mentor + WHERE uid = {?}', $user->id()); $page->assign('expertise', $res->fetchOneCell()); //secteurs $secteurs = $ss_secteurs = Array(); - $res = XDB::iterRow( - "SELECT s.label, ss.label - FROM mentor_secteurs AS m - LEFT JOIN emploi_secteur AS s ON(m.secteur = s.id) - LEFT JOIN emploi_ss_secteur AS ss ON(m.secteur = ss.secteur AND m.ss_secteur = ss.id) - WHERE uid = {?}", $user_id); + $res = XDB::iterRow('SELECT s.name AS label, ss.name AS label + FROM profile_mentor_sector AS m + LEFT JOIN profile_job_sector_enum AS s ON(m.sectorid = s.id) + LEFT JOIN profile_job_subsector_enum AS ss ON(m.sectorid = ss.sectorid AND m.subsectorid = ss.id) + WHERE uid = {?}', $user->id()); while (list($sec, $ssec) = $res->next()) { $secteurs[] = $sec; $ss_secteurs[] = $ssec; @@ -596,12 +634,12 @@ class ProfileModule extends PLModule $page->assign_by_ref('secteurs', $secteurs); $page->assign_by_ref('ss_secteurs', $ss_secteurs); - //pays + // Countries. $res = XDB::query( - "SELECT gp.pays - FROM mentor_pays AS m - LEFT JOIN geoloc_pays AS gp ON(m.pid = gp.a2) - WHERE uid = {?}", $user_id); + "SELECT gc.countryFR + FROM profile_mentor_country AS m + LEFT JOIN geoloc_countries AS gc ON (m.country = gc.iso_3166_1_a2) + WHERE uid = {?}", $user->id()); $page->assign('pays', $res->fetchColumn()); $page->addJsLink('close_on_esc.js'); @@ -615,7 +653,7 @@ class ProfileModule extends PLModule $page->setTitle('Conseil Pro'); //recuperation des noms de secteurs - $res = XDB::iterRow("SELECT id, label FROM emploi_secteur"); + $res = XDB::iterRow("SELECT id, name AS label FROM profile_job_sector_enum"); $secteurs[''] = ''; while (list($tmp_id, $tmp_label) = $res->next()) { $secteurs[$tmp_id] = $tmp_label; @@ -623,7 +661,7 @@ class ProfileModule extends PLModule $page->assign_by_ref('secteurs', $secteurs); // nb de mentors - $res = XDB::query("SELECT count(*) FROM mentor"); + $res = XDB::query("SELECT count(*) FROM profile_mentor"); $page->assign('mentors_number', $res->fetchOneCell()); // On vient d'un formulaire @@ -634,12 +672,12 @@ class ProfileModule extends PLModule $expertise_champ = XDB::escape(Env::v('expertise')); if ($pays_sel != "''") { - $where[] = "mp.pid = $pays_sel"; + $where[] = "mp.country = $pays_sel"; } if ($secteur_sel != "''") { - $where[] = "ms.secteur = $secteur_sel"; + $where[] = "ms.sectorid = $secteur_sel"; if ($ss_secteur_sel != "''") { - $where[] = "ms.ss_secteur = $ss_secteur_sel"; + $where[] = "ms.subsectorid = $ss_secteur_sel"; } } if ($expertise_champ != "''") { @@ -649,9 +687,9 @@ class ProfileModule extends PLModule if ($where) { $where = join(' AND ', $where); - $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)", + $set = new UserSet("INNER JOIN profile_mentor AS m ON (m.uid = u.user_id) + LEFT JOIN profile_mentor_country AS mp ON (mp.uid = m.uid) + LEFT JOIN profile_mentor_sector AS ms ON (ms.uid = m.uid)", $where); $set->addMod('mentor', 'Référents'); $set->apply('referent/search', $page, $action, $subaction); @@ -669,9 +707,9 @@ class ProfileModule extends PLModule $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); + $it = XDB::iterator("SELECT id, name AS field + FROM profile_job_subsector_enum + WHERE sectorid = {?}", $sect); $page->assign('list', $it); } @@ -680,58 +718,17 @@ class ProfileModule extends PLModule 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); + $where = ($ssect ? ' AND ms.subsectorid = {?}' : ''); + $it = XDB::iterator("SELECT gc.iso_3166_1_a2 AS id, gc.countryFR AS field + FROM geoloc_countries AS gc + INNER JOIN profile_mentor_country AS mp ON (mp.country = gc.iso_3166_1_a2) + INNER JOIN profile_mentor_sector AS ms ON (ms.uid = mp.uid) + WHERE ms.sectorid = {?} " . $where . " + GROUP BY iso_3166_1_a2 + ORDER BY countryFR", $sect, $ssect); $page->assign('list', $it); } - function handler_p_usage(&$page) - { - $page->changeTpl('profile/nomusage.tpl'); - - require_once 'validations.inc.php'; - - $res = XDB::query( - "SELECT u.nom, u.nom_usage, u.flags, e.alias - FROM auth_user_md5 AS u - LEFT JOIN aliases AS e ON(u.user_id = e.id - AND FIND_IN_SET('usage', e.flags)) - WHERE user_id={?}", S::v('uid')); - - list($nom, $usage_old, $flags, $alias_old) = $res->fetchOneRow(); - $flags = new PlFlagSet($flags); - $page->assign('usage_old', $usage_old); - $page->assign('alias_old', $alias_old); - - $nom_usage = replace_accent(trim(Env::v('nom_usage'))); - $nom_usage = strtoupper($nom_usage); - $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); - } 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') { - $reason = Env::v('other_reason'); - } - $myusage = new UsageReq(S::v('uid'), $nom_usage, $reason); - $myusage->submit(); - $page->assign('myusage', $myusage); - } - } - } - function handler_xnet(&$page) { $page->changeTpl('profile/groupesx.tpl'); @@ -759,26 +756,25 @@ class ProfileModule extends PLModule $x = substr($x, 0, strlen($x) - 4); } - $vcard = new VCard($x); - $vcard->do_page($page); + $vcard = new VCard(); + $vcard->addUser($x); + $vcard->show(); } - function handler_admin_trombino(&$page, $uid = null, $action = null) { + function handler_admin_trombino(&$page, $login = null, $action = null) { $page->changeTpl('profile/admin_trombino.tpl'); $page->setTitle('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(); + if (!$login || !($user = User::get($login))) { + return PL_NOT_FOUND; + } else { + $page->assign_by_ref('user', $user); + } switch ($action) { case "original": header("Content-type: image/jpeg"); - readfile("/home/web/trombino/photos".$promo."/".$forlife.".jpg"); + readfile("/home/web/trombino/photos" . $user->promo() . "/" . $user->login() . ".jpg"); exit; break; @@ -791,17 +787,26 @@ class ProfileModule extends PLModule unlink($_FILES['userfile']['tmp_name']); XDB::execute( "REPLACE INTO photo SET uid={?}, attachmime = {?}, attach={?}, x={?}, y={?}", - $uid, $mimetype, $data, $x, $y); + $user->id(), $mimetype, $data, $x, $y); break; case "delete": S::assert_xsrf_token(); - XDB::execute('DELETE FROM photo WHERE uid = {?}', $uid); + XDB::execute('DELETE FROM photo WHERE uid = {?}', $user->id()); break; } - - $page->assign('forlife', $forlife); + } + function handler_admin_names(&$page, $action = 'list', $id = null) { + $page->setTitle('Administration - Types de noms'); + $page->assign('title', 'Gestion des types de noms'); + $table_editor = new PLTableEditor('admin/names', 'profile_name_enum', 'id', true); + $table_editor->describe('name', 'Nom', true); + $table_editor->describe('explanations', 'Explications', true); + $table_editor->describe('type', 'Type', true); + $table_editor->describe('flags', 'Flags', true); + $table_editor->describe('score', 'Score', true); + $table_editor->apply($page, $action, $id); } function handler_admin_binets(&$page, $action = 'list', $id = null) { $page->setTitle('Administration - Binets'); @@ -886,6 +891,23 @@ class ProfileModule extends PLModule $table_editor->describe('link', 'lien web', true); $table_editor->apply($page, $action, $id); } + function handler_admin_corps_enum(&$page, $action = 'list', $id = null) { + $page->setTitle('Administration - Corps'); + $page->assign('title', 'Gestion des Corps'); + $table_editor = new PLTableEditor('admin/corps_enum', 'profile_corps_enum', 'id'); + $table_editor->describe('name', 'intitulé', true); + $table_editor->describe('abbreviation', 'abbréviation', true); + $table_editor->describe('still_exists', 'existe encore ?', true); + $table_editor->apply($page, $action, $id); + } + function handler_admin_corps_rank(&$page, $action = 'list', $id = null) { + $page->setTitle('Administration - Grade dans les Corps'); + $page->assign('title', 'Gestion des grade dans les Corps'); + $table_editor = new PLTableEditor('admin/corps_rank', 'profile_corps_rank_enum', 'id'); + $table_editor->describe('name', 'intitulé', true); + $table_editor->describe('abbreviation', 'abbréviation', true); + $table_editor->apply($page, $action, $id); + } function handler_admin_medals(&$page, $action = 'list', $id = null) { $page->setTitle('Administration - Distinctions'); $page->assign('title', 'Gestion des Distinctions');