Improves email combobox (Closes #1110).
[platal.git] / modules / profile.php
index b3e04a7..9416557 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -30,7 +30,7 @@ class ProfileModule extends PLModule
             '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/ax'                 => $this->make_hook('ax',                         AUTH_COOKIE, 'admin,edit_directory'),
             'profile/edit'               => $this->make_hook('p_edit',                     AUTH_MDP),
             'profile/ajax/address'       => $this->make_hook('ajax_address',               AUTH_COOKIE, 'user', NO_AUTH),
             'profile/ajax/tel'           => $this->make_hook('ajax_tel',                   AUTH_COOKIE, 'user', NO_AUTH),
@@ -38,51 +38,48 @@ 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),
+            '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),
 
             '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),
 
             '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'),
-            '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/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'),
+            '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'),
         );
     }
 
-    /* XXX COMPAT */
-    function handler_fiche(&$page)
+    /* 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'));
     }
 
-    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;
@@ -90,8 +87,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);
@@ -101,7 +97,7 @@ class ProfileModule extends PLModule
         $photo->send();
     }
 
-    function handler_medal(&$page, $mid)
+    function handler_medal($page, $mid)
     {
         $thumb = ($mid == 'thumb');
         $mid = $thumb ? @func_get_arg(2) : $mid;
@@ -118,7 +114,7 @@ class ProfileModule extends PLModule
         exit;
     }
 
-    function handler_name_info(&$page)
+    function handler_name_info($page)
     {
         pl_content_headers("text/html");
         $page->changeTpl('profile/name_info.tpl', SIMPLE);
@@ -131,7 +127,7 @@ class ProfileModule extends PLModule
         $page->assign('types', $res);
     }
 
-    function handler_networking(&$page, $mid)
+    function handler_networking($page, $mid)
     {
         $res = XDB::query("SELECT  icon
                              FROM  profile_networking_enum
@@ -143,22 +139,52 @@ class ProfileModule extends PLModule
         exit;
     }
 
-    function handler_photo_change(&$page)
+    /** Tries to return the correct profile from a given hrpid.
+     */
+    private function findProfile($hrpid = null)
+    {
+        if (is_null($hrpid)) {
+            $user = S::user();
+            if (!$user->hasProfile()) {
+                return PL_NOT_FOUND;
+            } else {
+                $profile = $user->profile();
+            }
+        } 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;
-        $page->changeTpl('profile/trombino.tpl');
+        $profile = $this->findProfile($hrpid);
+        if (! ($profile instanceof Profile) && ($profile == PL_NOT_FOUND || $profile == PL_FORBIDDEN)) {
+            return $profile;
+        }
+        if (is_null($hrpid)) {
+            pl_redirect('photo/change/' . $profile->hrid());
+        }
 
-        require_once('validations.inc.php');
+        $page->changeTpl('profile/trombino.tpl');
+        $page->assign('hrpid', $profile->hrid());
 
-        $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();
                 }
@@ -166,9 +192,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();
@@ -179,65 +205,76 @@ 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));
     }
 
-    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.
         if (is_null($id)) {
             return PL_NOT_FOUND;
         }
-        $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 an existing profile, we can switch to the
-        // appropriate template.
-        $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';
         }
 
-        // 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());
+        // Display pending picture
+        if (S::logged() && Env::v('modif') == 'new') {
+            $page->assign('with_pending_pic', true);
         }
 
