X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=61d1596b0bec2c58e90115a45986140cc1887fe0;hb=1c0419d6b4c94643bfa7bed9a6b435bbdbbae02f;hp=40bff748db8f40fa5bb293e3f8042a9ae01ac079;hpb=7988f7d68c04cd73cb170e3a4db58427297ea3ec;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index 40bff74..61d1596 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -48,10 +48,10 @@ class ProfileModule extends PLModule '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), '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), @@ -76,7 +76,9 @@ class ProfileModule extends PLModule ); } - /* XXX COMPAT */ + /* Function needed for compatibility reasons. + * TODO: removes calls to fiche.php?user=blah.machin.2083 and then removes this. + */ function handler_fiche(&$page) { return $this->handler_profile($page, Env::v('user')); @@ -91,7 +93,7 @@ class ProfileModule extends PLModule // Retrieve the photo and its mime type. if ($req && S::logged()) { include 'validations.inc.php'; - $myphoto = PhotoReq::get_request($profile->owner()->id()); + $myphoto = PhotoReq::get_request($profile->id()); $photo = PlImage::fromData($myphoto->data, $myphoto->mimetype); } else { $photo = $profile->getPhoto(true, true); @@ -120,7 +122,7 @@ class ProfileModule extends PLModule function handler_name_info(&$page) { - header('Content-Type: text/html; charset=utf-8'); + 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, @@ -135,31 +137,59 @@ class ProfileModule extends PLModule { $res = XDB::query("SELECT icon FROM profile_networking_enum - WHERE network_type = {?}", + WHERE nwid = {?}", $mid); $img = dirname(__FILE__) . '/../htdocs/images/networking/' . $res->fetchOneCell(); - $type = mime_content_type($img); - header("Content-Type: $type"); + pl_cached_content_headers(mime_content_type($img)); echo file_get_contents($img); exit; } - function handler_photo_change(&$page) + /** Tries to return the correct user from given hrpid + * Will redirect to $returnurl$hrpid if $hrpid was empty + */ + private function findProfile($returnurl, $hrpid = null) + { + if (is_null($hrpid)) { + $user = S::user(); + if (!$user->hasProfile()) { + return PL_NOT_FOUND; + } else { + pl_redirect($returnurl . $user->profile()->hrid()); + } + } else { + $profile = Profile::get($hrpid); + if (!$profile) { + return PL_NOT_FOUND; + } else if (!S::user()->canEdit($profile) && Platal::notAllowed()) { + return PL_FORBIDDEN; + } + } + return $profile; + } + + function handler_photo_change(&$page, $hrpid = null) { global $globals; + $profile = $this->findProfile('photo/change/', $hrpid); + if (! ($profile instanceof Profile) && ($profile == PL_NOT_FOUND || $profile == PL_FORBIDDEN)) { + return $profile; + } + $page->changeTpl('profile/trombino.tpl'); + $page->assign('hrpid', $profile->hrid()); require_once('validations.inc.php'); - $trombi_x = '/home/web/trombino/photos' . S::v('promo') . '/' . S::user()->login() . '.jpg'; + $trombi_x = '/home/web/trombino/photos' . $profile->promo() . '/' . $profile->hrid() . '.jpg'; if (Env::has('upload')) { S::assert_xsrf_token(); - $upload = new PlUpload(S::user()->login(), 'photo'); + $upload = new PlUpload($profile->hrid(), '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::user(), $upload); + $myphoto = new PhotoReq(S::user(), $profile, $upload); if ($myphoto->isValid()) { $myphoto->submit(); } @@ -167,9 +197,9 @@ class ProfileModule extends PLModule } elseif (Env::has('trombi')) { S::assert_xsrf_token(); - $upload = new PlUpload(S::user()->login(), 'photo'); + $upload = new PlUpload($profile->hrid(), 'photo'); if ($upload->copyFrom($trombi_x)) { - $myphoto = new PhotoReq(S::user(), $upload); + $myphoto = new PhotoReq(S::user(), $profile, $upload); if ($myphoto->isValid()) { $myphoto->commit(); $myphoto->clean(); @@ -180,25 +210,25 @@ class ProfileModule extends PLModule XDB::execute('DELETE FROM profile_photos WHERE pid = {?}', - S::user()->profile()->id()); + $profile->id()); XDB::execute("DELETE FROM requests - WHERE uid = {?} AND type = 'photo'", - S::v('uid')); + WHERE pid = {?} AND type = 'photo'", + $profile->id()); $globals->updateNbValid(); $page->trigSuccess("Ta photo a bien été supprimée. Elle ne sera plus visible sur le site dans au plus une heure."); } elseif (Env::v('cancel')) { S::assert_xsrf_token(); $sql = XDB::query("DELETE FROM requests - WHERE uid = {?} AND type = 'photo'", - S::v('uid')); + WHERE pid = {?} AND type = 'photo'", + $profile->id()); $globals->updateNbValid(); } $sql = XDB::query("SELECT COUNT(*) FROM requests - WHERE uid = {?} AND type = 'photo'", - S::v('uid')); + WHERE pid = {?} AND type = 'photo'", + $profile->id()); $page->assign('submited', $sql->fetchOneCell()); $page->assign('has_trombi_x', file_exists($trombi_x)); } @@ -210,7 +240,7 @@ class ProfileModule extends PLModule if (is_null($id)) { return PL_NOT_FOUND; } - $pid = (!is_numeric($id) || S::has_perms()) ? Profile::getPID($id) : null; + $pid = (!is_numeric($id) || S::admin()) ? Profile::getPID($id) : null; if (is_null($pid)) { if (S::logged()) { $page->trigError($id . " inconnu dans l'annuaire."); @@ -231,6 +261,11 @@ class ProfileModule extends PLModule $view = 'private'; } + // Display pending picture + if (S::logged() && Env::v('modif') == 'new') { + $page->assign('with_pending_pic', true); + } + // 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); @@ -248,12 +283,12 @@ class ProfileModule extends PLModule $page->setTitle($profile->fullName()); // Determines and displays the virtual alias. - if (!is_null($owner)) { + if (!is_null($owner) && $profile->alias_pub == 'public') { $page->assign('virtualalias', $owner->emailAlias()); } - $page->assign_by_ref('p', $profile); - $page->assign_by_ref('o', $owner); + $page->assign_by_ref('profile', $profile); + $page->assign_by_ref('owner', $owner); $page->assign('view', $view); $page->assign('logged', S::logged()); @@ -273,46 +308,35 @@ class ProfileModule extends PLModule http_redirect("http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&ancc_id=" . $user->ax_id); } - function handler_p_edit(&$page, $user = null, $opened_tab = null, $mode = null, $success = null) + function handler_p_edit(&$page, $hrpid = null, $opened_tab = null, $mode = null, $success = null) { global $globals; - 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; - } + $profile = $this->findProfile('profile/edit/', $hrpid); + if (! ($profile instanceof Profile) && ($profile == PL_NOT_FOUND || $profile == PL_FORBIDDEN)) { + return $profile; } // Build the page $page->addJsLink('ajax.js'); - $page->addJsLink('education.js'); /* dynamic content */ - $page->addJsLink('grades.js'); /* dynamic content */ + $page->addJsLink('education.js', false); /* dynamic content */ + $page->addJsLink('grades.js', false); /* dynamic content */ $page->addJsLink('profile.js'); $page->addJsLink('jquery.autocomplete.js'); $wiz = new PlWizard('Profil', PlPage::getCoreTpl('plwizard.tpl'), true, true, false); - $wiz->addUserData('profile', $user); - $wiz->addUserData('owner', $user->owner()); + $wiz->addUserData('profile', $profile); + $wiz->addUserData('owner', $profile->owner()); $this->load('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/' . $user->hrid(), $opened_tab, $mode); - - if (!$user->birthdate) { + $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->apply($page, 'profile/edit/' . $profile->hrid(), $opened_tab, $mode); + + if (!$profile->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."); } @@ -335,7 +359,7 @@ class ProfileModule extends PLModule pl_cached_content_headers("text/javascript", "utf-8"); $page->changeTpl('profile/grades.js.tpl', NO_SKIN); $res = XDB::iterator("SELECT * - FROM profile_medal_enum_grades + FROM profile_medal_grade_enum ORDER BY mid, pos"); $grades = array(); while ($tmp = $res->next()) { @@ -373,7 +397,7 @@ class ProfileModule extends PLModule function handler_ajax_edu(&$page, $eduid, $class) { - header('Content-Type: text/html; charset=utf-8'); + pl_content_headers("text/html"); $page->changeTpl('profile/general.edu.tpl', NO_SKIN); $res = XDB::iterator("SELECT id, field FROM profile_education_field_enum @@ -425,7 +449,7 @@ class ProfileModule extends PLModule function handler_ajax_sub_sector(&$page, $id, $ssect, $sssect = -1) { - header('Content-Type: text/html; charset=utf-8'); + pl_content_headers("text/html"); $res = XDB::iterator("SELECT id, name FROM profile_job_subsubsector_enum WHERE subsectorid = {?}", $ssect); @@ -437,17 +461,20 @@ class ProfileModule extends PLModule function handler_ajax_alternates(&$page, $id, $sssect) { - header('Content-Type: text/html; charset=utf-8'); + 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); - $alternate = $res->next(); - $alternates = $alternate['name']; - while ($alternate = $res->next()) { - $alternates .= ', ' . $alternate['name']; + $alternates = ''; + if ($res->total() > 0) { + $alternate = $res->next(); + $alternates = $alternate['name']; + while ($alternate = $res->next()) { + $alternates .= ', ' . $alternate['name']; + } } $page->assign('alternates', $alternates); } @@ -472,94 +499,40 @@ class ProfileModule extends PLModule } } - function handler_ajax_searchname(&$page, $id) + function handler_ajax_searchname(&$page, $id, $isFemale) { - header('Content-Type: text/html; charset=utf-8'); + 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->assign('isFemale', $isFemale); $page->assign('i', $id); } - function handler_ajax_buildnames(&$page, $data) + function handler_ajax_buildnames(&$page, $data, $isFemale) { - header('Content-Type: text/html; charset=utf-8'); + pl_content_headers("text/html"); $page->changeTpl('profile/general.buildnames.tpl', NO_SKIN); require_once 'name.func.inc.php'; - $page->assign('names', build_javascript_names($data)); + $page->assign('names', build_javascript_names($data, $isFemale)); } - function handler_p_orange(&$page, $pid = null) - { - $page->changeTpl('profile/orange.tpl'); - - require_once 'validations.inc.php'; - $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; - } else { - S::assert_xsrf_token(); - } - - $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->trigWarning('Tu appartiens déjà à la promotion correspondante à cette année de sortie.'); - } elseif ($promo_sortie == $promo + 3) { - XDB::execute('UPDATE profile_education - SET grad_year = {?} - WHERE pid = {?} 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::user(), $promo_sortie); - $myorange->submit(); - $page->assign('myorange', $myorange); - } - } - } - - function handler_referent(&$page, $user) + function handler_referent(&$page, $pf) { $page->changeTpl('profile/fiche_referent.tpl', SIMPLE); - $user = Profile::get($user); - if (!$user) { + $pf = Profile::get($pf); + if (!$pf) { return PL_NOT_FOUND; } - $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())); + $page->assign_by_ref('profile', $pf); ///// recuperations infos referent - //expertise - $res = XDB::query('SELECT expertise - FROM profile_mentor - WHERE pid = {?}', $user->id()); - $page->assign('expertise', $res->fetchOneCell()); - // Sectors $sectors = $subSectors = Array(); $res = XDB::iterRow( @@ -567,7 +540,7 @@ class ProfileModule extends PLModule 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 = {?}", $user->id()); + WHERE pid = {?}", $pf->id()); while (list($sector, $subSector) = $res->next()) { $sectors[] = $sector; $subSectors[] = $subSector; @@ -580,7 +553,7 @@ class ProfileModule extends PLModule "SELECT gc.countryFR FROM profile_mentor_country AS m LEFT JOIN geoloc_countries AS gc ON (m.country = gc.iso_3166_1_a2) - WHERE pid = {?}", $user->id()); + WHERE pid = {?}", $pf->id()); $page->assign('pays', $res->fetchColumn()); $page->addJsLink('close_on_esc.js'); @@ -591,11 +564,14 @@ class ProfileModule extends PLModule $wp = new PlWikiPage('Docs.Emploi'); $wp->buildCache(); - $page->setTitle('Conseil Pro'); + $page->setTitle('Emploi et Carrières'); // Retrieval of sector names - $sectors = DirEnum::getOptions(DirEnum::SECTORS); - $sectors[''] = ''; + $sectors = XDB::fetchAllAssoc('id', 'SELECT pjse.id, pjse.name + FROM profile_job_sector_enum AS pjse + INNER JOIN profile_mentor_sector AS pms ON (pms.sectorid = pjse.id) + GROUP BY pjse.id + ORDER BY pjse.name'); $page->assign_by_ref('sectors', $sectors); // nb de mentors @@ -626,9 +602,12 @@ class ProfileModule extends PLModule $page->assign('onchange', 'setSSectors()'); $page->assign('id', 'ssect_field'); $page->assign('name', 'subSector'); - $it = XDB::iterator("SELECT id, name AS field - FROM profile_job_subsector_enum - WHERE sectorid = {?}", $sect); + $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); } @@ -776,7 +755,7 @@ class ProfileModule extends PLModule function handler_admin_education_degree(&$page, $action = 'list', $id = null) { $page->setTitle('Administration - Niveau de formation'); $page->assign('title', 'Gestion des niveau de formation'); - $table_editor = new PLTableEditor('admin/education_degree', 'profile_education_degree_enum', 'id', true); + $table_editor = new PLTableEditor('admin/education_degree', 'profile_education_degree_enum', 'id'); $table_editor->add_join_table('profile_education_degree', 'degreeid', true); $table_editor->add_join_table('profile_education', 'degreeid', true); $table_editor->describe('degree', 'niveau', true); @@ -786,8 +765,16 @@ class ProfileModule extends PLModule $page->setTitle('Administration - Correspondances formations - niveau de formation'); $page->assign('title', 'Gestion des correspondances formations - niveau de formation'); $table_editor = new PLTableEditor('admin/education_degree_set', 'profile_education_degree', 'eduid', true); - $table_editor->describe('eduid', 'formation', true); - $table_editor->describe('degreeid', 'niveau', true); + $table_editor->describe('eduid', 'id formation', true); + $table_editor->describe('degreeid', 'id niveau', true); + + // Adds fields to show the names of education + $table_editor->add_option_table('profile_education_enum','profile_education_enum.id = eduid'); + $table_editor->add_option_field('profile_education_enum.name', 'edu_name', 'formation', null, 'degreeid'); + // Adds fields to show the names of degrees + $table_editor->add_option_table('profile_education_degree_enum','profile_education_degree_enum.id = t.degreeid'); + $table_editor->add_option_field('profile_education_degree_enum.degree', 'degree_name', 'niveau'); + $table_editor->apply($page, $action, $id); } function handler_admin_sections(&$page, $action = 'list', $id = null) { @@ -810,7 +797,7 @@ class ProfileModule extends PLModule 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'); - $table_editor = new PLTableEditor('admin/networking', 'profile_networking_enum', 'network_type'); + $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('filter', 'filtre', true); @@ -848,29 +835,29 @@ class ProfileModule extends PLModule $mid = $id; if (Post::v('act') == 'del') { - XDB::execute('DELETE FROM profile_medal_enum_grades + XDB::execute('DELETE FROM profile_medal_grade_enum WHERE mid={?} AND gid={?}', $mid, Post::i('gid')); } else { foreach (Post::v('grades', array()) as $gid=>$text) { if ($gid === 0) { if (!empty($text)) { $res = XDB::query('SELECT MAX(gid) - FROM profile_medal_enum_grades + FROM profile_medal_grade_enum WHERE mid = {?}', $mid); $gid = $res->fetchOneCell() + 1; - XDB::execute('INSERT INTO profile_medal_enum_grades (mid, gid, text, pos) + XDB::execute('INSERT INTO profile_medal_grade_enum (mid, gid, text, pos) VALUES ({?}, {?}, {?}, {?})', $mid, $gid, $text, $_POST['pos']['0']); } } else { - XDB::execute('UPDATE profile_medal_enum_grades + XDB::execute('UPDATE profile_medal_grade_enum SET pos={?}, text={?} WHERE gid={?} AND mid={?}', $_POST['pos'][$gid], $text, $gid, $mid); } } } - $res = XDB::iterator('SELECT gid, text, pos FROM profile_medal_enum_grades WHERE mid={?} ORDER BY pos', $mid); + $res = XDB::iterator('SELECT gid, text, pos FROM profile_medal_grade_enum WHERE mid={?} ORDER BY pos', $mid); $page->assign('grades', $res); } }