X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=6714c4e805beeefc8abeee2f45113ccf36712874;hb=2e04c41b702b2ff21bc0bd9cee5fe119eb863950;hp=bbdd8ea01e86ddab74cdaa7465c3197759b2bf54;hpb=57fa97b3b0820a76b26a1d17c078c3663b161922;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index bbdd8ea..6714c4e 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -25,50 +25,49 @@ class ProfileModule extends PLModule { return array( 'photo' => $this->make_hook('photo', AUTH_PUBLIC), - 'photo/change' => $this->make_hook('photo_change', AUTH_MDP), + 'photo/change' => $this->make_hook('photo_change', AUTH_PASSWD, 'user'), 'fiche.php' => $this->make_hook('fiche', AUTH_PUBLIC), 'profile' => $this->make_hook('profile', AUTH_PUBLIC), - 'profile/private' => $this->make_hook('profile', AUTH_COOKIE), + 'profile/private' => $this->make_hook('profile', AUTH_COOKIE, 'user'), 'profile/ax' => $this->make_hook('ax', AUTH_COOKIE, 'admin,edit_directory'), - 'profile/edit' => $this->make_hook('p_edit', AUTH_MDP), + 'profile/edit' => $this->make_hook('p_edit', AUTH_PASSWD, 'user'), 'profile/ajax/address' => $this->make_hook('ajax_address', AUTH_COOKIE, 'user', NO_AUTH), - 'profile/ajax/address/del' => $this->make_hook('ajax_address_del', AUTH_MDP), + 'profile/ajax/address/del' => $this->make_hook('ajax_address_del', AUTH_PASSWD, 'user'), 'profile/ajax/tel' => $this->make_hook('ajax_tel', AUTH_COOKIE, 'user', NO_AUTH), 'profile/ajax/edu' => $this->make_hook('ajax_edu', AUTH_COOKIE, 'user', NO_AUTH), 'profile/ajax/medal' => $this->make_hook('ajax_medal', AUTH_COOKIE, 'user', NO_AUTH), 'profile/networking' => $this->make_hook('networking', AUTH_PUBLIC), 'profile/ajax/job' => $this->make_hook('ajax_job', AUTH_COOKIE, 'user', NO_AUTH), 'profile/ajax/skill' => $this->make_hook('ajax_skill', AUTH_COOKIE, 'user', NO_AUTH), + 'profile/ajax/deltaten' => $this->make_hook('ajax_deltaten', 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), 'profile/ajax/tree/jobterms' => $this->make_hook('ajax_tree_job_terms', AUTH_COOKIE, 'user', NO_AUTH), 'profile/jobterms' => $this->make_hook('jobterms', 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), + 'javascript/education.js' => $this->make_hook('education_js', AUTH_COOKIE, 'user'), + 'javascript/grades.js' => $this->make_hook('grades_js', AUTH_COOKIE, 'user'), 'profile/medal' => $this->make_hook('medal', AUTH_PUBLIC), - 'profile/name_info' => $this->make_hook('name_info', AUTH_PUBLIC), - 'referent' => $this->make_hook('referent', AUTH_COOKIE), + 'referent' => $this->make_hook('referent', AUTH_COOKIE, 'user'), 'referent/country' => $this->make_hook('ref_country', AUTH_COOKIE, 'user', NO_AUTH), 'referent/autocomplete' => $this->make_hook('ref_autocomplete', AUTH_COOKIE, 'user', NO_AUTH), - 'groupes-x' => $this->make_hook('xnet', AUTH_COOKIE), + 'groupes-x' => $this->make_hook('xnet', AUTH_COOKIE, 'groups'), 'groupes-x/logo' => $this->make_hook('xnetlogo', AUTH_PUBLIC), '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/education' => $this->make_hook('admin_education', AUTH_MDP, 'admin'), - 'admin/education_field' => $this->make_hook('admin_education_field', AUTH_MDP, 'admin'), - 'admin/education_degree' => $this->make_hook('admin_education_degree', AUTH_MDP, 'admin'), - 'admin/education_degree_set' => $this->make_hook('admin_education_degree_set', AUTH_MDP, 'admin'), - 'admin/sections' => $this->make_hook('admin_sections', AUTH_MDP, 'admin'), - 'admin/networking' => $this->make_hook('admin_networking', AUTH_MDP, 'admin'), - 'admin/trombino' => $this->make_hook('admin_trombino', 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'), + 'admin/binets' => $this->make_hook('admin_binets', AUTH_PASSWD, 'admin'), + 'admin/medals' => $this->make_hook('admin_medals', AUTH_PASSWD, 'admin'), + 'admin/education' => $this->make_hook('admin_education', AUTH_PASSWD, 'admin'), + 'admin/education_field' => $this->make_hook('admin_education_field', AUTH_PASSWD, 'admin'), + 'admin/education_degree' => $this->make_hook('admin_education_degree', AUTH_PASSWD, 'admin'), + 'admin/education_degree_set' => $this->make_hook('admin_education_degree_set', AUTH_PASSWD, 'admin'), + 'admin/sections' => $this->make_hook('admin_sections', AUTH_PASSWD, 'admin'), + 'admin/networking' => $this->make_hook('admin_networking', AUTH_PASSWD, 'admin'), + 'admin/trombino' => $this->make_hook('admin_trombino', AUTH_PASSWD, 'admin'), + 'admin/corps_enum' => $this->make_hook('admin_corps_enum', AUTH_PASSWD, 'admin'), + 'admin/corps_rank' => $this->make_hook('admin_corps_rank', AUTH_PASSWD, 'admin'), ); } @@ -115,19 +114,6 @@ class ProfileModule extends PLModule exit; } - function handler_name_info($page) - { - pl_content_headers("text/html"); - $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 @@ -238,13 +224,14 @@ class ProfileModule extends PLModule } // Determines the access level at which the profile will be displayed. - if (!S::logged() || !S::user()->checkPerms('directory_ax') || Env::v('view') == 'public') { - $view = 'public'; - } else if (!S::user()->checkPerms('directory_private') || Env::v('view') == 'ax') { - $view = 'ax'; + if (Env::v('view') == 'public') { + $view = Visibility::VIEW_PUBLIC; + } else if (Env::v('view') == 'ax') { + $view = Visibility::VIEW_AX; } else { - $view = 'private'; + $view = Visibility::VIEW_PRIVATE; } + $visibility = Visibility::defaultForRead($view); // Display pending picture if (S::logged() && Env::v('modif') == 'new') { @@ -255,7 +242,7 @@ class ProfileModule extends PLModule if (is_null($pid)) { $owner = User::getSilent($id); if ($owner) { - $profile = $owner->profile(true, Profile::FETCH_ALL, $view); + $profile = $owner->profile(true, Profile::FETCH_ALL, $visibility); if ($profile) { $pid = $profile->id(); } @@ -263,7 +250,7 @@ class ProfileModule extends PLModule } else { // Fetches profile's and profile's owner information and redirects to // marketing if the owner has not subscribed and the requirer has logged in. - $profile = Profile::get($pid, Profile::FETCH_ALL, $view); + $profile = Profile::get($pid, Profile::FETCH_ALL, $visibility); $owner = $profile->owner(); } if (is_null($pid)) { @@ -272,6 +259,7 @@ class ProfileModule extends PLModule } return PL_NOT_FOUND; } + // Now that we know this is an existing profile, we can switch to the // appropriate template. $page->changeTpl('profile/profile.tpl', SIMPLE); @@ -285,13 +273,13 @@ class ProfileModule extends PLModule $page->setTitle($profile->fullName()); // Determines and displays the virtual alias. - if (!is_null($owner) && $profile->alias_pub == 'public') { + if (!is_null($owner) && $profile->isVisible($profile->alias_pub)) { $page->assign('virtualalias', $owner->emailAlias()); } $page->assign_by_ref('profile', $profile); $page->assign_by_ref('owner', $owner); - $page->assign('view', $view); + $page->assign('view', $visibility); $page->assign('logged', S::logged()); header('Last-Modified: ' . date('r', strtotime($profile->last_change))); @@ -313,7 +301,7 @@ class ProfileModule extends PLModule { global $globals; - if (in_array($hrpid, array('general', 'adresses', 'emploi', 'poly', 'deco', 'skill', 'mentor'))) { + if (in_array($hrpid, array('general', 'adresses', 'emploi', 'poly', 'deco', 'mentor', 'deltaten'))) { $aux = $opened_tab; $opened_tab = $hrpid; $hrpid = $aux; @@ -330,8 +318,9 @@ class ProfileModule extends PLModule } // Build the page - $page->addJsLink('education.js', false); /* dynamic content */ - $page->addJsLink('grades.js', false); /* dynamic content */ + $page->addJsLink('jquery.ui.xorg.js'); + $page->addJsLink('education.js', true, false); /* dynamic content */ + $page->addJsLink('grades.js', true, false); /* dynamic content */ $page->addJsLink('profile.js'); $wiz = new PlWizard('Profil', PlPage::getCoreTpl('plwizard.tpl'), true, true, false); $wiz->addUserData('profile', $profile); @@ -340,14 +329,17 @@ class ProfileModule extends PLModule $wiz->addPage('ProfilePageGeneral', 'Général', 'general'); $wiz->addPage('ProfilePageAddresses', 'Adresses personnelles', 'adresses'); $wiz->addPage('ProfilePageJobs', 'Informations professionnelles', 'emploi'); - if (S::user()->checkPerms(User::PERM_DIRECTORY_PRIVATE)) { + $viewPrivate = S::user()->checkPerms(User::PERM_DIRECTORY_PRIVATE); + if ($viewPrivate) { $wiz->addPage('ProfilePageGroups', 'Groupes X - Binets', 'poly'); } $wiz->addPage('ProfilePageDecos', 'Décorations - Medailles', 'deco'); - if (S::user()->checkPerms(User::PERM_DIRECTORY_PRIVATE)) { - $wiz->addPage('ProfilePageSkills', 'Compétences diverses', 'skill'); + if ($viewPrivate) { $wiz->addPage('ProfilePageMentor', 'Mentoring', 'mentor'); } + if ($viewPrivate && $profile->isDeltatenEnabled(Profile::DELTATEN_OLD)) { + $wiz->addPage('ProfilePageDeltaten', 'Opération N N-10', 'deltaten'); + } $wiz->apply($page, 'profile/edit/' . $profile->hrid(), $opened_tab, $mode); if (!$profile->birthdate) { @@ -357,6 +349,8 @@ class ProfileModule extends PLModule $page->setTitle('Mon Profil'); $page->assign('hrpid', $profile->hrid()); + $page->assign('viewPrivate', $viewPrivate); + $page->assign('isMe', S::user()->isMyProfile($profile)); if (isset($success) && $success) { $page->trigSuccess('Ton profil a bien été mis à jour.'); } @@ -392,26 +386,15 @@ class ProfileModule extends PLModule $page->assign('medal_list', $mlist); } - function handler_ajax_address($page, $id) + function handler_ajax_address($page, $id, $pid) { pl_content_headers("text/html"); $page->changeTpl('profile/adresses.address.tpl', NO_SKIN); $page->assign('i', $id); $page->assign('address', array()); - } - - function handler_ajax_address_del($page, $hrpid) - { - if ($profile = Profile::get($hrpid)) { - if (S::user()->canEdit($profile)) { - $address = Post::t('address'); - if (is_null(AddressReq::get_request($profile->id(), 0, 0, Address::LINK_PROFILE, $address))) { - $req = new AddressReq(S::user(), $profile, $address, $profile->id(), 0, 0, Address::LINK_PROFILE); - $req->submit(); - } - } - } - exit(); + $page->assign('profile', Profile::get($pid)); + $page->assign('isMe', true); + $page->assign('geocoding_removal', true); } function handler_ajax_tel($page, $prefid, $prefname, $telid, $subField, $mainField, $mainId) @@ -447,17 +430,24 @@ class ProfileModule extends PLModule { pl_content_headers("text/html"); $page->changeTpl('profile/deco.medal.tpl', NO_SKIN); + list($valid, $has_levels) = XDB::fetchOneRow("SELECT NOT FIND_IN_SET('validation', flags), FIND_IN_SET('has_levels', flags) + FROM profile_medal_enum + WHERE id = {?}", + $id); $page->assign('id', $i); - $page->assign('medal', array('id' => $id, 'grade' => 0, 'valid' => 0)); + $page->assign('medal', array('id' => $id, 'grade' => 0, 'valid' => $valid, 'has_levels' => $has_levels)); } - function handler_ajax_job($page, $id) + function handler_ajax_job($page, $id, $pid) { pl_content_headers("text/html"); $page->changeTpl('profile/jobs.job.tpl', NO_SKIN); $page->assign('i', $id); $page->assign('job', array()); $page->assign('new', true); + $page->assign('profile', Profile::get($pid)); + $page->assign('isMe', true); + $page->assign('geocoding_removal', true); require_once "emails.combobox.inc.php"; fill_email_combobox($page, array('redirect', 'job', 'stripped_directory')); } @@ -502,14 +492,11 @@ class ProfileModule extends PLModule function handler_ajax_searchname($page, $id, $isFemale) { pl_content_headers("text/html"); - $page->changeTpl('profile/general.searchname.tpl', NO_SKIN); - $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->changeTpl('profile/general.private_name.tpl', NO_SKIN); + $page->assign('other_names', array('nickname' => 'Surnom', 'firstname' => 'Autre prénom', 'lastname' => 'Autre nom')); + $page->assign('new_name', true); $page->assign('isFemale', $isFemale); - $page->assign('i', $id); + $page->assign('id', $id); } function handler_ajax_buildnames($page, $data, $isFemale) @@ -577,7 +564,7 @@ class ProfileModule extends PLModule { pl_content_headers("text/plain"); - $q = Env::v('q').'%'; + $q = Env::v('term') . '%'; $tokens = JobTerms::tokenize($q); if (count($tokens) == 0) { exit; @@ -585,51 +572,79 @@ class ProfileModule extends PLModule sort($tokens); $q_normalized = implode(' ', $tokens); - // try to look in cached results + // Try to look in cached results. + $cached = false; $cache = XDB::query('SELECT result FROM search_autocomplete - WHERE name = {?} AND - query = {?} AND - generated > NOW() - INTERVAL 1 DAY', - $type, $q_normalized); - if ($res = $cache->fetchOneCell()) { - echo $res; - die(); - } - - $joins = JobTerms::token_join_query($tokens, 'e'); - if ($type == 'mentor') { - $count = ', COUNT(DISTINCT pid) AS nb'; - $countjoin = ' INNER JOIN profile_job_term_relation AS r ON(r.jtid_1 = e.jtid) INNER JOIN profile_mentor_term AS m ON(r.jtid_2 = m.jtid)'; - $countorder = 'nb DESC, '; + WHERE name = {?} AND query = {?} AND generated > NOW() - INTERVAL 1 DAY', + $type, $q_normalized); + + if ($cache->numRows() > 0) { + $cached = true; + $data = explode("\n", $cache->fetchOneCell()); + $list = array(); + foreach ($data as $line) { + if ($line != '') { + $aux = explode("\t", $line); + if ($type == 'mentor') { + $item = array( + 'field' => $aux[0], + 'nb' => $aux[1], + 'id' => $aux[2] + ); + $item['value'] = SearchModule::format_autocomplete($item); + } else { + $item = array( + 'value' => $aux[0], + 'id' => $aux[1] + ); + } + array_push($list, $item); + } + } } else { - $count = $countjoin = $countorder = ''; - } - $list = XDB::iterator('SELECT e.jtid AS id, e.full_name AS field'.$count.' - FROM profile_job_term_enum AS e '.$joins.$countjoin.' - GROUP BY e.jtid - ORDER BY '.$countorder.'field - LIMIT 11'); - $nbResults = 0; - $res = ''; - while ($result = $list->next()) { - $nbResults++; - if ($nbResults == 11) { - $res .= $q."|-1\n"; + $joins = JobTerms::token_join_query($tokens, 'e'); + if ($type == 'mentor') { + $count = ', COUNT(DISTINCT pid) AS nb'; + $countjoin = ' INNER JOIN profile_job_term_relation AS r ON(r.jtid_1 = e.jtid) INNER JOIN profile_mentor_term AS m ON(r.jtid_2 = m.jtid)'; + $countorder = 'nb DESC, '; + } else { + $count = $countjoin = $countorder = ''; + } + $list = XDB::fetchAllAssoc('SELECT e.jtid AS id, e.full_name AS field' . $count . ' + FROM profile_job_term_enum AS e ' . $joins . $countjoin . ' + GROUP BY e.jtid + ORDER BY ' . $countorder . 'field + LIMIT ' . DirEnumeration::AUTOCOMPLETE_LIMIT); + $to_cache = ''; + if ($type == 'mentor') { + foreach ($list as &$item) { + $to_cache .= $item['field'] . "\t" . $item['nb'] . "\t" . $item['id'] . "\n"; + $item['value'] = SearchModule::format_autocomplete($item); + } } else { - $res .= $result['field'].'|'; - if ($count) { - $res .= $result['nb'].'|'; + foreach ($list as &$item) { + $to_cache .= $item['field'] . "\t" . $item['id'] . "\n"; + $item['value'] = $item['field']; } - $res .= $result['id']; } - $res .= "\n"; } - XDB::query('INSERT INTO search_autocomplete (name, query, result, generated) - VALUES ({?}, {?}, {?}, NOW()) - ON DUPLICATE KEY UPDATE result = VALUES(result), generated = VALUES(generated)', - $type, $q_normalized, $res); - echo $res; + + if (count($list) == DirEnumeration::AUTOCOMPLETE_LIMIT && $type == 'nomentor') { + $list[] = array( + 'value' => '… parcourir les résultats dans un arbre …', + 'field' => '', + 'id' => -1 + ); + } + + if (!$cached) { + XDB::query('INSERT INTO search_autocomplete (name, query, result, generated) + VALUES ({?}, {?}, {?}, NOW()) + ON DUPLICATE KEY UPDATE result = VALUES(result), generated = VALUES(generated)', + $type, $q_normalized, $to_cache); + } + echo json_encode($list); exit(); } @@ -722,17 +737,6 @@ class ProfileModule extends PLModule break; } } - 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'); $page->assign('title', 'Gestion des binets'); @@ -748,7 +752,7 @@ class ProfileModule extends PLModule $table_editor->add_join_table('profile_education', 'eduid', true); $table_editor->add_join_table('profile_education_degree', 'eduid', true); $table_editor->describe('name', 'intitulé', true); - $table_editor->describe('url', 'site web', false); + $table_editor->describe('url', 'site web', false, true); $table_editor->apply($page, $action, $id); } function handler_admin_education_field($page, $action = 'list', $id = null) { @@ -796,7 +800,7 @@ class ProfileModule extends PLModule $page->assign('title', 'Gestion des types de networking'); $table_editor = new PLTableEditor('admin/networking', 'profile_networking_enum', 'nwid'); $table_editor->describe('name', 'intitulé', true); - $table_editor->describe('icon', 'nom de l\'icône', false); + $table_editor->describe('icon', 'nom de l\'icône', false, true); $table_editor->describe('filter', 'filtre', true); $table_editor->describe('link', 'lien web', true); $table_editor->apply($page, $action, $id); @@ -823,7 +827,7 @@ class ProfileModule extends PLModule $page->assign('title', 'Gestion des Distinctions'); $table_editor = new PLTableEditor('admin/medals','profile_medal_enum','id'); $table_editor->describe('text', 'intitulé', true); - $table_editor->describe('img', 'nom de l\'image', false); + $table_editor->describe('img', 'nom de l\'image', false, true); $table_editor->describe('flags', 'valider', true); $table_editor->apply($page, $action, $id); if ($id && $action == 'edit') {