Activating 'hidden' visibility flag.
[platal.git] / modules / profile / jobs.inc.php
index 81dbafe..43c70d1 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2014 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-class ProfileJob extends ProfileGeoloc
+class ProfileSettingJob implements ProfileSetting
 {
     private $pub;
-    private $mail_new;
-    private $mail;
-    private $web;
+    private $email_new;
+    private $email;
+    private $url;
     private $bool;
     private $checks;
 
     public function __construct()
     {
-        $this->pub    = new ProfilePub();
-        $this->mail
-                      = $this->mail_new
-                      = new ProfileEmail();
-        $this->web    = new ProfileWeb();
-        $this->bool   = new ProfileBool();
-        $this->checks = array('web'      => array('w_web'),
-                              'mail_new' => array('w_email_new'),
-                              'mail'     => array('w_email'),
-                              'pub'      => array('pub', 'w_email_pub'));
+        $this->pub    = new ProfileSettingPub();
+        $this->email
+                      = $this->email_new
+                      = new ProfileSettingEmail();
+        $this->url    = new ProfileSettingWeb();
+        $this->bool   = new ProfileSettingBool();
+        $this->checks = array('url'      => array('w_url'),
+                              'email'    => array('w_email'),
+                              'pub'      => array('pub', 'w_email_pub'),
+                             );
     }
 
-    private function cleanJob(ProfilePage &$page, $jobid, array &$job, &$success)
+    private function emptyJob()
     {
-        $success = true;
+        $address = new Address();
+        $phone = new Phone();
+        return array(
+            'id'               => '0',
+            'jobid'            => '',
+            'pub'              => 'ax',
+            'name'             => '',
+            'description'      => '',
+            'w_url'            => '',
+            'w_address'        => $address->toFormArray(),
+            'w_email'          => '',
+            'w_email_pub'      => 'ax',
+            'w_email_new'      => '',
+            'w_phone'          => array(0 => $phone->toFormArray()),
+            'terms'            => array()
+        );
+    }
+
+    private function fetchJobs(ProfilePage $page)
+    {
+        // Build the jobs tree
+        $jobs  = XDB::fetchAllAssoc('SELECT  j.id, j.jobid, je.name,
+                                             j.description, j.email AS w_email,
+                                             j.email_pub AS w_email_pub,
+                                             j.url AS w_url, j.pub, j.entry_year AS w_entry_year
+                                       FROM  profile_job      AS j
+                                  LEFT JOIN  profile_job_enum AS je ON (j.jobid = je.id)
+                                      WHERE  j.pid = {?}
+                                   ORDER BY  j.id',
+                                    $page->pid());
+
+        if (empty($jobs)) {
+            return array($this->emptyJob());
+        }
+
+        $compagnies = array();
+        $backtrack = array();
+        foreach ($jobs as $key=>$job) {
+            $compagnies[] = $job['jobid'];
+            $backtrack[$job['id']] = $key;
+        }
+
+        $it = Address::iterate(array($page->pid()), array(Address::LINK_JOB), array(), Visibility::get(Visibility::VIEW_ADMIN));
+        while ($address = $it->next()) {
+            $jobs[$address->id]['w_address'] = $address->toFormArray();
+        }
+        $it = Phone::iterate(array($page->pid()), array(Phone::LINK_JOB), array(), Visibility::get(Visibility::VIEW_ADMIN));
+        while ($phone = $it->next()) {
+            $jobs[$phone->link_id]['w_phone'][$phone->id] = $phone->toFormArray();
+        }
+        $res = XDB::iterator("SELECT  e.jtid, e.full_name, j.jid
+                                FROM  profile_job_term_enum AS e
+                          INNER JOIN  profile_job_term AS j USING(jtid)
+                               WHERE  pid = {?}
+                            ORDER BY  j.jid",
+                             $page->pid());
+        while ($term = $res->next()) {
+            // $jid is the ID of the job among this user's jobs
+            $jid = $term['jid'];
+            if (!isset($backtrack[$jid])) {
+                continue;
+            }
+            $job =& $jobs[$backtrack[$jid]];
+            if (!isset($job['terms'])) {
+                $job['terms'] = array();
+            }
+            $job['terms'][] = $term;
+        }
+
+        $phone = new Phone();
+        $address = new Address();
+        foreach ($jobs as $id => &$job) {
+            if (!isset($job['w_phone'])) {
+                $job['w_phone'] = array(0 => $phone->toFormArray());
+            }
+            if (!isset($job['w_address'])) {
+                $job['w_address'] = $address->toFormArray();
+            }
+
+            $job['w_email_new'] = '';
+            if (!isset($job['w_email_pub'])) {
+                $job['w_email_pub'] = 'private';
+            }
+        }
+        return $jobs;
+    }
+
+    private function cleanJob(ProfilePage $page, $jobid, array &$job, &$success, $job_level)
+    {
+        if ($job['w_email'] == "new@example.org") {
+            $job['w_email'] = $job['w_email_new'];
+        }
         foreach ($this->checks as $obj=>&$fields) {
             $chk =& $this->$obj;
             foreach ($fields as $field) {
-                if ($field == "w_email_new") {
-                    if ($job['w_email'] == "new@example.org") {
-                        $job['w_email'] = $job[$field];
-                    }
-                    continue;
-                }
                 $job[$field] = $chk->value($page, $field, $job[$field], $s);
                 if (!$s) {
                     $success = false;
@@ -61,22 +146,24 @@ class ProfileJob extends ProfileGeoloc
                 }
             }
         }
-        if (!$job['sss_secteur_name']) {
-            $res = XDB::query("SELECT  name
-                                 FROM  profile_job_subsubsector_enum
-                                WHERE  id = {?}",
-                              $job['sss_secteur']);
-            $job['sss_secteur_name'] = $res->fetchOneCell();
-        } else {
-            $res = XDB::query("SELECT  sectorid, subsectorid, id
-                                 FROM  profile_job_subsubsector_enum
-                                WHERE  name = {?}",
-                              $job['sss_secteur_name']);
-            if ($res->numRows() != 1) {
-                $success = false;
-                $job['sector_error'] = true;
-            } else {
-                list($job['secteur'], $job['ss_secteur'], $job['sss_secteur']) = $res->fetchOneRow();
+        if (count($job['terms'])) {
+            $termsid = array();
+            foreach ($job['terms'] as $term) {
+                if (!isset($term['full_name'])) {
+                    $termsid[] = $term['jtid'];
+                }
+            }
+            if (count($termsid)) {
+                $res = XDB::query("SELECT  jtid, full_name
+                                    FROM  profile_job_term_enum
+                                   WHERE  jtid IN {?}",
+                                 $termsid);
+                $term_id_to_name = $res->fetchAllAssoc('jtid', false);
+                foreach ($job['terms'] as &$term) {
+                    if (!isset($term['full_name'])) {
+                        $term['full_name'] = $term_id_to_name[$term['jtid']];
+                    }
+                }
             }
         }
         if ($job['name']) {
@@ -85,247 +172,284 @@ class ProfileJob extends ProfileGeoloc
                                 WHERE  name = {?}",
                               $job['name']);
             if ($res->numRows() != 1) {
-                $user = S::user();
-                $req = new EntrReq($user, $jobid, $job['name'], $job['acronym'], $job['hq_web'], $job['hq_email'], $job['hq_tel'], $job['hq_fax']);
-                $req->submit();
                 $job['jobid'] = null;
             } else {
                 $job['jobid'] = $res->fetchOneCell();
             }
         }
-        $job['w_adr']['pub'] = $this->pub->value($page, 'adr_pub', @$job['w_adr']['pub'], $s);
-        $job['w_adr']['checked'] = $this->bool->value($page, 'adr_checked', @$job['w_adr']['checked'], $s);
-        if (!isset($job['w_tel'])) {
-            $job['w_tel'] = array();
+
+        if (Visibility::isLessRestrictive($job_level, $job['w_email_pub'])) {
+            $job['w_email_pub'] = $job_level;
         }
-        $profiletel = new ProfilePhones('pro', $jobid);
-        $job['w_tel'] = $profiletel->value($page, 'tel', $job['w_tel'], $s);
+        $job['w_phone'] = Phone::formatFormArray($job['w_phone'], $s, $job_level);
+
+        if ($job['w_entry_year'] && strlen($job['w_entry_year']) != 4) {
+            $job['w_entry_year_error'] = true;
+            $success = false;
+        }
+
         unset($job['removed']);
         unset($job['new']);
-        unset($job['w_adr']['changed']);
-        unset($job['w_adr']['parsevalid']);
-        unset($job['w_adr']['display']);
     }
 
-    public function value(ProfilePage &$page, $field, $value, &$success)
+
+
+    public function value(ProfilePage $page, $field, $value, &$success)
     {
-        require_once('validations.inc.php');
-        $entreprise = Validate::get_typed_requests(S::i('uid'), 'entreprise');
+        $entreprise = ProfileValidate::get_typed_requests($page->pid(), 'entreprise');
         $entr_val = 0;
 
         $init = false;
         if (is_null($value)) {
-            $value = $page->values['jobs'];
+            $value = $this->fetchJobs($page);
             $init = true;
         }
         $success = true;
-        foreach ($value as $key=>&$job) {
+        foreach ($value as $key => $job) {
             $job['name'] = trim($job['name']);
-            if (!$job['name']) {
+            if ($job['name'] == '' && $entreprise[$entr_val]->id == $key) {
                 $job['tmp_name'] = $entreprise[$entr_val]->name;
-                $entr_val ++;
+                ++$entr_val;
+            } else if ($job['name'] == '') {
+                if ($job['description'] == '' && $job['w_url'] == ''
+                    && $job['w_address']['text'] == '' && $job['w_email'] == ''
+                    && count($job['w_phone']) >= 1 && $job['w_phone'][0]['display'] == '') {
+                    unset($value[$key]);
+                    continue;
+                }
+
+                if (!$init) {
+                    $job['name_error'] = true;
+                    $success = false;
+                }
             }
-            if (@$job['removed']) {
-                unset($value[$key]);
+
+            if (isset($job['removed']) && $job['removed']) {
+                if (!S::user()->checkPerms('directory_private')
+                    && (Phone::hasPrivate($job['w_phone']) || Address::hasPrivate($job['w_address']) || $job['w_email_pub'] == 'private')) {
+                    Platal::page()->trigWarning("L'entreprise ne peut être supprimée car elle contient des informations pour lesquelles vous n'avez pas le droit d'édition.");
+                } else {
+                    if ($job['name'] == '' && $entreprise && isset($entreprise[$entr_val - 1])) {
+                        $entreprise[$entr_val - 1]->clean();
+                    }
+                    unset($value[$key]);
+                    continue;
+                }
             }
+            if (!isset($job['pub']) || !$job['pub']) {
+                $job['pub'] = 'private';
+            }
+            $value[$key] = $job;
         }
-        foreach ($value as $key=>&$job) {
-            $ls = true;
-            $this->geolocAddress($job['w_adr'], $s);
-            $ls = ($ls && $s);
-            $this->cleanJob($page, $key, $job, $s);
-            $ls = ($ls && $s);
+        foreach ($value as $key => &$job) {
+            $address = new Address($job['w_address']);
+            $s = $address->format();
+
+            // Force the address publicity to be at least as restricted as
+            // the job publicity.
+            $job_level = $job['pub'];
+            if (Visibility::isLessRestrictive($job_level, $address->pub)) {
+                $address->pub = $job_level;
+            }
+            $job['w_address'] = $address->toFormArray();
+            $this->cleanJob($page, $key, $job, $s, $job_level);
             if (!$init) {
-                $success = ($success && $ls);
+                $success = ($success && $s);
             }
         }
+        usort($value, 'Visibility::comparePublicity');
         return $value;
     }
 
-    public function save(ProfilePage &$page, $field, $value)
+    public function save(ProfilePage $page, $field, $value)
     {
-        require_once('profil.func.inc.php');
-        require_once('validations.inc.php');
-
-        XDB::execute("DELETE FROM  profile_job
-                            WHERE  uid = {?}",
-                     S::i('uid'));
-        XDB::execute("DELETE FROM  profile_phones
-                            WHERE  uid = {?} AND link_type = 'pro'",
-                     S::i('uid'));
-        foreach ($value as $id=>&$job) {
-            if ($job['w_email'] == "new@example.org") {
-                $job['w_email'] = $job['w_email_new'];
+
+        $deletePrivate = S::user()->isMe($page->owner) || S::admin();
+        XDB::execute('DELETE FROM  pj, pjt
+                            USING  profile_job      AS pj
+                        LEFT JOIN  profile_job_term AS pjt ON (pj.pid = pjt.pid AND pj.id = pjt.jid)
+                            WHERE  pj.pid = {?}' . (($deletePrivate) ? '' : ' AND pj.pub IN (\'public\', \'ax\')'),
+                     $page->pid());
+        Address::deleteAddresses($page->pid(), Address::LINK_JOB, null, null, $deletePrivate);
+        Phone::deletePhones($page->pid(), Phone::LINK_JOB, null, $deletePrivate);
+        $previous_requests = EntrReq::get_typed_requests($page->pid(), 'entreprise');
+        foreach ($previous_requests as $request) {
+            $request->clean();
+        }
+        $terms_values = array();
+        foreach ($value as $id => &$job) {
+            if (($job['pub'] != 'private' || $deletePrivate) && (isset($job['name']) && $job['name'])) {
+                if (isset($job['jobid']) && $job['jobid']) {
+                    XDB::execute('INSERT INTO  profile_job (pid, id, description, email, entry_year,
+                                                            url, pub, email_pub, jobid)
+                                       VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
+                                 $page->pid(), $id, $job['description'], $job['w_email'], $job['w_entry_year'],
+                                 $job['w_url'], $job['pub'], $job['w_email_pub'], $job['jobid']);
+                } else {
+                    XDB::execute('INSERT INTO  profile_job (pid, id, description, email, entry_year,
+                                                            url, pub, email_pub)
+                                       VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
+                                 $page->pid(), $id, $job['description'], $job['w_email'], $job['w_entry_year'],
+                                 $job['w_url'], $job['pub'], $job['w_email_pub']);
+                    $request = new EntrReq(S::user(), $page->profile, $id, $job['name'], $job['hq_acronym'], $job['hq_url'],
+                                           $job['hq_email'], $job['hq_fixed'], $job['hq_fax'], $job['hq_address']);
+                    $request->submit();
+                    sleep(1);
+                }
+                $address = new Address(array_merge($job['w_address'],
+                                                   array('pid' => $page->pid(),
+                                                         'id' => $id,
+                                                         'type' => Address::LINK_JOB)));
+                $address->save();
+                Phone::savePhones($job['w_phone'], $page->pid(), Phone::LINK_JOB, $id);
+                if (isset($job['terms'])) {
+                    foreach ($job['terms'] as $term) {
+                        $terms_values[] = XDB::format('({?}, {?}, {?}, {?})',
+                                                      $page->pid(), $id, $term['jtid'], "original");
+                    }
+                }
             }
-            if ($job['jobid']) {
-                XDB::execute("INSERT INTO  profile_job (uid, id, functionid, description, sectorid, subsectorid,
-                                                        subsubsectorid, email, url, pub, email_pub, jobid)
-                                   VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})",
-                             S::i('uid'), $id, $job['fonction'], $job['description'], $job['secteur'], $job['ss_secteur'],
-                             $job['sss_secteur'], $job['w_email'], $job['w_web'], $job['pub'], $job['w_email_pub'], $job['jobid']);
-            } else {
-                XDB::execute("INSERT INTO  profile_job (uid, id, functionid, description, sectorid, subsectorid,
-                                                        subsubsectorid, email, url, pub, email_pub)
-                                   VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})",
-                             S::i('uid'), $id, $job['fonction'], $job['description'], $job['secteur'], $job['ss_secteur'],
-                             $job['sss_secteur'], $job['w_email'], $job['w_web'], $job['pub'], $job['w_email_pub']);
+        }
+        if (count($terms_values) > 0) {
+            XDB::rawExecute('INSERT INTO  profile_job_term (pid, jid, jtid, computed)
+                                  VALUES  ' . implode(', ', $terms_values) . '
+                 ON DUPLICATE KEY UPDATE  computed = VALUES(computed)');
+        }
+        if (S::user()->isMe($page->owner) && count($value) > 1) {
+            Platal::page()->trigWarning('Attention, tu as plusieurs emplois sur ton profil. Pense à supprimer ceux qui sont obsolètes.');
+        }
+    }
+
+    public function getText($value)
+    {
+        static $pubs = array('public' => 'publique', 'ax' => 'annuaire AX', 'private' => 'privé');
+        $jobs = array();
+        foreach ($value as $id => $job) {
+            $address = Address::formArrayToString(array($job['w_address']));
+            $phones = Phone::formArrayToString($job['w_phone']);
+            $jobs[$id] = $job['name'];
+            $jobs[$id] .= ($job['description'] ? (', ' . $job['description']) : '');
+            $jobs[$id] .= ' (affichage ' . $pubs[$job['pub']];
+            if (count($job['terms'])) {
+                $terms = array();
+                foreach ($job['terms'] as $term) {
+                    $terms[] = $term['full_name'];
+                }
+                $jobs[$id] .= ', mots-clefs : ' . implode(', ', $terms);
+            }
+            if ($job['w_url']) {
+                $jobs[$id] .= ', page perso : ' . $job['w_url'];
             }
-            $profiletel = new ProfilePhones('pro', $id);
-            $profiletel->saveTels('tel', $job['w_tel']);
+            if ($address) {
+                $jobs[$id] .= ', adresse : ' . $address;
+            }
+            if ($job['w_email']) {
+                $jobs[$id] .= ', email : ' . $job['w_email'];
+            }
+            if ($phones) {
+                $jobs[$id] .= ', téléphones : ' . $phones;
+            }
+            $jobs[$id] .= ')';
+        }
+        return implode(' ; ' , $jobs);
+    }
+}
+
+class ProfileSettingCorps implements ProfileSetting
+{
+    public function value(ProfilePage $page, $field, $value, &$success)
+    {
+        $success = true;
+        if (is_null($value)) {
+            $res = XDB::query('SELECT  c.original_corpsid AS original, e.name AS originalText,
+                                       c.current_corpsid AS current, c.rankid AS rank, c.corps_pub AS pub
+                                 FROM  profile_corps      AS c
+                           INNER JOIN  profile_corps_enum AS e ON (c.original_corpsid = e.id)
+                                WHERE  c.pid = {?}',
+                            $page->pid());
+            return $res->fetchOneAssoc();
+        }
+        return $value;
+    }
+
+    public function save(ProfilePage $page, $field, $value)
+    {
+        if (!S::user()->isMe($page->owner)) {
+            XDB::execute('INSERT INTO  profile_corps (original_corpsid, current_corpsid, rankid, corps_pub, pid)
+                               VALUES  ({?}, {?}, {?}, {?}, {?})
+              ON DUPLICATE KEY UPDATE  original_corpsid = VALUES(original_corpsid), current_corpsid = VALUES(current_corpsid),
+                                       rankid = VALUES(rankid), corps_pub = VALUES(corps_pub)',
+                          $value['original'], $value['current'], $value['rank'], $value['pub'], $page->pid());
+        } else {
+            XDB::execute('INSERT INTO  profile_corps (current_corpsid, rankid, corps_pub, pid)
+                               VALUES  ({?}, {?}, {?}, {?})
+              ON DUPLICATE KEY UPDATE  current_corpsid = VALUES(current_corpsid),
+                                       rankid = VALUES(rankid), corps_pub = VALUES(corps_pub)',
+                          $value['current'], $value['rank'], $value['pub'], $page->pid());
         }
     }
+
+    public function getText($value)
+    {
+        static $pubs = array('public' => 'publique', 'ax' => 'annuaire AX', 'private' => 'privé');
+        $corpsList = DirEnum::getOptions(DirEnum::ORIGINCORPS);
+        $rankList  = DirEnum::getOptions(DirEnum::CORPSRANKS);
+        return $corpsList[$value['current']] . ', ' . $corpsList[$value['rank']] . ' ('
+            . 'corps d\'origine : ' . $corpsList[$value['original']] . ', affichage ' . $pubs[$value['pub']] . ')';
+    }
 }
 
-class ProfileJobs extends ProfilePage
+class ProfilePageJobs extends ProfilePage
 {
     protected $pg_template = 'profile/jobs.tpl';
 
-    public function __construct(PlWizard &$wiz)
+    public function __construct(PlWizard $wiz)
     {
         parent::__construct($wiz);
-        $this->settings['cv'] = null;
-        $this->settings['corps'] = null;
-        $this->settings['jobs'] = new ProfileJob();
+        if (S::user()->checkPerms(User::PERM_DIRECTORY_PRIVATE)) {
+            $this->settings['cv'] = null;
+        }
+        $this->settings['corps'] = new ProfileSettingCorps();
+        $this->settings['jobs'] = new ProfileSettingJob();
         $this->watched = array('cv' => true, 'jobs' => true, 'corps' => true);
+        Platal::page()->assign('geocoding_removal', true);
     }
 
     protected function _fetchData()
     {
-        // Checkout the CV
-        $res = XDB::query("SELECT  cv
-                             FROM  auth_user_md5
-                            WHERE  user_id = {?}",
-                          S::i('uid'));
-        $this->values['cv'] = $res->fetchOneCell();
-
-        // Checkout the corps
-        $res = XDB::query("SELECT  original_corpsid AS original, current_corpsid AS current,
-                                   rankid AS rank, corps_pub AS pub
-                             FROM  profile_corps
-                            WHERE  uid = {?}",
-                          S::i('uid'));
-        $this->values['corps'] = $res->fetchOneAssoc();
-
-        // Build the jobs tree
-        $res = XDB::iterRow("SELECT  j.id, je.name, j.functionid, j.sectorid, j.subsectorid,
-                                     j.subsubsectorid, j.description, e.adr1, e.adr2, e.adr3,
-                                     e.postcode, e.city, e.cityid, e.region, e.regiontxt,
-                                     e.country, gp.pays, gp.display,
-                                     FIND_IN_SET('geoloc', flags),
-                                     j.email, j.url, j.pub,
-                                     e.adr_pub, j.email_pub,
-                                     e.glat, e.glng, s.name
-                               FROM  profile_job                   AS j
-                          LEFT JOIN  profile_job_enum              AS je ON (j.jobid = je.id)
-                          LEFT JOIN  entreprises                   AS e  ON (j.uid = e.uid AND j.id = e.entrid)
-                          LEFT JOIN  geoloc_pays                   AS gp ON (gp.a2 = e.country)
-                          LEFT JOIN  profile_job_subsubsector_enum AS s  ON (s.id = j.subsubsectorid)
-                              WHERE  j.uid = {?}
-                           ORDER BY  entrid", S::i('uid'));
-        $this->values['jobs'] = array();
-        while (list($id, $name, $function, $secteur, $ss_secteur, $sss_secteur, $description,
-                    $w_adr1, $w_adr2, $w_adr3, $w_postcode, $w_city, $w_cityid,
-                    $w_region, $w_regiontxt, $w_country, $w_countrytxt, $w_display,
-                    $w_checked, $w_email, $w_web,
-                    $pub, $w_adr_pub, $w_email_pub, $w_glat, $w_glng, $sss_secteur_name
-                   ) = $res->next()) {
-            $this->values['jobs'][] = array('id'               => $id,
-                                            'name'             => $name,
-                                            'fonction'         => $function,
-                                            'secteur'          => $secteur,
-                                            'ss_secteur'       => $ss_secteur,
-                                            'sss_secteur'      => $sss_secteur,
-                                            'sss_secteur_name' => $sss_secteur_name,
-                                            'description'      => $description,
-                                            'w_adr'            => array('adr1'        => $w_adr1,
-                                                                        'adr2'        => $w_adr2,
-                                                                        'adr3'        => $w_adr3,
-                                                                        'postcode'    => $w_postcode,
-                                                                        'city'        => $w_city,
-                                                                        'cityid'      => $w_cityid,
-                                                                        'region'      => $w_region,
-                                                                        'regiontxt'   => $w_regiontxt,
-                                                                        'country'     => $w_country,
-                                                                        'countrytxt'  => $w_countrytxt,
-                                                                        'display'     => $w_display,
-                                                                        'pub'         => $w_adr_pub,
-                                                                        'checked'     => $w_checked,
-                                                                        'precise_lat' => $w_glat,
-                                                                        'precise_lon' => $w_glng),
-                                            'w_email'          => $w_email,
-                                            'w_web'            => $w_web,
-                                            'pub'              => $pub,
-                                            'w_email_pub'      => $w_email_pub);
-        }
-
-        $res = XDB::iterator("SELECT  link_id AS jobid, tel_type AS type, pub, display_tel AS tel, comment
-                                FROM  profile_phones
-                               WHERE  uid = {?} AND link_type = 'pro'
-                            ORDER BY  link_id",
-                             S::i('uid'));
-        $i = 0;
-        $jobNb = count($this->values['jobs']);
-        while ($tel = $res->next()) {
-            $jobid = $tel['jobid'];
-            unset($tel['jobid']);
-            while ($i < $jobNb && $this->values['jobs'][$i]['id'] < $jobid) {
-                $i++;
-            }
-            if ($i >= $jobNb) {
-                break;
-            }
-            $job =& $this->values['jobs'][$i];
-            if (!isset($job['w_tel'])) {
-                $job['w_tel'] = array();
-            }
-            if ($job['id'] == $jobid) {
-                $job['w_tel'][] = $tel;
-            }
-        }
-        foreach ($this->values['jobs'] as $id=>&$job) {
-            if (!isset($job['w_tel'])) {
-                $job['w_tel'] = array();
-            }
-            unset($job['id']);
+        if (S::user()->checkPerms(User::PERM_DIRECTORY_PRIVATE)) {
+            // Checkout the CV
+            $res = XDB::query("SELECT  cv
+                                 FROM  profiles
+                                WHERE  pid = {?}",
+                              $this->pid());
+            $this->values['cv'] = $res->fetchOneCell();
         }
     }
 
     protected function _saveData()
     {
-        if ($this->changed['cv']) {
-            XDB::execute("UPDATE  auth_user_md5
-                             SET  cv = {?}
-                           WHERE  user_id = {?}",
-                         $this->values['cv'], S::i('uid'));
-        }
-
-        if ($this->changed['corps']) {
-            XDB::execute("UPDATE  profile_corps
-                             SET  original_corpsid = {?}, current_corpsid = {?},
-                                  rankid = {?}, corps_pub = {?}
-                           WHERE  uid = {?}",
-                          $this->values['corps']['original'], $this->values['corps']['current'],
-                          $this->values['corps']['rank'], $this->values['corps']['pub'], S::i('uid'));
+        if (S::user()->checkPerms(User::PERM_DIRECTORY_PRIVATE)) {
+            if ($this->changed['cv']) {
+                XDB::execute("UPDATE  profiles
+                                 SET  cv = {?}
+                               WHERE  pid = {?}",
+                             $this->values['cv'], $this->pid());
+            }
         }
     }
 
-    public function _prepare(PlPage &$page, $id)
+    public function _prepare(PlPage $page, $id)
     {
-        require_once "emails.combobox.inc.php";
-        fill_email_combobox($page);
+        require_once 'emails.combobox.inc.php';
+        fill_email_combobox($page, array('redirect', 'job', 'stripped_directory'), $this->owner);
 
-        $res = XDB::query("SELECT  id, name AS label
-                             FROM  profile_job_sector_enum");
-        $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::iterator("SELECT  id, name
-                                FROM  profile_corps_enum
-                            ORDER BY  id = 1 DESC, name");
-        $page->assign('original_corps', $res->fetchAllAssoc());
+        if (!S::user()->isMe($this->owner)) {
+            $res = XDB::iterator('SELECT  id, name
+                                    FROM  profile_corps_enum
+                                ORDER BY  id = 1 DESC, name');
+            $page->assign('original_corps', $res->fetchAllAssoc());
+        }
 
         $res = XDB::iterator("SELECT  id, name
                                 FROM  profile_corps_enum
@@ -334,7 +458,8 @@ class ProfileJobs extends ProfilePage
         $page->assign('current_corps', $res->fetchAllAssoc());
 
         $res = XDB::iterator("SELECT  id, name
-                                FROM  profile_corps_rank_enum");
+                                FROM  profile_corps_rank_enum
+                            ORDER BY  id = 1 DESC, name");
         $page->assign('corps_rank', $res->fetchAllAssoc());
     }
 }