X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=b737ac61b832835bde8dd58b5e937bb8c180b2ee;hb=245923e335d0da5bec9495991a7846be9f0563ab;hp=f38fbfd32a9dbbf8199fd91ab6c643661e8e81df;hpb=3ac45f10c6b54e4db4bfeb0aeb5eef0f5ee5d1b2;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index f38fbfd..b737ac6 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -38,9 +38,6 @@ class ProfileModule extends PLModule '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/sector' => $this->make_hook('ajax_sector', AUTH_COOKIE, 'user', NO_AUTH), - 'profile/ajax/sub_sector' => $this->make_hook('ajax_sub_sector', AUTH_COOKIE, 'user', NO_AUTH), - 'profile/ajax/alternates' => $this->make_hook('ajax_alternates', 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), @@ -52,10 +49,6 @@ class ProfileModule extends PLModule 'profile/name_info' => $this->make_hook('name_info', AUTH_PUBLIC), 'referent' => $this->make_hook('referent', AUTH_COOKIE), - 'emploi' => $this->make_hook('ref_search', AUTH_COOKIE), - 'jobs' => $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), 'referent/autocomplete' => $this->make_hook('ref_autocomplete', AUTH_COOKIE, 'user', NO_AUTH), @@ -72,7 +65,6 @@ class ProfileModule extends PLModule '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/sectors' => $this->make_hook('admin_sectors', 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'), @@ -95,7 +87,6 @@ class ProfileModule extends PLModule // Retrieve the photo and its mime type. if ($req && S::logged()) { - include 'validations.inc.php'; $myphoto = PhotoReq::get_request($profile->id()); $photo = PlImage::fromData($myphoto->data, $myphoto->mimetype); } else { @@ -182,8 +173,6 @@ class ProfileModule extends PLModule $page->changeTpl('profile/trombino.tpl'); $page->assign('hrpid', $profile->hrid()); - require_once('validations.inc.php'); - $trombi_x = '/home/web/trombino/photos' . $profile->promo() . '/' . $profile->hrid() . '.jpg'; if (Env::has('upload')) { S::assert_xsrf_token(); @@ -256,9 +245,9 @@ class ProfileModule extends PLModule $page->changeTpl('profile/profile.tpl', SIMPLE); // Determines the access level at which the profile will be displayed. - if (!S::logged() || Env::v('view') == 'public') { + if (!S::logged() || !S::user()->checkPerms('directory_ax') || Env::v('view') == 'public') { $view = 'public'; - } else if (S::logged() && Env::v('view') == 'ax') { + } else if (!S::user()->checkPerms('directory_private') || Env::v('view') == 'ax') { $view = 'ax'; } else { $view = 'private'; @@ -273,9 +262,6 @@ class ProfileModule extends PLModule // marketing if the owner has not subscribed and the requirer has logged in. $profile = Profile::get($pid, Profile::FETCH_ALL, $view); $owner = $profile->owner(); - if (S::logged() && !is_null($owner) && $owner->state == 'pending') { - pl_redirect('marketing/public/' . $profile->hrid()); - } // Profile view are logged. if (S::logged()) { @@ -330,13 +316,17 @@ class ProfileModule extends PLModule $wiz->addUserData('profile', $profile); $wiz->addUserData('owner', $profile->owner()); $this->load('page.inc.php'); - $wiz->addPage('ProfileSettingGeneral', 'Général', 'general'); - $wiz->addPage('ProfileSettingAddresses', 'Adresses personnelles', 'adresses'); - $wiz->addPage('ProfileSettingGroups', 'Groupes X - Binets', 'poly'); - $wiz->addPage('ProfileSettingDecos', 'Décorations - Medailles', 'deco'); - $wiz->addPage('ProfileSettingJobs', 'Informations professionnelles', 'emploi'); - $wiz->addPage('ProfileSettingSkills', 'Compétences diverses', 'skill'); - $wiz->addPage('ProfileSettingMentor', 'Mentoring', 'mentor'); + $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)) { + $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'); + $wiz->addPage('ProfilePageMentor', 'Mentoring', 'mentor'); + } $wiz->apply($page, 'profile/edit/' . $profile->hrid(), $opened_tab, $mode); if (!$profile->birthdate) { @@ -395,7 +385,8 @@ class ProfileModule extends PLModule $page->assign('prefid', $prefid); $page->assign('prefname', $prefname); $page->assign('telid', $telid); - $page->assign('tel', array()); + $phone = new Phone(); + $page->assign('tel', $phone->toFormArray()); } function handler_ajax_edu(&$page, $eduid, $class) @@ -426,41 +417,10 @@ class ProfileModule extends PLModule $page->assign('i', $id); $page->assign('job', array()); $page->assign('new', true); - $res = XDB::query("SELECT id, name AS label - FROM profile_job_sector_enum"); - $page->assign('sectors', $res->fetchAllAssoc()); require_once "emails.combobox.inc.php"; fill_email_combobox($page); } - function handler_ajax_sector(&$page, $id, $jobid, $jobpref, $sect, $ssect = -1) - { - pl_content_headers("text/html"); - $res = XDB::iterator("SELECT id, name, FIND_IN_SET('optgroup', flags) AS optgroup - FROM profile_job_subsector_enum - WHERE sectorid = {?}", $sect); - $page->changeTpl('profile/jobs.sector.tpl', NO_SKIN); - $page->assign('id', $id); - $page->assign('subSectors', $res); - $page->assign('sel', $ssect); - if ($id != -1) { - $page->assign('change', 1); - $page->assign('jobid', $jobid); - $page->assign('jobpref', $jobpref); - } - } - function handler_ajax_sub_sector(&$page, $id, $ssect, $sssect = -1) - { - pl_content_headers("text/html"); - $res = XDB::iterator("SELECT id, name - FROM profile_job_subsubsector_enum - WHERE subsectorid = {?}", $ssect); - $page->changeTpl('profile/jobs.sub_sector.tpl', NO_SKIN); - $page->assign('id', $id); - $page->assign('subSubSectors', $res); - $page->assign('sel', $sssect); - } - /** * Page for url "profile/ajax/tree/jobterms". Display a JSon page containing * the sub-branches of a branch in the job terms tree. @@ -478,26 +438,6 @@ class ProfileModule extends PLModule JobTerms::ajaxGetBranch(&$page, $filter); } - function handler_ajax_alternates(&$page, $id, $sssect) - { - pl_content_headers("text/html"); - $res = XDB::iterator('SELECT name - FROM profile_job_alternates - WHERE subsubsectorid = {?} - ORDER BY id', - $sssect); - $page->changeTpl('profile/jobs.alternates.tpl', NO_SKIN); - $alternates = ''; - if ($res->total() > 0) { - $alternate = $res->next(); - $alternates = $alternate['name']; - while ($alternate = $res->next()) { - $alternates .= ', ' . $alternate['name']; - } - } - $page->assign('alternates', $alternates); - } - function handler_ajax_skill(&$page, $cat, $id) { pl_content_headers("text/html"); @@ -550,24 +490,7 @@ class ProfileModule extends PLModule $page->assign_by_ref('profile', $pf); - ///// recuperations infos referent - - // Sectors - $sectors = $subSectors = Array(); - $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 pid = {?}", $pf->id()); - while (list($sector, $subSector) = $res->next()) { - $sectors[] = $sector; - $subSectors[] = $subSector; - } - $page->assign_by_ref('sectors', $sectors); - $page->assign_by_ref('subSectors', $subSectors); - - // Countries. + // Retrieves referents' countries. $res = XDB::query( "SELECT gc.countryFR FROM profile_mentor_country AS m @@ -578,65 +501,16 @@ class ProfileModule extends PLModule $page->addJsLink('close_on_esc.js'); } - function handler_ref_search(&$page, $action = null, $subaction = null) - { - $wp = new PlWikiPage('Docs.Emploi'); - $wp->buildCache(); - - $page->setTitle('Emploi et Carrières'); - - // nb de mentors - $res = XDB::query("SELECT count(distinct pid) FROM profile_mentor_term"); - $page->assign('mentors_number', $res->fetchOneCell()); - - $page->addJsLink('jquery.autocomplete.js'); - - // On vient d'un formulaire - require_once 'ufbuilder.inc.php'; - $ufb = new UFB_MentorSearch(); - if (!$ufb->isEmpty()) { - require_once 'userset.inc.php'; - $ufc = $ufb->getUFC(); - $set = new ProfileSet($ufc); - $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'); - } - - function handler_ref_sect(&$page, $sect) - { - pl_content_headers("text/html"); - $page->changeTpl('include/field.select.tpl', NO_SKIN); - $page->assign('onchange', 'setSSectors()'); - $page->assign('id', 'ssect_field'); - $page->assign('name', 'subSector'); - $it = XDB::iterator("SELECT pjsse.id, pjsse.name AS field - FROM profile_job_subsector_enum AS pjsse - INNER JOIN profile_mentor_sector AS pms ON (pms.sectorid = pjsse.sectorid AND pms.subsectorid = pjsse.id) - WHERE pjsse.sectorid = {?} - GROUP BY pjsse.id - ORDER BY pjsse.name", $sect); - $page->assign('list', $it); - } - - function handler_ref_country(&$page, $sect, $ssect = '') + function handler_ref_country(&$page) { pl_content_headers("text/html"); $page->changeTpl('include/field.select.tpl', NO_SKIN); $page->assign('name', 'pays_sel'); - $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.pid = mp.pid) - WHERE ms.sectorid = {?} " . $where . " GROUP BY iso_3166_1_a2 - ORDER BY countryFR", $sect, $ssect); + ORDER BY countryFR"); $page->assign('list', $it); } @@ -687,7 +561,7 @@ class ProfileModule extends PLModule $joins = JobTerms::token_join_query($tokens, 'e'); if ($type == 'mentor') { $count = ', COUNT(DISTINCT pid) AS nb'; - $countjoin = ' LEFT JOIN profile_job_term_relation AS r ON(r.jtid_1 = e.jtid) LEFT JOIN profile_mentor_term AS m ON(r.jtid_2 = m.jtid)'; + $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 = ''; @@ -730,7 +604,7 @@ class ProfileModule extends PLModule FROM group_members AS m INNER JOIN groups AS a ON(m.asso_id = a.id) LEFT JOIN group_events 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')); + WHERE m.uid = {?} GROUP BY m.asso_id ORDER BY a.nom', S::i('uid')); $page->assign('assos', $req->fetchAllAssoc()); } @@ -876,16 +750,6 @@ class ProfileModule extends PLModule $table_editor->describe('text','intitulé',true); $table_editor->apply($page, $action, $id); } - function handler_admin_sectors(&$page, $action = 'list', $id = null) { - $page->setTitle('Administration - Secteurs'); - $page->assign('title', 'Gestion des secteurs'); - $table_editor = new PLTableEditor('admin/sectors', 'profile_job_subsubsector_enum', 'id', true); - $table_editor->describe('sectorid', 'id du secteur', false); - $table_editor->describe('subsectorid', 'id du sous-secteur', false); - $table_editor->describe('name', 'nom', true); - $table_editor->describe('flags', 'affichage', true); - $table_editor->apply($page, $action, $id); - } function handler_admin_networking(&$page, $action = 'list', $id = null) { $page->assign('xorg_title', 'Polytechnique.org - Administration - Networking'); $page->assign('title', 'Gestion des types de networking');