<?php
/***************************************************************************
- * Copyright (C) 2003-2011 Polytechnique.org *
+ * Copyright (C) 2003-2014 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
{
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/ax' => $this->make_hook('ax', AUTH_COOKIE, 'admin'),
- 'profile/edit' => $this->make_hook('p_edit', AUTH_MDP),
+ '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_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_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'),
);
}
/* Function needed for compatibility reasons.
* TODO: removes calls to fiche.php?user=blah.machin.2083 and then removes this.
*/
- function handler_fiche(&$page)
+ function handler_fiche($page)
{
return $this->handler_profile($page, Env::v('user'));
}
- function handler_photo(&$page, $x = null, $req = null)
+ function handler_photo($page, $x = null, $req = null)
{
if (!$x || !($profile = Profile::get($x))) {
return PL_NOT_FOUND;
$photo->send();
}
- function handler_medal(&$page, $mid)
+ function handler_medal($page, $mid)
{
$thumb = ($mid == 'thumb');
$mid = $thumb ? @func_get_arg(2) : $mid;
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)
+ function handler_networking($page, $mid)
{
$res = XDB::query("SELECT icon
FROM profile_networking_enum
if (!$user->hasProfile()) {
return PL_NOT_FOUND;
} else {
- $profile = $user->profile();
+ $profile = $user->profile(false,0,Visibility::get(Visibility::VIEW_ADMIN));
}
} else {
- $profile = Profile::get($hrpid);
+ $profile = Profile::get($hrpid,0,Visibility::get(Visibility::VIEW_ADMIN));
}
if (!$profile) {
return $profile;
}
- function handler_photo_change(&$page, $hrpid = null)
+ function handler_photo_change($page, $hrpid = null)
{
global $globals;
$profile = $this->findProfile($hrpid);
$page->assign('has_trombi_x', file_exists($trombi_x));
}
- function handler_profile(&$page, $id = null)
+ function handler_profile($page, $id = null)
{
// Checks if the identifier corresponds to an actual profile. Numeric
// identifiers canonly be user by logged users.
}
// 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';
+ // Note: VIEW_HIDDEN can NOT be selected. The admins who want to read
+ // information need to use the "edit profile" pages instead.
+ 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') {
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();
}
} 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)) {
}
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);
$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)));
}
- function handler_ax(&$page, $user = null)
+ function handler_ax($page, $user = null)
{
$user = Profile::get($user);
if (!$user) {
if (!$user->ax_id) {
$page->kill("Le matricule AX de {$user->hrid()} est inconnu");
}
- http_redirect("http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&ancc_id=" . $user->ax_id);
+ http_redirect("http://kx.polytechniciens.com/?page=AX_FICHE_ANCIEN&ancc_id=" . $user->ax_id);
}
- function handler_p_edit(&$page, $hrpid = 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 (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;
}
// 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);
$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) {
}
$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.');
}
}
- function handler_education_js(&$page)
+ function handler_education_js($page)
{
- pl_cached_content_headers("text/javascript", "utf-8");
+ pl_cached_dynamic_content_headers('text/javascript', 'utf-8');
$page->changeTpl('profile/education.js.tpl', NO_SKIN);
require_once 'education.func.inc.php';
}
- function handler_grades_js(&$page)
+ function handler_grades_js($page)
{
pl_cached_content_headers("text/javascript", "utf-8");
$page->changeTpl('profile/grades.js.tpl', NO_SKIN);
$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());
+ $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)
+ function handler_ajax_tel($page, $prefid, $prefname, $telid, $subField, $mainField, $mainId)
{
pl_content_headers("text/html");
$page->changeTpl('profile/phone.tpl', NO_SKIN);
}
}
- function handler_ajax_edu(&$page, $eduid, $class)
+ function handler_ajax_edu($page, $eduid, $class)
{
pl_content_headers("text/html");
$page->changeTpl('profile/general.edu.tpl', NO_SKIN);
require_once "education.func.inc.php";
}
- function handler_ajax_medal(&$page, $id)
+ function handler_ajax_medal($page, $i, $id)
{
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));
+ 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' => $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);
+ fill_email_combobox($page, array('redirect', 'job', 'stripped_directory'));
}
/**
* @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)
+ function handler_ajax_tree_job_terms($page, $filter = JobTerms::ALL)
{
- JobTerms::ajaxGetBranch(&$page, $filter);
+ JobTerms::ajaxGetBranch($page, $filter);
}
- function handler_ajax_skill(&$page, $cat, $id)
+ function handler_ajax_skill($page, $cat, $id)
{
pl_content_headers("text/html");
$page->changeTpl('profile/skill.skill.tpl', NO_SKIN);
}
}
- function handler_ajax_searchname(&$page, $id, $isFemale)
+ 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)
+ function handler_ajax_buildnames($page, $data, $isFemale)
{
pl_content_headers("text/html");
$page->changeTpl('profile/general.buildnames.tpl', NO_SKIN);
$page->assign('names', build_javascript_names($data, $isFemale));
}
- function handler_referent(&$page, $pf)
+ function handler_referent($page, $pf)
{
$page->changeTpl('profile/fiche_referent.tpl', SIMPLE);
return PL_NOT_FOUND;
}
+ // Referent view are logged.
+ if (S::logged()) {
+ S::logger()->log('view_referent', $pf->hrid());
+ }
+
$page->assign_by_ref('profile', $pf);
// Retrieves referents' countries.
$page->assign('pays', $res->fetchColumn());
}
- function handler_ref_country(&$page)
+ function handler_ref_country($page)
{
pl_content_headers("text/html");
$page->changeTpl('include/field.select.tpl', NO_SKIN);
* separated by "|" chars) for jobterms in referent (mentor) search.
* @see handler_jobterms
*/
- function handler_ref_autocomplete(&$page)
+ function handler_ref_autocomplete($page)
{
- $this->handler_jobterms(&$page, 'mentor');
+ $this->handler_jobterms($page, 'mentor');
}
/**
*
* @param Env::v('q') the text that has been typed and to complete automatically
*/
- function handler_jobterms(&$page, $type = 'nomentor')
+ function handler_jobterms($page, $type = 'nomentor')
{
pl_content_headers("text/plain");
- $q = Env::v('q').'%';
+ $q = Env::v('term') . '%';
$tokens = JobTerms::tokenize($q);
if (count($tokens) == 0) {
exit;
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();
}
- function handler_xnet(&$page)
+ function handler_xnet($page)
{
$page->changeTpl('profile/groupesx.tpl');
$page->setTitle('Promo, Groupes X, Binets');
$page->assign('assos', $req->fetchAllAssoc());
}
- function handler_xnetlogo(&$page, $id)
+ function handler_xnetlogo($page, $id)
{
if (is_null($id)) {
return PL_NOT_FOUND;
exit;
}
- function handler_vcard(&$page, $x = null)
+ function handler_vcard($page, $x = null)
{
if (is_null($x)) {
return PL_NOT_FOUND;
}
$vcard = new VCard();
- $vcard->addProfile(Profile::get($x));
+ $vcard->addProfile(Profile::get($x, Profile::FETCH_ALL));
$vcard->show();
}
- function handler_admin_trombino(&$page, $login = null, $action = null) {
+ function handler_admin_trombino($page, $login = null, $action = null) {
$page->changeTpl('profile/admin_trombino.tpl');
$page->setTitle('Administration - Trombino');
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) {
+ 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', 'profile_binet_enum', 'id');
$table_editor->describe('text','intitulé',true);
$table_editor->apply($page, $action, $id);
}
- function handler_admin_education(&$page, $action = 'list', $id = null) {
+ function handler_admin_education($page, $action = 'list', $id = null) {
$page->setTitle('Administration - Formations');
$page->assign('title', 'Gestion des formations');
$table_editor = new PLTableEditor('admin/education', 'profile_education_enum', 'id');
$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) {
+ function handler_admin_education_field($page, $action = 'list', $id = null) {
$page->setTitle('Administration - Domaines de formation');
$page->assign('title', 'Gestion des domaines de formation');
$table_editor = new PLTableEditor('admin/education_field', 'profile_education_field_enum', 'id', true);
$table_editor->describe('field', 'domaine', true);
$table_editor->apply($page, $action, $id);
}
- function handler_admin_education_degree(&$page, $action = 'list', $id = null) {
+ 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');
$table_editor->describe('degree', 'niveau', true);
$table_editor->apply($page, $action, $id);
}
- function handler_admin_education_degree_set(&$page, $action = 'list', $id = null, $id2 = null) {
+ function handler_admin_education_degree_set($page, $action = 'list', $id = null, $id2 = null) {
$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, 'degreeid');
$table_editor->apply($page, $action, $id, $id2);
}
- function handler_admin_sections(&$page, $action = 'list', $id = null) {
+ 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','profile_section_enum','id');
$table_editor->describe('text','intitulé',true);
$table_editor->apply($page, $action, $id);
}
- function handler_admin_networking(&$page, $action = 'list', $id = null) {
+ 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', '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);
}
- function handler_admin_corps_enum(&$page, $action = 'list', $id = null) {
+ 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('still_exists', 'existe encore ?', true);
$table_editor->apply($page, $action, $id);
}
- function handler_admin_corps_rank(&$page, $action = 'list', $id = null) {
+ 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('abbreviation', 'abbréviation', true);
$table_editor->apply($page, $action, $id);
}
- function handler_admin_medals(&$page, $action = 'list', $id = null) {
+ 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_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') {
}
}
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
?>
projects / platal.git / blobdiff