X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=e1c70c00abb0acb17879e3d2f213427b15017618;hb=fb813fb52d5ab65ca9a5b92b5cb9089523380d79;hp=aad3ebb05d80096bc3266657760e990759866f6d;hpb=a959b199b8f4790bf311c4e9c4b96b4ffb494eeb;p=platal.git

diff --git a/modules/profile.php b/modules/profile.php
index aad3ebb..e1c70c0 100644
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -24,45 +24,55 @@ class ProfileModule extends PLModule
     function handlers()
     {
         return array(
-            'photo'                => $this->make_hook('photo',             AUTH_PUBLIC),
-            'photo/change'         => $this->make_hook('photo_change',      AUTH_MDP),
-
-            '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/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),
-            'profile/ajax/medal'   => $this->make_hook('ajax_medal',        AUTH_COOKIE, 'user', NO_AUTH),
-            'profile/ajax/job'     => $this->make_hook('ajax_job',          AUTH_COOKIE, 'user', NO_AUTH),
-            'profile/ajax/secteur' => $this->make_hook('ajax_secteur',      AUTH_COOKIE, 'user', NO_AUTH),
-            'profile/ajax/skill'   => $this->make_hook('ajax_skill',        AUTH_COOKIE, 'user', NO_AUTH),
-            'javascript/applis.js' => $this->make_hook('applis_js',         AUTH_COOKIE),
-            'javascript/grades.js' => $this->make_hook('grades_js',         AUTH_COOKIE),
-            'profile/medal'        => $this->make_hook('medal',             AUTH_PUBLIC),
-            'profile/orange'       => $this->make_hook('p_orange',          AUTH_MDP),
-            'profile/usage'        => $this->make_hook('p_usage',           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),
-
-            'groupes-x'            => $this->make_hook('xnet',              AUTH_COOKIE),
-            'groupes-x/logo'       => $this->make_hook('xnetlogo',          AUTH_PUBLIC),
-
-            'vcard'                => $this->make_hook('vcard',             AUTH_COOKIE),
-            'admin/binets'         => $this->make_hook('admin_binets',      AUTH_MDP,    'admin'),
-            'admin/medals'         => $this->make_hook('admin_medals',      AUTH_MDP,    'admin'),
-            'admin/formations'     => $this->make_hook('admin_formations',  AUTH_MDP,    'admin'),
-            'admin/sections'       => $this->make_hook('admin_sections',    AUTH_MDP,    'admin'),
-            'admin/secteurs'       => $this->make_hook('admin_secteurs',    AUTH_MDP,    'admin'),
-            'admin/trombino'       => $this->make_hook('admin_trombino',    AUTH_MDP,    'admin'),
-            'admin/ss_secteurs'    => $this->make_hook('admin_ss_secteurs', AUTH_MDP,    'admin'),
-            'admin/fonctions'      => $this->make_hook('admin_fonctions',   AUTH_MDP,    'admin'),
-
+            'photo'                      => $this->make_hook('photo',                      AUTH_PUBLIC),
+            'photo/change'               => $this->make_hook('photo_change',               AUTH_MDP),
+
+            '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/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),
+            '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/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),
+            '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),
+
+            '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'),
         );
     }
 
@@ -79,36 +89,16 @@ class ProfileModule extends PLModule
         }
 
         // 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;
-            }
+            $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 = $user->profile()->getPhoto(true);
         }
 
         // Display the photo, or a default one when not available.
-        if ($photo_type && $photo_data != null) {
-            pl_cached_dynamic_content_headers("image/$photo_type");
-            echo $photo_data;
-        } else {
-            pl_cached_dynamic_content_headers("image/png");
-            echo file_get_contents(dirname(__FILE__).'/../htdocs/images/none.png');
-        }
-        exit;
+        $photo->send();
     }
 
     function handler_medal(&$page, $mid)
@@ -128,6 +118,32 @@ class ProfileModule extends PLModule
         exit;
     }
 
+    function handler_name_info(&$page)
+    {
+        header('Content-Type: text/html; charset=utf-8');
+        $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)
+    {
+        $res = XDB::query("SELECT  icon
+                             FROM  profile_networking_enum
+                            WHERE  network_type = {?}",
+                          $mid);
+        $img  = dirname(__FILE__) . '/../htdocs/images/networking/' . $res->fetchOneCell();
+        $type = mime_content_type($img);
+        header("Content-Type: $type");
+        echo file_get_contents($img);
+        exit;
+    }
+
     function handler_photo_change(&$page)
     {
         global $globals;
@@ -201,8 +217,11 @@ class ProfileModule extends PLModule
             return PL_NOT_FOUND;
         }
 
