X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Fgeneral.inc.php;h=2ca66c69941bdaa3feb9b5bcb82f3426a0b7d3bf;hb=e0d6b3af1435db9f8ddd72f7c6a9e536654dd4f1;hp=6c2994032b874771df7d27bbd51bd74619dbacc8;hpb=d7de04afa0cfc2166fad9c6643b5af2bdf9fe153;p=platal.git

diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php
index 6c29940..2ca66c6 100644
--- a/modules/profile/general.inc.php
+++ b/modules/profile/general.inc.php
@@ -21,12 +21,14 @@
 
 class ProfileSettingSearchNames implements ProfileSetting
 {
-    private $private_name_end;
-    private $search_names;
-    private $name_types;
+    private function diff($pid, array $old, array $new)
+    {
+        $diff = false;
+        foreach ($old as $field => $name) {
+            $diff = $diff || ($name != $new[$field]);
+        }
 
-    public function __construct() {
-            $this->name_types = DirEnum::getOptions(DirEnum::NAMES);
+        return $diff;
     }
 
     private function matchWord($old, $new, $newLen)
@@ -36,174 +38,91 @@ class ProfileSettingSearchNames implements ProfileSetting
             && ($i + $newLen == strlen($old) || $old{$i + $newLen} == ' ');
     }
 
-    private function prepareField($value)
+    private function prepare(ProfilePage $page, array &$new_value)
     {
-        return name_to_basename($value);
-    }
+        $initial_value = XDB::fetchOneAssoc('SELECT  lastname_main, firstname_main
+                                               FROM  profile_public_names
+                                              WHERE  pid = {?}',
+                                            $page->pid());
 
-    private function prepare(ProfilePage $page, $field, $value, $init, &$success)
-    {
         $success = true;
-        $ini     = $this->prepareField($init);
-        $new     = $this->prepareField($value);
-        $newLen  = strlen($new);
-        $success = $this->matchWord($ini, $new, $newLen)
-                   || ($field == 'lastname' && $new == 'DE ' . $ini);
-        if (!$success) {
-            $field = strtolower($field);
-            Platal::page()->trigError("Le " . $this->name_types[$field] . " que tu as choisi (" . $value .
-                                      ") est trop loin de ton " . $this->name_types[$field] . " initial (" . $init . ").");
-        }
-        return $success ? $value : $init;
-    }
+        foreach ($initial_value as $field => $name) {
+            $initial = name_to_basename($name);
+            $new = name_to_basename($new_value[$field]);
 
-    /* Removes duplicated entries for the fields that do not allow them. */
-    private function clean($value)
-    {
-        $single_types = XDB::fetchAllAssoc('id',
-                                           'SELECT  id, 0
-                                              FROM  profile_name_enum
-                                             WHERE  NOT FIND_IN_SET(\'allow_duplicates\', flags)');
-
-        foreach ($value as $key => $item) {
-            if (isset($single_types[$item['typeid']])) {
-                if ($single_types[$item['typeid']] === true) {
-                    unset($value[$key]);
-                } else {
-                    $single_types[$item['typeid']] = true;
-                }
+            if (!($this->matchWord($initial, $new, strlen($new))
+                || ($field == 'lastname_main' && $new == 'DE ' . $initial))) {
+                $new_value[$field . '_error'] = true;
+                $success = false;
+                Platal::page()->trigError('Le nom choisi (' . $new . ') est trop loin de sa valeur initiale (' . $initial . ').');
             }
         }
 
-        return $value;
+        return $success;
     }
 
     public function value(ProfilePage $page, $field, $value, &$success)
     {
-        $success     = true;
-        $success_tmp = true;
+        $success = true;
 
         if (is_null($value)) {
-            $sn_all = XDB::iterator("SELECT  CONCAT(sn.particle, sn.name) AS name,
-                                             sn.particle, sn.typeid, e.type, e.name AS type_name,
-                                             FIND_IN_SET('has_particle', e.flags) AS has_particle,
-                                             FIND_IN_SET('always_displayed', e.flags) AS always_displayed,
-                                             FIND_IN_SET('public', e.flags) AS pub
-                                       FROM  profile_name      AS sn
-                                 INNER JOIN  profile_name_enum AS e  ON (e.id = sn.typeid)
-                                      WHERE  sn.pid = {?} AND NOT FIND_IN_SET('not_displayed', e.flags)
-                                   ORDER BY  NOT FIND_IN_SET('always_displayed', e.flags), e.id, sn.name",
-                                     $page->pid());
-
-            $sn_types = XDB::iterator("SELECT  id, type, name,
-                                               FIND_IN_SET('has_particle', flags) AS has_particle
-                                         FROM  profile_name_enum
-                                        WHERE  NOT FIND_IN_SET('not_displayed', flags)
-                                               AND FIND_IN_SET('always_displayed', flags)
-                                     ORDER BY  id");
+            $request = NamesReq::getPublicNames($page->pid());
 
-            $value = array();
-            $sn = $sn_all->next();
-            while ($sn_type = $sn_types->next()) {
-                if ($sn_type['id'] == $sn['typeid']) {
-                    $value[] = $sn;
-                    if ($sn) {
-                        $sn = $sn_all->next();
-                    }
-                } else {
-                    $value[] = array('name'             => '',
-                                     'particle'         => '',
-                                     'typeid'           => $sn_type['id'],
-                                     'type'             => $sn_type['type'],
-                                     'type_name'        => $sn_type['name'],
-                                     'has_particle'     => $sn_type['has_particle'],
-                                     'always_displayed' => 1,
-                                     'pub'              => 1);
+            if (!$request) {
+                $value['public_names'] = XDB::fetchOneAssoc('SELECT  particles, lastname_main, lastname_marital, lastname_ordinary,
+                                                                     firstname_main, firstname_ordinary, pseudonym
+                                                               FROM  profile_public_names
+                                                              WHERE  pid = {?}',
+                                                            $page->pid());
+
+                $flags = new PlFlagSet($value['public_names']['particles']);
+                unset($value['public_names']['particles']);
+                static $suffixes = array('main', 'marital', 'ordinary');
+
+                foreach ($suffixes as $suffix) {
+                    $value['public_names']['particle_' . $suffix] = $flags->hasFlag($suffix);
                 }
-            }
-            if ($sn) {
-                do {
-                    $value[] = $sn;
-                } while ($sn = $sn_all->next());
-            }
-            $namesRequest = ProfileValidate::get_typed_requests($page->pid(), 'usage');
-            if (count($namesRequest) > 0) {
+            } else {
+                $value['public_names'] = $request;
                 Platal::page()->assign('validation', true);
             }
-            $value = $this->clean($value);
+
+            $value['private_names'] = XDB::fetchAllAssoc('SELECT  type, name
+                                                            FROM  profile_private_names
+                                                           WHERE  pid = {?}
+                                                        ORDER BY  type, id',
+                                                         $page->pid());
         } else {
-            require_once 'name.func.inc.php';
-
-            $value = $this->clean($value);
-            $res = XDB::query("SELECT  s.particle, s.name
-                                 FROM  profile_name      AS s
-                           INNER JOIN  profile_name_enum AS e ON (e.id = s.typeid)
-                                WHERE  s.pid = {?} AND (e.type = 'lastname' OR e.type = 'firstname')
-                             ORDER BY  e.type = 'firstname'",
-                             $page->pid());
-            $res = $res->fetchAllAssoc();
-            $initial = array();
-            $initial['lastname'] = $res[0]['particle'] . $res[0]['name'];
-            $initial['firstname'] = $res[1]['name'];
-            $sn_types = build_types();
-            $this->search_names = array();
-            foreach ($value as &$sn) {
-                $sn['name'] = trim($sn['name']);
-                if (S::user()->isMe($page->owner) && ($sn['type'] == 'firstname' || $sn['type'] == 'lastname')) {
-                    $sn['name'] = $this->prepare($page, $sn['type'], $sn['name'],
-                                                 $initial[$sn['type']], $success_tmp);
-                    $success = $success && $success_tmp;
-                }
-                if ($sn['pub']) {
-                    if (isset($sn['particle']) && ($sn['particle'] != '')) {
-                        // particle is before first blank
-                        list($particle, $name) = explode(' ', $sn['name'], 2);
-                        $particle = trim($particle) . ' ';
-                        if (!$name) {
-                            // particle is before first quote
-                            list($particle, $name) = explode('\'', $sn['name'], 2);
-                            $particle = trim($particle);
-                            if (!$name) {
-                                // actually there is no particle
-                                $particle = '';
-                                $name = $sn['name'];
-                            }
-                        }
-                    } else {
-                        $particle = '';
-                        $name     = $sn['name'];
-                    }
-                }
-                if ($sn['name'] != '') {
-                    if ($sn['pub']) {
-                        $this->search_names[$sn['typeid']] = array('fullname' => $sn['name'],
-                                                                   'name'     => $name,
-                                                                   'particle' => $particle,
-                                                                   'pub'      => $sn['pub']);
-                    } else {
-                        if (isset($this->search_names[$sn['typeid']])) {
-                            $this->search_names[$sn['typeid']][] = $sn['name'];
-                        } else {
-                            $this->search_names[$sn['typeid']] = array('fullname' => $sn['name']);
-                        }
-                        $sn['type_name'] = $sn_types[$sn['typeid']];
+            foreach ($value['public_names'] as $key => $name) {
+                $value['public_names'][$key] = trim($name);
+            }
+            if (isset($value['private_names'])) {
+                foreach ($value['private_names'] as $key => $name) {
+                    $value['private_names'][$key]['name'] = trim($name['name']);
+                    if ($value['private_names'][$key]['name'] == '') {
+                        unset($value['private_names'][$key]);
                     }
                 }
             }
-            $res = XDB::query("SELECT  public_name, private_name
-                                 FROM  profile_display
-                                WHERE  pid = {?}",
-                              $page->pid());
-            list($public_name, $private_name) = $res->fetchOneRow();
-            if ($success) {
-                $sn_types_private       = build_types('private');
-                $this->private_name_end = build_private_name($this->search_names, $sn_types_private);
-                $private_name           = $public_name . $this->private_name_end;
+
+            if (S::user()->isMe($page->owner)) {
+                $success = $this->prepare($page, $value['public_names']);
             }
-            Platal::page()->assign('public_name', $public_name);
-            Platal::page()->assign('private_name', $private_name);
         }
 
+        require_once 'name.func.inc.php';
+        $public_name = build_first_name($value['public_names']) . ' ' . build_full_last_name($value['public_names'], $page->profile->isFemale());
+        if (isset($value['private_names'])) {
+            $private_name_end = build_private_name($value['private_names']);
+            $private_name = $public_name . $private_name_end;
+        } else {
+            $value['private_names'] = array();
+            $private_name = $public_name;
+        }
+
+        Platal::page()->assign('public_name', $public_name);
+        Platal::page()->assign('private_name', $private_name);
+
         return $value;
     }
 
@@ -211,36 +130,60 @@ class ProfileSettingSearchNames implements ProfileSetting
     {
         require_once 'name.func.inc.php';
 
-        $sn_old = build_sn_pub($page->pid());
-        XDB::execute("DELETE FROM  s
-                            USING  profile_name      AS s
-                       INNER JOIN  profile_name_enum AS e ON (s.typeid = e.id)
-                            WHERE  s.pid = {?} AND NOT FIND_IN_SET('not_displayed', e.flags)",
-                     $page->pid());
-        $has_new = set_alias_names($this->search_names, $sn_old, $page->pid(), $page->owner);
+        $old = XDB::fetchOneAssoc('SELECT  lastname_main, lastname_marital, lastname_ordinary,
+                                           firstname_main, firstname_ordinary, pseudonym
+                                     FROM  profile_public_names
+                                    WHERE  pid = {?}',
+                                  $page->pid());
 
-        // Only requires validation if modification in public names
-        if ($has_new) {
-            $new_names = new NamesReq(S::user(), $page->profile, $this->search_names, $this->private_name_end);
+        if ($has_diff = $this->diff($page->pid(), $old, $value['public_names'])) {
+            $new_names = new NamesReq(S::user(), $page->profile, $value['public_names'], $old);
             $new_names->submit();
-            Platal::page()->trigWarning('La demande de modification de tes noms a bien été prise en compte.' .
-                                        ' Tu recevras un email dès que ces changements auront été effectués.');
+            Platal::page()->assign('validation', true);
+            Platal::page()->trigWarning('La demande de modification des noms a bien été prise en compte.' .
+                                        ' Un email sera envoyé dès que ces changements auront été effectués.');
+        }
+
+        XDB::execute('DELETE FROM  profile_private_names
+                            WHERE  pid = {?}',
+                     $page->pid());
+        $values = array();
+        $nickname = $lastname = $firstname = 0;
+        if (isset($value['private_names'])) {
+            foreach ($value['private_names'] as $name) {
+                $values[] = XDB::format('({?}, {?}, {?}, {?})', $page->pid(), $name['type'], $$name['type']++, $name['name']);
+            }
+        }
+        if (count($values)) {
+            XDB::rawExecute('INSERT INTO  profile_private_names (pid, type, id, name)
+                                  VALUES  ' . implode(',', $values));
+        }
+
+        if ($has_diff) {
+            update_display_names($page->profile, $old, $value['private_names']);
         } else {
-            $display_names = array();
-            build_display_names($display_names, $this->search_names,
-                                $page->profile->isFemale(), $this->private_name_end);
-            set_profile_display($display_names, $page->profile);
+            update_display_names($page->profile,
+                                 $value['public_names'], (isset($value['private_names']) ? $value['private_names'] : null));
         }
     }
 
     public function getText($value) {
-        $names = array();
-        foreach ($value as $name) {
-            if ($name['name'] != '') {
-                $names[] = mb_strtolower($name['type_name']) . ' : ' . $name['name'];
+        $public_names = array();
+        foreach ($value['public_names'] as $name) {
+            if ($name != '') {
+                $public_names[] = $name;
+            }
+        }
+
+        if (isset($value['private_names']) && count($value['private_names'])) {
+            $private_names = array();
+            foreach ($value['private_names'] as $name) {
+                $private_names[] = $name['name'];
             }
+            return 'noms publics : ' . implode(', ' , $public_names) . ', noms privés : ' . implode(', ' , $private_names);;
         }
-        return implode(', ' , $names);
+
+        return 'noms publics : ' . implode(', ' , $public_names);
     }
 }
 
@@ -265,7 +208,7 @@ class ProfileSettingEdu implements ProfileSetting
             $value = array();
             $value = XDB::fetchAllAssoc("SELECT  eduid, degreeid, fieldid, grad_year, program
                                            FROM  profile_education
-                                          WHERE  pid = {?} AND !FIND_IN_SET('primary', flags)
+                                          WHERE  pid = {?} AND !(FIND_IN_SET('primary', flags) OR FIND_IN_SET('secondary', flags))
                                        ORDER BY  id",
                                         $page->pid());
         } else if (!is_array($value)) {
@@ -296,10 +239,11 @@ class ProfileSettingEdu implements ProfileSetting
     public function save(ProfilePage $page, $field, $value)
     {
         XDB::execute("DELETE FROM  profile_education
-                            WHERE  pid = {?} AND !FIND_IN_SET('primary', flags)",
+                            WHERE  pid = {?} AND !(FIND_IN_SET('primary', flags) OR FIND_IN_SET('secondary', flags))",
                      $page->pid());
+        $schoolsList = DirEnum::getOptions(DirEnum::EDUSCHOOLS);
         foreach ($value as $eduid=>&$edu) {
-            if ($edu['eduid'] != '') {
+            if ($edu['eduid'] != '' && $schoolsList[$edu['eduid']] != Profile::EDU_X) {
                 $fieldId = ($edu['fieldid'] == 0) ? null : $edu['fieldid'];
                 XDB::execute("INSERT INTO  profile_education
                                       SET  id = {?}, pid = {?}, eduid = {?}, degreeid = {?},
@@ -368,8 +312,8 @@ class ProfileSettingMainEdu implements ProfileSetting
             $value = array();
             $value = XDB::fetchAllAssoc("SELECT  degreeid, fieldid, promo_year, program
                                            FROM  profile_education
-                                          WHERE  pid = {?} AND FIND_IN_SET('primary', flags)
-                                       ORDER BY  degreeid",
+                                          WHERE  pid = {?} AND (FIND_IN_SET('primary', flags) OR FIND_IN_SET('secondary', flags))
+                                       ORDER BY  NOT FIND_IN_SET('primary', flags), degreeid",
                                         $page->pid());
 
             foreach ($value as &$item) {
@@ -394,7 +338,7 @@ class ProfileSettingMainEdu implements ProfileSetting
             $fieldId = ($item['fieldid'] == 0) ? null : $item['fieldid'];
             XDB::execute("UPDATE  profile_education
                              SET  fieldid = {?}, program = {?}
-                           WHERE  pid = {?} AND FIND_IN_SET('primary', flags) AND degreeid = {?}",
+                           WHERE  pid = {?} AND (FIND_IN_SET('primary', flags) OR FIND_IN_SET('secondary', flags)) AND degreeid = {?}",
                          $fieldId, $item['program'], $page->pid(), $item['degreeid']);
         }
     }
@@ -404,11 +348,11 @@ class ProfileSettingMainEdu implements ProfileSetting
         $educations = array();
         foreach ($value as $item) {
             $details = array($this->cycles[$item['degreeid']]);
-            if ($education['program']) {
-                $details[] = '« ' . $education['program'] . ' »';
+            if ($item['program']) {
+                $details[] = '« ' . $item['program'] . ' »';
             }
-            if ($education['fieldid']) {
-                $details[] = $fieldsList[$education['fieldid']];
+            if ($item['fieldid']) {
+                $details[] = $fieldsList[$item['fieldid']];
             }
         }
         return implode(', ', $educations);
@@ -526,6 +470,79 @@ class ProfileSettingNetworking implements ProfileSetting
     }
 }
 
+class ProfileSettingHobby implements ProfileSetting
+{
+    private $pub;
+    static private $type = array('Sport', 'Loisir', 'Hobby');
+
+    public function __construct()
+    {
+        $this->pub = new ProfileSettingPub();
+    }
+
+    public function value(ProfilePage $page, $field, $value, &$success)
+    {
+        if (is_null($value)) {
+            $value = XDB::fetchAllAssoc('SELECT  type, text, pub
+                                           FROM  profile_hobby
+                                          WHERE  pid = {?}',
+                                         $page->pid());
+        }
+        if (!is_array($value)) {
+            return array();
+        }
+        $success = true;
+        foreach($value as $i => &$hobby) {
+            $hobby['text'] = trim($hobby['text']);
+            if (!$hobby['text'] ||!in_array($hobby['type'], self::$type)) {
+                unset($value[$i]);
+            } else {
+                if (!isset($hobby['pub'])) {
+                    $hobby['pub'] = 'private';
+                }
+                $s = true;
+                $hobby['pub'] = $this->pub->value($page, 'pub', $hobby['pub'], $s);
+                $success = $success && $s;
+            }
+        }
+        return $value;
+    }
+
+    public function save(ProfilePage $page, $field, $value)
+    {
+        XDB::execute('DELETE FROM profile_hobby
+                            WHERE pid = {?}',
+                     $page->pid());
+        if (!count($value)) {
+            return;
+        }
+        foreach ($value as $id => $hobby) {
+            XDB::execute("INSERT INTO  profile_hobby (pid, id, type, text, pub)
+                               VALUES  ({?}, {?}, {?}, {?}, {?})",
+                         $page->pid(), $id, $hobby['type'], $hobby['text'], $hobby['pub']);
+        }
+    }
+
+    public function getText($value) {
+        static $pubs = array('public' => 'publique', 'private' => 'privé');
+        $hobbies = array();
+        foreach (self::$type as $type) {
+            $hobbies[$type] = array();
+        }
+        foreach ($value as $hobby) {
+            $hobbies[$hobby['type']][] = $hobby['text'] . ' (affichage ' . $pubs[$hobby['pub']] . ')';
+        }
+        $text = array();
+        foreach (self::$type as $type) {
+            if (!empty($hobbies[$type])) {
+                $text[] = $hobbies[$type] . ' : ' . implode(', ' , $hobbies[$type]);
+            }
+        }
+        return implode(', ' , $text);
+    }
+}
+
+
 class ProfileSettingPromo implements ProfileSetting
 {
     public function __construct(){}
@@ -573,7 +590,13 @@ class ProfileSettingPromo implements ProfileSetting
                 }
                 Platal::page()->assign('promo_choice', $promoChoice);
             }
-            return $yearpromo;
+
+            // If this profile belongs to an X, return grad year minus education duration.
+            if ($page->profile->mainEducation() == 'X') {
+                return $gradYear - $page->profile->mainEducationDuration();
+            }
+
+            return $gradYear;
         }
 
         // If this profile belongs to an X, $promoNew needs to be changed to
@@ -606,31 +629,29 @@ class ProfilePageGeneral extends ProfilePage
     public function __construct(PlWizard $wiz)
     {
         parent::__construct($wiz);
-        $this->settings['search_names']
-                                  = new ProfileSettingSearchNames();
-        $this->settings['nationality1']
-                                  = $this->settings['nationality2']
-                                  = $this->settings['nationality3']
-                                  = $this->settings['promo_display']
-                                  = null;
-        $this->settings['email_directory']
-                                  = new ProfileSettingEmail();
-        $this->settings['email_directory_new']
-                                  = new ProfileSettingEmailDirectory();
-        $this->settings['networking'] = new ProfileSettingNetworking();
-        $this->settings['tels']   = new ProfileSettingPhones();
-        $this->settings['edus']   = new ProfileSettingEdu();
+        $this->settings['search_names'] = new ProfileSettingSearchNames();
+        $this->settings['nationality1'] = $this->settings['nationality2']
+                                        = $this->settings['nationality3']
+                                        = $this->settings['promo_display']
+                                        = null;
+        $this->settings['email_directory'] = new ProfileSettingEmail();
+        $this->settings['email_directory_new'] = new ProfileSettingEmailDirectory();
+        $this->settings['tels'] = new ProfileSettingPhones();
+        $this->settings['edus'] = new ProfileSettingEdu();
         $this->settings['main_edus'] = new ProfileSettingMainEdu();
         $this->settings['promo']  = new ProfileSettingPromo();
-        $this->watched= array('tels' => true,
-                              'networking' => true, 'edus' => true,
-                              'nationality1' => true, 'nationality2' => true,
-                              'nationality3' => true, 'search_names' => true);
+        $this->settings['networking'] = new ProfileSettingNetworking();
+        $this->settings['hobbies'] = new ProfileSettingHobby();
+        $this->watched = array('tels' => true,
+                               'networking' => true, 'edus' => true,
+                               'nationality1' => true, 'nationality2' => true,
+                               'nationality3' => true, 'search_names' => true);
 
         /* Some fields editable under condition */
         if (!S::user()->isMe($this->owner)) {
             $this->settings['deathdate'] = new ProfileSettingDate(true);
             $this->settings['birthdate'] = new ProfileSettingDate(true);
+            $this->settings['birthdate_ref'] = new ProfileSettingDate(true);
         } else {
             $this->settings['yourself'] = null;
             $this->settings['birthdate'] = new ProfileSettingDate();
@@ -638,9 +659,8 @@ class ProfilePageGeneral extends ProfilePage
         if (S::user()->checkPerms('directory_private')
             || S::user()->isMyProfile($this->owner)) {
             $this->settings['freetext'] = null;
-            $this->settings['freetext_pub']
-                                      = $this->settings['photo_pub']
-                                      = new ProfileSettingPub();
+            $this->settings['freetext_pub'] = $this->settings['photo_pub']
+                                            = new ProfileSettingPub();
             $this->watched['freetext'] = true;
         }
 
@@ -652,7 +672,7 @@ class ProfilePageGeneral extends ProfilePage
         $res = XDB::query("SELECT  p.nationality1, p.nationality2, p.nationality3, IF(p.birthdate = 0, '', p.birthdate) AS birthdate,
                                    p.email_directory as email_directory, pd.promo AS promo_display,
                                    p.freetext, p.freetext_pub, p.ax_id AS matricule_ax, pd.yourself,
-                                   p.deathdate
+                                   p.deathdate, IF(p.birthdate_ref = 0, '', p.birthdate_ref) AS birthdate_ref
                              FROM  profiles              AS p
                        INNER JOIN  profile_display       AS pd ON (pd.pid = p.pid)
                             WHERE  p.pid = {?}", $this->pid());
@@ -757,6 +777,12 @@ class ProfilePageGeneral extends ProfilePage
                 }
             }
         }
+        if ($this->orig['birthdate_ref'] == 0 && !S::user()->isMe($this->owner) && $this->changed['birthdate_ref']) {
+            XDB::execute('UPDATE  profiles
+                             SET  birthdate_ref = {?}
+                           WHERE  pid = {?}',
+                         ProfileSettingDate::toSQLDate($this->values['birthdate_ref']), $this->pid());
+        }
         if (!S::user()->isMe($this->owner) && $this->changed['deathdate']) {
             XDB::execute('UPDATE  profiles
                              SET  deathdate = {?}, deathdate_rec = NOW()
@@ -795,13 +821,9 @@ class ProfilePageGeneral extends ProfilePage
                          ORDER BY  name");
         $page->assign('network_list', $res->fetchAllAssoc());
 
-        $res = XDB::query("SELECT  public_name, private_name
-                             FROM  profile_display
-                            WHERE  pid = {?}",
-                          $this->pid());
-        $res = $res->fetchOneRow();
-        $page->assign('public_name', $res[0]);
-        $page->assign('private_name', $res[1]);
+        $page->assign('lastnames', array('main' => 'Nom patronymique', 'marital' => 'Nom marital', 'ordinary' => 'Nom usuel'));
+        $page->assign('firstnames', array('firstname_main' => 'Prénom', 'firstname_ordinary' => 'Prénom usuel', 'pseudonym' => 'Pseudonyme (nom de plume)'));
+        $page->assign('other_names', array('nickname' => 'Surnom', 'firstname' => 'Autre prénom', 'lastname' => 'Autre nom'));
         $page->assign('isFemale', $this->profile->isFemale() ? 1 : 0);
     }
 }