+        $pid = (!is_numeric($id) || S::admin()) ? Profile::getPID($id) : null;
+        if (is_null($pid)) {
+            $owner = User::getSilent($id);
+            if ($owner) {
+                $profile = $owner->profile(true, Profile::FETCH_ALL, $view);
+                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);
+            $owner = $profile->owner();
+        }
+        if (is_null($pid)) {
+            if (S::logged()) {
+                $page->kill($id . " inconnu dans l'annuaire.");
+            }
+            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);
+
         // Profile view are logged.
         if (S::logged()) {
             S::logger()->log('view_profile', $profile->hrid());
@@ -256,11 +293,10 @@ class ProfileModule extends PLModule
         $page->assign('view', $view);
         $page->assign('logged', S::logged());
 
-        $page->addJsLink('close_on_esc.js');
         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) {
@@ -272,46 +308,48 @@ 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());
-            }
+        if (in_array($hrpid, array('general', 'adresses', 'emploi', 'poly', 'deco', 'skill', 'mentor'))) {
+            $aux = $opened_tab;
+            $opened_tab = $hrpid;
+            $hrpid = $aux;
+            $url_error = true;
         } else {
-            $user = Profile::get($user);
-            if (!$user) {
-                return PL_NOT_FOUND;
-            } else if (!S::user()->canEdit($user) && Platal::notAllowed()) {
-                return PL_FORBIDDEN;
-            }
+            $url_error = false;
+        }
+        $profile = $this->findProfile($hrpid);
+        if (! ($profile instanceof Profile) && ($profile == PL_NOT_FOUND || $profile == PL_FORBIDDEN)) {
+            return $profile;
+        }
+        if (is_null($hrpid) || $url_error) {
+            pl_redirect('profile/edit/' . $profile->hrid() . (is_null($opened_tab) ? '' : '/' . $opened_tab));
         }
 
         // Build the page
-        $page->addJsLink('ajax.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, 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('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/' . $user->hrid(), $opened_tab, $mode);
-
-        if (!$user->birthdate) {
+        $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) {
             $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.");
         }
@@ -322,14 +360,14 @@ class ProfileModule extends PLModule
        }
     }
 
-    function handler_education_js(&$page)
+    function handler_education_js($page)
     {
         pl_cached_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);
@@ -352,7 +390,7 @@ class ProfileModule extends PLModule
         $page->assign('medal_list', $mlist);
     }
 
-    function handler_ajax_address(&$page, $id)
+    function handler_ajax_address($page, $id)
     {
         pl_content_headers("text/html");
         $page->changeTpl('profile/adresses.address.tpl', NO_SKIN);
@@ -360,17 +398,23 @@ class ProfileModule extends PLModule
         $page->assign('address', array());
     }
 
-    function handler_ajax_tel(&$page, $prefid, $prefname, $telid)
+    function handler_ajax_tel($page, $prefid, $prefname, $telid, $subField, $mainField, $mainId)
     {
         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());
+        if ($mainField) {
+            $page->assign('subField', $subField);
+            $page->assign('mainField', $mainField);
+            $page->assign('mainId', $mainId);
+        }
     }
 
-    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);
@@ -383,78 +427,43 @@ class ProfileModule extends PLModule
         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));
+        $page->assign('id', $i);
+        $page->assign('medal', array('id' => $id, 'grade' => 0, 'valid' => 0));
     }
 
-    function handler_ajax_job(&$page, $id)
+    function handler_ajax_job($page, $id)
     {
         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);
