X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=34f431d344a78be73f2ba8c4b60b8d093d480797;hb=972fd3c59f152b7f2d61f7aa30afc819f094e4aa;hp=298d49cfb10b1eb608e4357c528f53428865c854;hpb=8a43972f58f0a77015ae9e509f1c073d188874d2;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index 298d49c..34f431d 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -1,6 +1,6 @@ $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), + '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), '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), - '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), 'groupes-x' => $this->make_hook('xnet', AUTH_COOKIE), + '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'), @@ -75,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')); @@ -83,41 +86,21 @@ class ProfileModule extends PLModule function handler_photo(&$page, $x = null, $req = null) { - if (!$x || !($user = User::getSilent($x))) { + if (!$x || !($profile = Profile::get($x))) { return PL_NOT_FOUND; } // 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($user->id()); - if ($myphoto) { - $photo_data = $myphoto->data; - $photo_type = $myphoto->mimetype; - } + $myphoto = PhotoReq::get_request($profile->id()); + $photo = PlImage::fromData($myphoto->data, $myphoto->mimetype); } else { - $res = XDB::query( - "SELECT attachmime, attach, pub - FROM photo - WHERE uid = {?}", $user->id()); - list($photo_type, $photo_data, $photo_pub) = $res->fetchOneRow(); - if ($photo_pub != 'public' && !S::logged()) { - $photo_type = $photo_data = null; - } + $photo = $profile->getPhoto(true, true); } // 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; + $photo->send(); } function handler_medal(&$page, $mid) @@ -126,21 +109,20 @@ class ProfileModule extends PLModule $mid = $thumb ? @func_get_arg(2) : $mid; $res = XDB::query("SELECT img - FROM profile_medals + FROM profile_medal_enum 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"); + pl_cached_content_headers(mime_content_type($img)); echo file_get_contents($img); exit; } 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, @@ -155,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(); } @@ -187,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(); @@ -198,194 +208,139 @@ class ProfileModule extends PLModule } elseif (Env::v('suppr')) { S::assert_xsrf_token(); - 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 profile_photos + WHERE pid = {?}', + $profile->id()); + XDB::execute("DELETE FROM requests + 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 user_id={?} AND type="photo"', - S::v('uid')); + $sql = XDB::query("DELETE FROM requests + WHERE pid = {?} AND type = 'photo'", + $profile->id()); $globals->updateNbValid(); } - $sql = XDB::query('SELECT COUNT(*) + $sql = XDB::query("SELECT COUNT(*) FROM requests - WHERE user_id={?} 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)); } - function handler_profile(&$page, $x = null) + function handler_profile(&$page, $id = 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)) { + // Checks if the identifier corresponds to an actual profile. Numeric + // identifiers canonly be user by logged users. + if (is_null($id)) { return PL_NOT_FOUND; } - - $login = S::logged() ? User::get($x) : User::getSilent($x); - if (!$login) { + $pid = (!is_numeric($id) || S::admin()) ? Profile::getPID($id) : null; + if (is_null($pid)) { + if (S::logged()) { + $page->trigError($id . " 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. + // Now that we know this is an existing profile, we can switch to the + // appropriate template. $page->changeTpl('profile/profile.tpl', SIMPLE); - require_once 'user.func.inc.php'; // 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'; } - // Determines is the user is registered, and fetches the user infos in - // the appropriate way. - $res = XDB::query("SELECT perms IN ('admin','user','disabled') - FROM auth_user_md5 - WHERE user_id = {?}", $login->id()); - if ($res->fetchOneCell()) { - $new = Env::v('modif') == 'new'; - $user = get_user_details($login->login(), S::v('uid'), $view); - } else { - $new = false; - $user = array(); - if (S::logged()) { - pl_redirect('marketing/public/' . $login->login()); - } + // 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); + $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()) { - S::logger()->log('view_profile', $login->login()); + S::logger()->log('view_profile', $profile->hrid()); } // Sets the title of the html page. - $page->setTitle($login->fullName()); - - // Prepares the display of the user's mugshot. - $photo = 'photo/' . $login->login() . ($new ? '/req' : ''); - if (!isset($user['photo_pub']) || !has_user_right($user['photo_pub'], $view)) { - $photo = ""; - } - $page->assign('photo_url', $photo); + $page->setTitle($profile->fullName()); - if (!isset($user['y']) and !isset($user['x'])) { - list($user['x'], $user['y']) = getimagesize("images/none.png"); - } - if (!isset($user['y']) or $user['y'] < 1) $user['y']=1; - if (!isset($user['x']) or $user['x'] < 1) $user['x']=1; - if ($user['x'] > 240) { - $user['y'] = (integer)($user['y']*240/$user['x']); - $user['x'] = 240; - } - if ($user['y'] > 300) { - $user['x'] = (integer)($user['x']*300/$user['y']); - $user['y'] = 300; - } - if ($user['x'] < 160) { - $user['y'] = (integer)($user['y']*160/$user['x']); - $user['x'] = 160; + // Determines and displays the virtual alias. + if (!is_null($owner) && $profile->alias_pub == 'public') { + $page->assign('virtualalias', $owner->emailAlias()); } - // Determines and displays the virtual alias. - global $globals; - $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}'", - $login->id(), - $login->forlifeEmail(), - // TODO(vzanotti): get ride of all @m4x.org addresses in the - // virtual redirect base, and remove this über-ugly hack. - $login->login() . '@' . $globals->mail->domain2); - $page->assign('virtualalias', $res->fetchOneCell()); - - // Adds miscellaneous properties to the display. - // Adds the global user property array to the display. - $page->assign_by_ref('x', $user); - $page->assign_by_ref('user', $login); - $page->assign('logged', has_user_right('private', $view)); + $page->assign_by_ref('profile', $profile); + $page->assign_by_ref('owner', $owner); $page->assign('view', $view); + $page->assign('logged', S::logged()); $page->addJsLink('close_on_esc.js'); - if (isset($user['date'])) { - header('Last-Modified: ' . date('r', strtotime($user['date']))); - } + header('Last-Modified: ' . date('r', strtotime($profile->last_change))); } function handler_ax(&$page, $user = null) { - $user = User::get($user); + $user = Profile::get($user); if (!$user) { return PL_NOT_FOUND; } - - $res = XDB::query("SELECT matricule_ax - FROM auth_user_md5 - WHERE user_id = {?}", $user->id()); - $mat = $res->fetchOneCell(); - if (!intval($mat)) { - $page->kill("Le matricule AX de {$user->login()} 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&ancc_id=" . $user->ax_id); } - function handler_p_edit(&$page, $opened_tab = null, $mode = null, $success = null) + function handler_p_edit(&$page, $hrpid = null, $opened_tab = null, $mode = null, $success = 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::user()->login(), S::v('uid')); - $page->trigSuccess('Ton profil a été synchronisé avec celui du site polytechniciens.com'); + $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'); - $page->addJsLink('grades.js'); + $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); + $wiz = new PlWizard('Profil', PlPage::getCoreTpl('plwizard.tpl'), true, true, false); + $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', $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()) { + $wiz->addPage('ProfileSettingGeneral', 'Général', 'general'); + $wiz->addPage('ProfileSettingAddresses', 'Adresses personnelles', 'adresses'); + $wiz->addPage('ProfileSettingJobs', 'Informations professionnelles', 'emploi'); + if (S::user()->checkPerms(User::PERM_DIRECTORY_PRIVATE)) { + $wiz->addPage('ProfileSettingGroups', 'Groupes X - Binets', 'poly'); + } + $wiz->addPage('ProfileSettingDecos', 'Décorations - Medailles', 'deco'); + if (S::user()->checkPerms(User::PERM_DIRECTORY_PRIVATE)) { + $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."); } @@ -398,25 +353,17 @@ class ProfileModule extends PLModule function handler_education_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'); + pl_cached_content_headers("text/javascript", "utf-8"); $page->changeTpl('profile/education.js.tpl', NO_SKIN); - require_once "education.func.inc.php"; + require_once 'education.func.inc.php'; } 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'); + pl_cached_content_headers("text/javascript", "utf-8"); $page->changeTpl('profile/grades.js.tpl', NO_SKIN); $res = XDB::iterator("SELECT * - FROM profile_medals_grades + FROM profile_medal_grade_enum ORDER BY mid, pos"); $grades = array(); while ($tmp = $res->next()) { @@ -425,7 +372,7 @@ class ProfileModule extends PLModule $page->assign('grades', $grades); $res = XDB::iterator("SELECT *, FIND_IN_SET('validation', flags) AS validate - FROM profile_medals + FROM profile_medal_enum ORDER BY type, text"); $mlist = array(); while ($tmp = $res->next()) { @@ -436,7 +383,7 @@ class ProfileModule extends PLModule function handler_ajax_address(&$page, $id) { - header('Content-Type: text/html; charset=utf-8'); + pl_content_headers("text/html"); $page->changeTpl('profile/adresses.address.tpl', NO_SKIN); $page->assign('i', $id); $page->assign('address', array()); @@ -444,17 +391,18 @@ class ProfileModule extends PLModule function handler_ajax_tel(&$page, $prefid, $prefname, $telid) { - header('Content-Type: text/html; charset=utf-8'); + pl_content_headers("text/html"); $page->changeTpl('profile/phone.tpl', NO_SKIN); $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) { - 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 @@ -467,7 +415,7 @@ class ProfileModule extends PLModule function handler_ajax_medal(&$page, $id) { - header('Content-Type: text/html; charset=utf-8'); + pl_content_headers("text/html"); $page->changeTpl('profile/deco.medal.tpl', NO_SKIN); $page->assign('id', $id); $page->assign('medal', array('valid' => 0, 'grade' => 0)); @@ -475,7 +423,7 @@ class ProfileModule extends PLModule function handler_ajax_job(&$page, $id) { - header('Content-Type: text/html; charset=utf-8'); + pl_content_headers("text/html"); $page->changeTpl('profile/jobs.job.tpl', NO_SKIN); $page->assign('i', $id); $page->assign('job', array()); @@ -489,7 +437,7 @@ class ProfileModule extends PLModule function handler_ajax_sector(&$page, $id, $jobid, $jobpref, $sect, $ssect = -1) { - header('Content-Type: text/html; charset=utf-8'); + 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); @@ -503,10 +451,9 @@ class ProfileModule extends PLModule $page->assign('jobpref', $jobpref); } } - 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); @@ -516,26 +463,46 @@ class ProfileModule extends PLModule $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. + * @param $page the Platal page + * @param $filter filter helps to display only jobterms that are contained in jobs or in mentors + * + * @param Env::i('jtid') job term id of the parent branch, if none trunk will be used + * @param Env::v('attrfunc') the name of a javascript function that will be called when a branch + * is chosen + * @param Env::v('treeid') tree id that will be given as first argument of attrfunc function + * the second argument will be the chosen job term id and the third one the chosen job full name. + */ + function handler_ajax_tree_job_terms(&$page, $filter = JobTerms::ALL) + { + JobTerms::ajaxGetBranch(&$page, $filter); + } + 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); } function handler_ajax_skill(&$page, $cat, $id) { - header('Content-Type: text/html; charset=utf-8'); + pl_content_headers("text/html"); $page->changeTpl('profile/skill.skill.tpl', NO_SKIN); $page->assign('cat', $cat); $page->assign('id', $id); @@ -553,102 +520,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)); - } - - function handler_p_orange(&$page) - { - $page->changeTpl('profile/orange.tpl'); - - require_once 'validations.inc.php'; - - $res = XDB::query("SELECT e.entry_year, e.grad_year, d.promo, FIND_IN_SET('femme', u.flags) AS sexe - FROM auth_user_md5 AS u - INNER JOIN profile_display AS d ON (d.pid = u.user_id) - INNER JOIN profile_education AS e ON (e.uid = u.user_id AND FIND_IN_SET('primary', e.flags)) - WHERE u.user_id = {?}", S::v('uid')); - - list($promo, $promo_sortie_old, $promo_display, $sexe) = $res->fetchOneRow(); - $page->assign('promo_sortie_old', $promo_sortie_old); - $page->assign('promo', $promo); - $page->assign('promo_display', $promo_display); - $page->assign('sexe', $sexe); - - if (!Env::has('promo_sortie')) { - return; - } else { - S::assert_xsrf_token(); - } - - $promo_sortie = Env::i('promo_sortie'); - - 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 uid = {?} AND FIND_IN_SET('primary', flags)", $promo_sortie, S::v('uid')); - $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); - } - } + $page->assign('names', build_javascript_names($data, $isFemale)); } - function handler_referent(&$page, $x = null) + function handler_referent(&$page, $pf) { - require_once 'user.func.inc.php'; $page->changeTpl('profile/fiche_referent.tpl', SIMPLE); - $user = User::get($x); - if ($user == null) { + $pf = Profile::get($pf); + if (!$pf) { return PL_NOT_FOUND; } - $res = XDB::query("SELECT cv FROM auth_user_md5 WHERE user_id = {?}", $user->id()); - $cv = $res->fetchOneCell(); - - $page->assign_by_ref('user', $user); - $page->assign('cv', MiniWiki::WikiToHTML($cv, true)); - $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 uid = {?}", $user->id()); - $page->assign('expertise', $res->fetchOneCell()); - // Sectors $sectors = $subSectors = Array(); $res = XDB::iterRow( @@ -656,7 +561,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 uid = {?}", $user->id()); + WHERE pid = {?}", $pf->id()); while (list($sector, $subSector) = $res->next()) { $sectors[] = $sector; $subSectors[] = $subSector; @@ -669,97 +574,123 @@ 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 uid = {?}", $user->id()); + WHERE pid = {?}", $pf->id()); $page->assign('pays', $res->fetchColumn()); $page->addJsLink('close_on_esc.js'); } - function handler_ref_search(&$page, $action = null, $subaction = null) - { - $wp = new PlWikiPage('Docs.Emploi'); - $wp->buildCache(); - - $page->setTitle('Conseil Pro'); - - // Retrieval of sector names - $res = XDB::iterRow("SELECT id, name AS label - FROM profile_job_sector_enum"); - $sectors[''] = ''; - while (list($tmp_id, $tmp_label) = $res->next()) { - $sectors[$tmp_id] = $tmp_label; - } - $page->assign_by_ref('sectors', $sectors); - - // nb de mentors - $res = XDB::query("SELECT count(*) FROM profile_mentor"); - $page->assign('mentors_number', $res->fetchOneCell()); - - // On vient d'un formulaire - $where = array(); - $pays_sel = XDB::escape(Env::v('pays_sel')); - $sectorSelection = XDB::escape(Env::v('sector')); - $subSectorSelection = XDB::escape(Env::v('subSector')); - $expertise_champ = XDB::escape(Env::v('expertise')); - - if ($pays_sel != "''") { - $where[] = "mp.country = $pays_sel"; - } - if ($sectorSelection != "''") { - $where[] = "ms.sectorid = " . $sectorSelection; - if ($selectedSubSector != "''") { - $where[] = "ms.subsectorid = " . $subSectorSelection; - } - } - if ($expertise_champ != "''") { - $where[] = "MATCH(m.expertise) AGAINST($expertise_champ)"; - } - - if ($where) { - $where = join(' AND ', $where); - - $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); - if ($set->count() > 100) { - $page->assign('recherche_trop_large', true); - } - } - $page->changeTpl('profile/referent.tpl'); - } - function handler_ref_sect(&$page, $sect) { - header('Content-Type: text/html; charset=utf-8'); + 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 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); } function handler_ref_country(&$page, $sect, $ssect = '') { - header('Content-Type: text/html; charset=utf-8'); + 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.uid = mp.uid) + 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); $page->assign('list', $it); } + /** + * Page for url "referent/autocomplete". Display an "autocomplete" page (plain/text with values + * separated by "|" chars) for jobterms in referent (mentor) search. + * @see handler_jobterms + */ + function handler_ref_autocomplete(&$page) + { + $this->handler_jobterms(&$page, 'mentor'); + } + + /** + * Page for url "profile/jobterms" (function also used for "referent/autocomplete" @see + * handler_ref_autocomplete). Displays an "autocomplete" page (plain text with values + * separated by "|" chars) for jobterms to add in profile. + * @param $page the Platal page + * @param $type set to 'mentor' to display the number of mentors for each term and order + * by descending number of mentors. + * + * @param Env::v('q') the text that has been typed and to complete automatically + */ + function handler_jobterms(&$page, $type = 'nomentor') + { + pl_content_headers("text/plain"); + + $q = Env::v('q').'%'; + $tokens = JobTerms::tokenize($q); + if (count($tokens) == 0) { + exit; + } + sort($tokens); + $q_normalized = implode(' ', $tokens); + + // try to look in cached results + $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, '; + } 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"; + } else { + $res .= $result['field'].'|'; + if ($count) { + $res .= $result['nb'].'|'; + } + $res .= $result['id']; + } + $res .= "\n"; + } + XDB::query('REPLACE INTO search_autocomplete + VALUES ({?}, {?}, {?}, NOW())', + $type, $q_normalized, $res); + echo $res; + exit(); + } + function handler_xnet(&$page) { $page->changeTpl('profile/groupesx.tpl'); @@ -768,13 +699,35 @@ class ProfileModule extends PLModule $req = XDB::query(' 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 - 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) + 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')); $page->assign('assos', $req->fetchAllAssoc()); } + function handler_xnetlogo(&$page, $id) + { + if (is_null($id)) { + return PL_NOT_FOUND; + } + + $res = XDB::query('SELECT logo, logo_mime + FROM groups + WHERE id = {?}', $id); + list($logo, $logo_mime) = $res->fetchOneRow(); + + if (!empty($logo)) { + pl_cached_dynamic_content_headers($logo_mime); + echo $logo; + } else { + pl_cached_dynamic_content_headers("image/jpeg"); + readfile(dirname(__FILE__) . '/../htdocs/images/dflt_carre.jpg'); + } + + exit; + } + function handler_vcard(&$page, $x = null) { if (is_null($x)) { @@ -788,7 +741,7 @@ class ProfileModule extends PLModule } $vcard = new VCard(); - $vcard->addUser($x); + $vcard->addProfile(Profile::get($x)); $vcard->show(); } @@ -804,10 +757,8 @@ class ProfileModule extends PLModule switch ($action) { case "original": - header("Content-type: image/jpeg"); - readfile("/home/web/trombino/photos" . $user->promo() . "/" . $user->login() . ".jpg"); + PlImage::fromFile("/home/web/trombino/photos" . $user->promo() . "/" . $user->login() . ".jpg", "image/jpeg")->send(); exit; - break; case "new": S::assert_xsrf_token(); @@ -817,14 +768,14 @@ class ProfileModule extends PLModule $mimetype = substr($_FILES['userfile']['type'], 6); unlink($_FILES['userfile']['tmp_name']); XDB::execute( - "REPLACE INTO photo SET uid={?}, attachmime = {?}, attach={?}, x={?}, y={?}", - $user->id(), $mimetype, $data, $x, $y); + "REPLACE INTO profile_photos SET pid={?}, attachmime = {?}, attach={?}, x={?}, y={?}", + $user->profile()->id(), $mimetype, $data, $x, $y); break; case "delete": S::assert_xsrf_token(); - XDB::execute('DELETE FROM photo WHERE uid = {?}', $user->id()); + XDB::execute('DELETE FROM profile_photos WHERE pid = {?}', $user->profile()->id()); break; } } @@ -842,8 +793,8 @@ class ProfileModule extends PLModule function handler_admin_binets(&$page, $action = 'list', $id = null) { $page->setTitle('Administration - Binets'); $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 = new PLTableEditor('admin/binets', 'profile_binet_enum', 'id'); + $table_editor->add_join_table('profile_binets','binet_id',true); $table_editor->describe('text','intitulé',true); $table_editor->apply($page, $action, $id); } @@ -868,7 +819,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); @@ -878,14 +829,22 @@ 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) { $page->setTitle('Administration - Sections'); $page->assign('title', 'Gestion des sections'); - $table_editor = new PLTableEditor('admin/sections','sections','id'); + $table_editor = new PLTableEditor('admin/sections','profile_section_enum','id'); $table_editor->describe('text','intitulé',true); $table_editor->apply($page, $action, $id); } @@ -902,7 +861,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); @@ -929,7 +888,7 @@ class ProfileModule extends PLModule function handler_admin_medals(&$page, $action = 'list', $id = null) { $page->setTitle('Administration - Distinctions'); $page->assign('title', 'Gestion des Distinctions'); - $table_editor = new PLTableEditor('admin/medals','profile_medals','id'); + $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('flags', 'valider', true); @@ -940,29 +899,29 @@ class ProfileModule extends PLModule $mid = $id; if (Post::v('act') == 'del') { - XDB::execute('DELETE FROM profile_medals_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_medals_grades + FROM profile_medal_grade_enum WHERE mid = {?}', $mid); $gid = $res->fetchOneCell() + 1; - XDB::execute('INSERT INTO profile_medals_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_medals_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_medals_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); } }