-        $login = S::logged() ? User::get($x) : User::getSilent($x);
+        $login = (!is_numeric($x) || S::has_perms()) ? Profile::get($x) : null;
         if (!$login) {
+            if (S::logged()) {
+                $page->trigError($x . ' inconnu dans l\'annuaire');
+            }
             return PL_NOT_FOUND;
         }
 
@@ -222,30 +241,29 @@ class ProfileModule extends PLModule
 
         // 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()) {
+        $owner = $login->owner();
+        if (!$owner || $owner->state != 'pending') {
             $new  = Env::v('modif') == 'new';
-            $user = get_user_details($login->login(), S::v('uid'), $view);
+            // XXX: Deprecated...
+            $user = get_user_details($login->hrid(), S::i('uid'), $view);
         } else {
             $new  = false;
             $user = array();
             if (S::logged()) {
-                pl_redirect('marketing/public/' . $login->login());
+                pl_redirect('marketing/public/' . $owner->login());
             }
         }
 
         // Profile view are logged.
         if (S::logged()) {
-            S::logger()->log('view_profile', $login->login());
+            S::logger()->log('view_profile', $login->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' : '');
+        $photo = 'photo/' . $login->hrid() . ($new ? '/req' : '');
         if (!isset($user['photo_pub']) || !has_user_right($user['photo_pub'], $view)) {
             $photo = "";
         }
@@ -271,24 +289,15 @@ class ProfileModule extends PLModule
 
         // 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());
+        $owner = $login->owner();
+        if ($owner) {
+            $page->assign('virtualalias', $owner->emailAlias());
+        }
 
         // 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_by_ref('user', $owner);
         $page->assign('logged', has_user_right('private', $view));
         $page->assign('view', $view);
 
@@ -300,42 +309,45 @@ class ProfileModule extends PLModule
 
     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&ancc_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, $user = 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');
+        if (is_null($user)) {
+            $user = S::user();
+            if (!$user->hasProfile()) {
+                return PL_NOT_FOUND;
+            } else {
+                pl_redirect('profile/edit/' . $user->profile()->hrid());
+            }
+        } else {
+            $user = Profile::get($user);
+            if (!$user) {
+                return PL_NOT_FOUND;
+            } else if (!S::user()->canEdit($user) && Platal::notAllowed()) {
+                return PL_FORBIDDEN;
+            }
         }
 
         // Build the page
         $page->addJsLink('ajax.js');
-        $page->addJsLink('applis.js', false /* dynamic content */);
-        $page->addJsLink('grades.js', false /* dynamic content */);
+        $page->addJsLink('education.js'); /* dynamic content */
+        $page->addJsLink('grades.js');    /* 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', $user);
+        $wiz->addUserData('owner', $user->owner());
         $this->load('page.inc.php');
         $wiz->addPage('ProfileGeneral', 'Général', 'general');
         $wiz->addPage('ProfileAddresses', 'Adresses personnelles', 'adresses');
@@ -344,13 +356,9 @@ class ProfileModule extends PLModule
         $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);
+        $wiz->apply($page, 'profile/edit/' . $user->hrid(), $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()) {
+        if (!$user->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.");
         }
@@ -361,11 +369,11 @@ class ProfileModule extends PLModule
        }
     }
 
-    function handler_applis_js(&$page)
+    function handler_education_js(&$page)
     {
         pl_cached_content_headers("text/javascript", "utf-8");
-        $page->changeTpl('profile/applis.js.tpl', NO_SKIN);
-        require_once "applis.func.inc.php";
+        $page->changeTpl('profile/education.js.tpl', NO_SKIN);
+        require_once 'education.func.inc.php';
     }
 
     function handler_grades_js(&$page)
@@ -391,25 +399,37 @@ class ProfileModule extends PLModule
         $page->assign('medal_list', $mlist);
     }
 
-    function handler_ajax_address(&$page, $adid)
+    function handler_ajax_address(&$page, $id)
     {
         pl_content_headers("text/html");
         $page->changeTpl('profile/adresses.address.tpl', NO_SKIN);
-        $page->assign('i', $adid);
-        $page->assign('adr', array());
+        $page->assign('i', $id);
+        $page->assign('address', array());
     }
 
-    function handler_ajax_tel(&$page, $adid, $telid)
+    function handler_ajax_tel(&$page, $prefid, $prefname, $telid)
     {
         pl_content_headers("text/html");
-        $page->changeTpl('profile/adresses.tel.tpl', NO_SKIN);
-        $page->assign('i', $adid);
-        $page->assign('adid', "addresses_$adid");
-        $page->assign('adpref', "addresses[$adid]");
-        $page->assign('t', $telid);
+        $page->changeTpl('profile/phone.tpl', NO_SKIN);
+        $page->assign('prefid', $prefid);
+        $page->assign('prefname', $prefname);
+        $page->assign('telid', $telid);
         $page->assign('tel', array());
     }
 
+    function handler_ajax_edu(&$page, $eduid, $class)
+    {
+        header('Content-Type: text/html; charset=utf-8');
+        $page->changeTpl('profile/general.edu.tpl', NO_SKIN);
+        $res = XDB::iterator("SELECT  id, field
+                                FROM  profile_education_field_enum
+                            ORDER BY  field");
+        $page->assign('edu_fields', $res->fetchAllAssoc());
+        $page->assign('eduid', $eduid);
+        $page->assign('class', $class);
+        require_once "education.func.inc.php";
+    }
+
     function handler_ajax_medal(&$page, $id)
     {
         pl_content_headers("text/html");
@@ -425,25 +445,57 @@ class ProfileModule extends PLModule
         $page->assign('i', $id);
         $page->assign('job', array());
         $page->assign('new', true);
-        $res = XDB::query("SELECT  id, label
-                             FROM  emploi_secteur");
-        $page->assign('secteurs', $res->fetchAllAssoc());
-        $res = XDB::query("SELECT  id, fonction_fr, FIND_IN_SET('titre', flags) AS title
-                             FROM  fonctions_def
-                         ORDER BY  id");
-        $page->assign('fonctions', $res->fetchAllAssoc());
+        $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_secteur(&$page, $id, $sect, $ssect = -1)
+    function handler_ajax_sector(&$page, $id, $jobid, $jobpref, $sect, $ssect = -1)
     {
         pl_content_headers("text/html");
-        $res = XDB::iterator("SELECT  id, label
-                                FROM  emploi_ss_secteur
-                               WHERE  secteur = {?}", $sect);
-        $page->changeTpl('profile/jobs.secteur.tpl', NO_SKIN);
+        $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('ssecteurs', $res);
+        $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)
+    {
+        header('Content-Type: text/html; charset=utf-8');
+        $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);
+    }
+
+    function handler_ajax_alternates(&$page, $id, $sssect)
+    {
+        header('Content-Type: text/html; charset=utf-8');
+        $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'];
+        }
+        $page->assign('alternates', $alternates);
     }
 
     function handler_ajax_skill(&$page, $cat, $id)
@@ -466,20 +518,39 @@ class ProfileModule extends PLModule
         }
     }
 
-    function handler_p_orange(&$page)
+    function handler_ajax_searchname(&$page, $id)
     {
-        $page->changeTpl('profile/orange.tpl');
+        header('Content-Type: text/html; charset=utf-8');
+        $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('i', $id);
+    }
 
-        require_once 'validations.inc.php';
+    function handler_ajax_buildnames(&$page, $data)
+    {
+        header('Content-Type: text/html; charset=utf-8');
+        $page->changeTpl('profile/general.buildnames.tpl', NO_SKIN);
+        require_once 'name.func.inc.php';
+        $page->assign('names', build_javascript_names($data));
+    }
 
-        $res = XDB::query(
-                "SELECT  u.promo, u.promo_sortie
-                   FROM  auth_user_md5  AS u
-                  WHERE  user_id={?}", S::v('uid'));
+    function handler_p_orange(&$page, $pid = null)
+    {
+        $page->changeTpl('profile/orange.tpl');
 
-        list($promo, $promo_sortie_old) = $res->fetchOneRow();
-        $page->assign('promo_sortie_old', $promo_sortie_old);
-        $page->assign('promo',  $promo);
+        require_once 'validations.inc.php';
+        $profile = Profile::get($pid);
+        if (is_null($profile)) {
+            return PL_NOT_FOUND;
+        }
+        $page->assign('promo_sortie_old', $profile->grad_year);
+        $page->assign('promo', $profile->entry_year);
+        $page->assign('promo_display', $profile->promo());
+        $page->assign('sexe', $profile->isFemale());
 
         if (!Env::has('promo_sortie')) {
             return;
@@ -488,24 +559,21 @@ class ProfileModule extends PLModule
         }
 
         $promo_sortie = Env::i('promo_sortie');
-
+        $promo = $profile->entry_year;
         if ($promo_sortie < 1000 || $promo_sortie > 9999) {
-            $page->trigError('L\'année de sortie doit être un nombre de quatre chiffres');
-        }
-        elseif ($promo_sortie < $promo + 3) {
-            $page->trigError('Trop tôt');
-        }
-        elseif ($promo_sortie == $promo_sortie_old) {
+            $page->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  auth_user_md5 set promo_sortie={?}
-                  WHERE  user_id={?}", $promo_sortie, S::v('uid'));
-                $page->trigSuccess('Ton statut "orange" a été supprimé.');
-                $page->assign('promo_sortie_old', $promo_sortie);
-        }
-        else {
+        } elseif ($promo_sortie == $promo + 3) {
+            XDB::execute('UPDATE  profile_education
+                             SET  grad_year = {?}
+                           WHERE  uid = {?} AND FIND_IN_SET(\'primary\', flags)',
+                         $promo_sortie, $profile->id());
+            $page->trigSuccess('Ton statut "orange" a été supprimé.');
+            $page->assign('promo_sortie_old', $promo_sortie);
+        } else {
             $page->assign('promo_sortie', $promo_sortie);
 
             if (Env::has('submit')) {
@@ -516,49 +584,49 @@ class ProfileModule extends PLModule
         }
     }
 
-    function handler_referent(&$page, $x = null)
+    function handler_referent(&$page, $user)
     {
         require_once 'user.func.inc.php';
         $page->changeTpl('profile/fiche_referent.tpl', SIMPLE);
 
-        $user = User::get($x);
-        if ($user == null) {
+        $user = Profile::get($user);
+        if (!$user) {
             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('cv', MiniWiki::WikiToHTML($user->cv, true));
+        //TODO: waiting for job refactoring to be done
+        //$page->assign('adr_pro', get_user_details_pro($user->id()));
 
         /////  recuperations infos referent
 
         //expertise
-        $res = XDB::query("SELECT expertise FROM mentor WHERE uid = {?}", $user->id());
+        $res = XDB::query('SELECT  expertise
+                             FROM  profile_mentor
+                            WHERE  uid = {?}', $user->id());
         $page->assign('expertise', $res->fetchOneCell());
 
-        //secteurs
-        $secteurs = $ss_secteurs = Array();
+        // Sectors
+        $sectors = $subSectors = Array();
         $res = XDB::iterRow(
-                "SELECT  s.label, ss.label
-                   FROM  mentor_secteurs AS m
-              LEFT JOIN  emploi_secteur AS s ON(m.secteur = s.id)
-              LEFT JOIN  emploi_ss_secteur AS ss ON(m.secteur = ss.secteur AND m.ss_secteur = ss.id)
+                "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  uid = {?}", $user->id());
-        while (list($sec, $ssec) = $res->next()) {
-            $secteurs[]    = $sec;
-            $ss_secteurs[] = $ssec;
+        while (list($sector, $subSector) = $res->next()) {
+            $sectors[]    = $sector;
+            $subSectors[] = $subSector;
         }
-        $page->assign_by_ref('secteurs', $secteurs);
-        $page->assign_by_ref('ss_secteurs', $ss_secteurs);
+        $page->assign_by_ref('sectors', $sectors);
+        $page->assign_by_ref('subSectors', $subSectors);
 
-        //pays
+        // Countries.
         $res = XDB::query(
-                "SELECT  gp.pays
-                   FROM  mentor_pays AS m
-              LEFT JOIN  geoloc_pays AS gp ON(m.pid = gp.a2)
+                "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());
         $page->assign('pays', $res->fetchColumn());
 
@@ -572,51 +640,31 @@ class ProfileModule extends PLModule
 
         $page->setTitle('Conseil Pro');
 
-        //recuperation des noms de secteurs
-        $res = XDB::iterRow("SELECT id, label FROM emploi_secteur");
-        $secteurs[''] = '';
-        while (list($tmp_id, $tmp_label) = $res->next()) {
-            $secteurs[$tmp_id] = $tmp_label;
-        }
-        $page->assign_by_ref('secteurs', $secteurs);
+        require_once "directory.enums.inc.php";
+
+        // Retrieval of sector names
+        $sectors = DirEnum::getOptionsArray(DirEnum::SECTORS);
+        $sectors[''] = '';
+        $page->assign_by_ref('sectors', $sectors);
 
         // nb de mentors
-        $res = XDB::query("SELECT count(*) FROM mentor");
+        $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'));
-        $secteur_sel     = XDB::escape(Env::v('secteur'));
-        $ss_secteur_sel  = XDB::escape(Env::v('ss_secteur'));
-        $expertise_champ = XDB::escape(Env::v('expertise'));
-
-        if ($pays_sel != "''") {
-            $where[] = "mp.pid = $pays_sel";
-        }
-        if ($secteur_sel != "''") {
-            $where[] = "ms.secteur = $secteur_sel";
-            if ($ss_secteur_sel != "''") {
-                $where[] = "ms.ss_secteur = $ss_secteur_sel";
-            }
-        }
-        if ($expertise_champ != "''") {
-            $where[] = "MATCH(m.expertise) AGAINST($expertise_champ)";
-        }
-
-        if ($where) {
-            $where = join(' AND ', $where);
-
-            $set = new UserSet("INNER JOIN  mentor          AS m ON (m.uid = u.user_id)
-                                 LEFT JOIN  mentor_pays     AS mp ON (mp.uid = m.uid)
-                                 LEFT JOIN  mentor_secteurs AS ms ON (ms.uid = m.uid)",
-                               $where);
+        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');
     }
 
@@ -624,12 +672,12 @@ class ProfileModule extends PLModule
     {
         pl_content_headers("text/html");
         $page->changeTpl('include/field.select.tpl', NO_SKIN);
-        $page->assign('onchange', 'setSSecteurs()');
+        $page->assign('onchange', 'setSSectors()');
         $page->assign('id', 'ssect_field');
-        $page->assign('name', 'ss_secteur');
-        $it = XDB::iterator("SELECT  id,label AS field
-                               FROM  emploi_ss_secteur
-                              WHERE  secteur = {?}", $sect);
+        $page->assign('name', 'subSector');
+        $it = XDB::iterator("SELECT  id, name AS field
+                               FROM  profile_job_subsector_enum
+                              WHERE  sectorid = {?}", $sect);
         $page->assign('list', $it);
     }
 
@@ -638,59 +686,17 @@ class ProfileModule extends PLModule
         pl_content_headers("text/html");
         $page->changeTpl('include/field.select.tpl', NO_SKIN);
         $page->assign('name', 'pays_sel');
-        $where = ($ssect ? ' AND ms.ss_secteur = {?}' : '');
-        $it = XDB::iterator("SELECT  a2 AS id, pays AS field
-                              FROM  geoloc_pays AS g
-                        INNER JOIN  mentor_pays AS mp ON (mp.pid = g.a2)
-                        INNER JOIN  mentor_secteurs AS ms ON (ms.uid = mp.uid)
-                             WHERE  ms.secteur = {?} $where
-                          GROUP BY  a2
-                          ORDER BY  pays", $sect, $ssect);
+        $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)
+                              WHERE  ms.sectorid = {?} " . $where . "
+                           GROUP BY  iso_3166_1_a2
+                           ORDER BY  countryFR", $sect, $ssect);
         $page->assign('list', $it);
     }
 
-    function handler_p_usage(&$page)
-    {
-        $page->changeTpl('profile/nomusage.tpl');
-
-        require_once 'validations.inc.php';
-
-        $res = XDB::query(
-                "SELECT  u.nom, u.nom_usage, u.flags, e.alias
-                   FROM  auth_user_md5  AS u
-              LEFT JOIN  aliases        AS e ON(u.user_id = e.id
-                                                AND FIND_IN_SET('usage', e.flags))
-                  WHERE  user_id={?}", S::v('uid'));
-
-        list($nom, $usage_old, $flags, $alias_old) = $res->fetchOneRow();
-        $flags = new PlFlagSet($flags);
-        $page->assign('usage_old', $usage_old);
-        $page->assign('alias_old',  $alias_old);
-
-        $nom_usage = mb_strtoupper(trim(Env::v('nom_usage')));
-        $page->assign('usage_req', $nom_usage);
-
-        if (Env::has('submit') && ($nom_usage != $usage_old)) {
-            S::assert_xsrf_token();
-
-            // on vient de recevoir une requete, differente de l'ancien nom d'usage
-            if ($nom_usage == $nom) {
-                $page->trigWarning('Le nom d\'usage que tu demandes est identique à ton nom à l\'X, '
-                                   . 'aucune modification n\'a donc été effectuée.');
-                $page->assign('same', true);
-            } else { // le nom de mariage est distinct du nom à l'X
-                // on calcule l'alias pour l'afficher
-                $reason = Env::v('reason');
-                if ($reason == 'other') {
-                    $reason = Env::v('other_reason');
-                }
-                $myusage = new UsageReq(S::user(), $nom_usage, $reason);
-                $myusage->submit();
-                $page->assign('myusage', $myusage);
-            }
-        }
-    }
-
     function handler_xnet(&$page)
     {
         $page->changeTpl('profile/groupesx.tpl');
@@ -699,9 +705,9 @@ 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());
     }
@@ -713,7 +719,7 @@ class ProfileModule extends PLModule
         }
 
         $res = XDB::query('SELECT  logo, logo_mime
-                             FROM  #groupex#.asso
+                             FROM  groups
                             WHERE  id = {?}', $id);
         list($logo, $logo_mime) = $res->fetchOneRow();
 
@@ -780,6 +786,17 @@ class ProfileModule extends PLModule
                 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) {
         $page->setTitle('Administration - Binets');
         $page->assign('title', 'Gestion des binets');
@@ -788,13 +805,39 @@ class ProfileModule extends PLModule
         $table_editor->describe('text','intitulé',true);
         $table_editor->apply($page, $action, $id);
     }
-    function handler_admin_formations(&$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/formations','applis_def','id');
-        $table_editor->add_join_table('applis_ins','aid',true);
-        $table_editor->describe('text','intitulé',true);
-        $table_editor->describe('url','site web',false);
+        $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->apply($page, $action, $id);
+    }
+    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->add_join_table('profile_education', 'fieldid', true);
+        $table_editor->describe('field', 'domaine', true);
+        $table_editor->apply($page, $action, $id);
+    }
+    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->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) {
+        $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);
     }
     function handler_admin_sections(&$page, $action = 'list', $id = null) {
@@ -804,27 +847,41 @@ class ProfileModule extends PLModule
         $table_editor->describe('text','intitulé',true);
         $table_editor->apply($page, $action, $id);
     }
-    function handler_admin_ss_secteurs(&$page, $action = 'list', $id = null) {
-        $page->setTitle('Administration - Sous-secteurs');
-        $page->assign('title', 'Gestion des sous-secteurs');
-        $table_editor = new PLTableEditor('admin/ss_secteurs', 'emploi_ss_secteur', 'id', true);
-        $table_editor->describe('label', 'intitulé', true);
+    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_fonctions(&$page, $action = 'list', $id = null) {
-        $page->setTitle('Administration - Fonctions');
-        $page->assign('title', 'Gestion des fonctions');
-        $table_editor = new PLTableEditor('admin/fonctions', 'fonctions_def', 'id', true);
-        $table_editor->describe('fonction_fr', 'intitulé', true);
-        $table_editor->describe('fonction_en', 'intitulé (ang)', true);
-        $table_editor->describe('flags', 'titre', true);
+    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->describe('name', 'intitulé', true);
+        $table_editor->describe('icon', 'nom de l\'icône', false);
+        $table_editor->describe('filter', 'filtre', true);
+        $table_editor->describe('link', 'lien web', true);
         $table_editor->apply($page, $action, $id);
     }
-    function handler_admin_secteurs(&$page, $action = 'list', $id = null) {
-        $page->setTitle('Administration - Secteurs');
-        $page->assign('title', 'Gestion des secteurs');
-        $table_editor = new PLTableEditor('admin/secteurs', 'emploi_secteur', 'id', true);
-        $table_editor->describe('label', 'intitulé', true);
+    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('name', 'intitulé', true);
+        $table_editor->describe('abbreviation', 'abbréviation', true);
+        $table_editor->describe('still_exists', 'existe encore ?', true);
+        $table_editor->apply($page, $action, $id);
+    }
+    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('name', 'intitulé', true);
+        $table_editor->describe('abbreviation', 'abbréviation', true);
         $table_editor->apply($page, $action, $id);
     }
     function handler_admin_medals(&$page, $action = 'list', $id = null) {