-        $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)
+        fill_email_combobox($page, array('redirect', 'job', 'stripped_directory'));
+    }
+
+    /**
+     * 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)
     {
-        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);
+        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)
+    function handler_ajax_skill($page, $cat, $id)
     {
         pl_content_headers("text/html");
         $page->changeTpl('profile/skill.skill.tpl', NO_SKIN);
@@ -474,7 +483,7 @@ class ProfileModule extends PLModule
         }
     }
 
-    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);
@@ -487,7 +496,7 @@ class ProfileModule extends PLModule
         $page->assign('i', $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);
@@ -495,7 +504,7 @@ class ProfileModule extends PLModule
         $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);
 
@@ -506,103 +515,109 @@ 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
+                "SELECT  gc.country
                    FROM  profile_mentor_country AS m
               LEFT JOIN  geoloc_countries       AS gc ON (m.country = gc.iso_3166_1_a2)
                   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('Emploi et Carrières');
-
-        // Retrieval of sector names
-        $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
-        $res = XDB::query("SELECT count(*) FROM profile_mentor");
-        $page->assign('mentors_number', $res->fetchOneCell());
-
-        // 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
+        $it = XDB::iterator("SELECT  gc.iso_3166_1_a2 AS id, gc.country 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  country");
         $page->assign('list', $it);
     }
 
-    function handler_xnet(&$page)
+    /**
+     * 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('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;
+        exit();
+    }
+
+    function handler_xnet($page)
     {
         $page->changeTpl('profile/groupesx.tpl');
         $page->setTitle('Promo, Groupes X, Binets');
@@ -613,11 +628,11 @@ 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());
     }
 
-    function handler_xnetlogo(&$page, $id)
+    function handler_xnetlogo($page, $id)
     {
         if (is_null($id)) {
             return PL_NOT_FOUND;
@@ -639,7 +654,7 @@ class ProfileModule extends PLModule
         exit;
     }
 
-    function handler_vcard(&$page, $x = null)
+    function handler_vcard($page, $x = null)
     {
         if (is_null($x)) {
             return PL_NOT_FOUND;
@@ -652,11 +667,11 @@ class ProfileModule extends PLModule
         }
 
         $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');
 
@@ -675,13 +690,14 @@ class ProfileModule extends PLModule
                 S::assert_xsrf_token();
 
                 $data = file_get_contents($_FILES['userfile']['tmp_name']);
-               list($x, $y) = getimagesize($_FILES['userfile']['tmp_name']);
-               $mimetype = substr($_FILES['userfile']['type'], 6);
-               unlink($_FILES['userfile']['tmp_name']);
-                XDB::execute(
-                        "REPLACE INTO profile_photos SET pid={?}, attachmime = {?}, attach={?}, x={?}, y={?}",
-                        $user->profile()->id(), $mimetype, $data, $x, $y);
-               break;
+                list($x, $y) = getimagesize($_FILES['userfile']['tmp_name']);
+                $mimetype = substr($_FILES['userfile']['type'], 6);
+                unlink($_FILES['userfile']['tmp_name']);
+                XDB::execute('INSERT INTO  profile_photos (pid, attachmime, attach, x, y)
+                                   VALUES  ({?}, {?}, {?}, {?}, {?})
+                  ON DUPLICATE KEY UPDATE  attachmime = VALUES(attachmime), attach = VALUES(attach), x = VALUES(x), y = VALUES(y)',
+                             $user->profile()->id(), $mimetype, $data, $x, $y);
+                break;
 
             case "delete":
                 S::assert_xsrf_token();
@@ -690,7 +706,7 @@ class ProfileModule extends PLModule
                 break;
         }
     }
-    function handler_admin_names(&$page, $action = 'list', $id = null) {
+    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);
@@ -701,7 +717,7 @@ class ProfileModule extends PLModule
         $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');
@@ -709,7 +725,7 @@ class ProfileModule extends PLModule
         $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');
@@ -719,7 +735,7 @@ class ProfileModule extends PLModule
         $table_editor->describe('url', 'site web', false);
         $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);
@@ -727,41 +743,39 @@ class ProfileModule extends PLModule
         $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', 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);
         $table_editor->apply($page, $action, $id);
     }
-    function handler_admin_education_degree_set(&$page, $action = 'list', $id = 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);
-        $table_editor->describe('eduid', 'formation', true);
-        $table_editor->describe('degreeid', 'niveau', true);
-        $table_editor->apply($page, $action, $id);
+        $table_editor = new PLTableEditor('admin/education_degree_set', 'profile_education_degree', 'eduid', true, 'degreeid');
+        $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, $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_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) {
+    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');
@@ -771,7 +785,7 @@ class ProfileModule extends PLModule
         $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');
@@ -780,7 +794,7 @@ class ProfileModule extends PLModule
         $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');
@@ -788,7 +802,7 @@ class ProfileModule extends PLModule
         $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');