Add 'hidden' flag to text descriptions of the 'pub' flag
[platal.git] / modules / profile / general.inc.php
index 38cbd07..f9da015 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2014 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
 
 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,213 +38,144 @@ 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)
+    public function value(ProfilePage $page, $field, $value, &$success)
     {
-        $success     = true;
-        $success_tmp = true;
+        require_once 'name.func.inc.php';
+        $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");
-
-            $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 ($sn) {
-                do {
-                    $value[] = $sn;
-                } while ($sn = $sn_all->next());
-            }
-            require_once 'validations.inc.php';
-            $namesRequest = ProfileValidate::get_typed_requests($page->pid(), 'usage');
-            if (count($namesRequest) > 0) {
+            $request = NamesReq::getPublicNames($page->pid());
+
+            if (!$request) {
+                $value['public_names'] = XDB::fetchOneAssoc('SELECT  lastname_main, lastname_marital, lastname_ordinary,
+                                                                     firstname_main, firstname_ordinary, pseudonym
+                                                               FROM  profile_public_names
+                                                              WHERE  pid = {?}',
+                                                            $page->pid());
+            } 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 ($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] = capitalize_name(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);
         }
 
+        $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;
     }
 
-    public function save(ProfilePage &$page, $field, $value)
+    public function save(ProfilePage $page, $field, $value)
     {
         require_once 'name.func.inc.php';
-        require_once 'validations.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->id());
+        $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[] = $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);
     }
 }
 
@@ -260,14 +193,14 @@ class ProfileSettingEdu implements ProfileSetting
         return ($a < $b) ? -1 : 1;
     }
 
-    public function value(ProfilePage &$page, $field, $value, &$success)
+    public function value(ProfilePage $page, $field, $value, &$success)
     {
         $success = true;
         if (is_null($value)) {
             $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)) {
@@ -295,13 +228,14 @@ class ProfileSettingEdu implements ProfileSetting
         return $value;
     }
 
-    public function save(ProfilePage &$page, $field, $value)
+    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 = {?},
@@ -317,12 +251,101 @@ class ProfileSettingEdu implements ProfileSetting
         $degreesList = DirEnum::getOptions(DirEnum::EDUDEGREES);
         $fieldsList = DirEnum::getOptions(DirEnum::EDUFIELDS);
         $educations = array();
-        foreach ($value as $education) {
-            $educations[] = 'Université : ' . $schoolsList[$education['eduid']]
-                          . ', diplôme : ' . $degreesList[$education['degreeid']]
-                          . ', domaine : ' . $fieldsList[$education['fieldid']]
-                          . ', année d\'obtention : ' . $education['grad_year']
-                          . ', intitulé : ' . $education['program'];
+        foreach ($value as $id => $education) {
+            // XXX: the following condition should be removed once there are no more incomplete educations.
+            if (is_null($education['eduid']) || is_null($education['degreeid'])) {
+                if (is_null($education['eduid']) && is_null($education['degreeid'])) {
+                    $educations[$id] = 'formation manquante';
+                } else {
+                    $educations[$id] = (is_null($education['eduid']) ? 'université manquante' : $schoolsList[$education['eduid']]) . ', '
+                                     . (is_null($education['degreeid']) ? 'diplôme manquant' : $degreesList[$education['degreeid']]);
+                }
+            } else {
+                $educations[$id] = $schoolsList[$education['eduid']] . ', ' . $degreesList[$education['degreeid']];
+            }
+
+            $details = array();
+            if ($education['grad_year']) {
+                $details[] = $education['grad_year'];
+            }
+            if ($education['program']) {
+                $details[] = '« ' . $education['program'] . ' »';
+            }
+            if ($education['fieldid']) {
+                $details[] = $fieldsList[$education['fieldid']];
+            }
+            if (count($details)) {
+                $educations[$id] .= ' (' . implode(', ', $details) . ')';
+            }
+        }
+        return implode(', ', $educations);
+    }
+}
+
+class ProfileSettingMainEdu implements ProfileSetting
+{
+    private $cycles;
+
+    public function __construct()
+    {
+        $eduDegrees = DirEnum::getOptions(DirEnum::EDUDEGREES);
+        $eduDegrees = array_flip($eduDegrees);
+        $this->cycles = array(
+            $eduDegrees[Profile::DEGREE_X] => 'Cycle polytechnicien',
+            $eduDegrees[Profile::DEGREE_M] => 'Cycle master',
+            $eduDegrees[Profile::DEGREE_D] => 'Cycle doctoral'
+        );
+    }
+
+    public function value(ProfilePage $page, $field, $value, &$success)
+    {
+        $success = true;
+        if (is_null($value)) {
+            $value = array();
+            $value = XDB::fetchAllAssoc("SELECT  degreeid, fieldid, promo_year, program
+                                           FROM  profile_education
+                                          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) {
+                $item['cycle'] = $this->cycles[$item['degreeid']];
+            }
+        } elseif (!is_array($value)) {
+            $value = array();
+        } else {
+            foreach ($value as $key => $item) {
+                if (!isset($item['degreeid'])) {
+                    unset($value[$key]);
+                }
+            }
+        }
+
+        return $value;
+    }
+
+    public function save(ProfilePage $page, $field, $value)
+    {
+        foreach ($value as $item) {
+            $fieldId = ($item['fieldid'] == 0) ? null : $item['fieldid'];
+            XDB::execute("UPDATE  profile_education
+                             SET  fieldid = {?}, program = {?}
+                           WHERE  pid = {?} AND (FIND_IN_SET('primary', flags) OR FIND_IN_SET('secondary', flags)) AND degreeid = {?}",
+                         $fieldId, $item['program'], $page->pid(), $item['degreeid']);
+        }
+    }
+
+    public function getText($value) {
+        $fieldsList = DirEnum::getOptions(DirEnum::EDUFIELDS);
+        $educations = array();
+        foreach ($value as $item) {
+            $details = array($this->cycles[$item['degreeid']]);
+            if ($item['program']) {
+                $details[] = '« ' . $item['program'] . ' »';
+            }
+            if ($item['fieldid']) {
+                $details[] = $fieldsList[$item['fieldid']];
+            }
         }
         return implode(', ', $educations);
     }
@@ -331,9 +354,9 @@ class ProfileSettingEdu implements ProfileSetting
 class ProfileSettingEmailDirectory implements ProfileSetting
 {
     public function __construct(){}
-    public function save(ProfilePage &$page, $field, $value){}
+    public function save(ProfilePage $page, $field, $value){}
 
-    public function value(ProfilePage &$page, $field, $value, &$success)
+    public function value(ProfilePage $page, $field, $value, &$success)
     {
         $p = Platal::page();
 
@@ -372,7 +395,7 @@ class ProfileSettingNetworking implements ProfileSetting
         $this->number = new ProfileSettingNumber();
     }
 
-    public function value(ProfilePage &$page, $field, $value, &$success)
+    public function value(ProfilePage $page, $field, $value, &$success)
     {
         if (is_null($value)) {
             $value = XDB::fetchAllAssoc("SELECT  n.address, n.pub, n.nwid AS type
@@ -413,7 +436,7 @@ class ProfileSettingNetworking implements ProfileSetting
         return $value;
     }
 
-    public function save(ProfilePage &$page, $field, $value)
+    public function save(ProfilePage $page, $field, $value)
     {
         XDB::execute("DELETE FROM profile_networking
                             WHERE pid = {?}",
@@ -430,20 +453,93 @@ class ProfileSettingNetworking implements ProfileSetting
     }
 
     public function getText($value) {
+        static $pubs = array('public' => 'publique', 'ax' => 'annuaire papier', 'private' => 'privé', 'hidden' => 'administrateurs');
         $networkings = array();
         foreach ($value as $network) {
-            $networkings[] = 'nom : ' . $network['name'] . ', adresse : ' . $network['address']
-                           . ', affichage : ' . $network['pub'];
+            $networkings[] = $network['name'] . ' : ' . $network['address'] . ' (affichage ' . $pubs[$network['pub']] . ')';
+        }
+        return implode(', ' , $networkings);
+    }
+}
+
+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)
+    {
+        $success = true;
+        if (is_null($value)) {
+            $value = XDB::fetchAllAssoc('SELECT  type, text, pub
+                                           FROM  profile_hobby
+                                          WHERE  pid = {?}',
+                                         $page->pid());
+        }
+        if (!is_array($value)) {
+            return array();
+        }
+        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', 'ax' => 'annuaire papier', 'private' => 'privé', 'hidden' => 'administrateurs');
+        $hobbies = array();
+        foreach (self::$type as $type) {
+            $hobbies[$type] = array();
         }
-        return implode(' ; ' , $networkings);
+        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(){}
 
-    public function save(ProfilePage &$page, $field, $value)
+    public function save(ProfilePage $page, $field, $value)
     {
         $gradYearNew = $value;
         if ($page->profile->mainEducation() == 'X') {
@@ -462,22 +558,17 @@ class ProfileSettingPromo implements ProfileSetting
                          $gradYearNew, $page->profile->id());
             Platal::page()->trigSuccess('Ton statut « orange » a été supprimé.');
         } else {
-            require_once 'validations.inc.php';
-
             $myorange = new OrangeReq(S::user(), $page->profile, $gradYearNew);
             $myorange->submit();
             Platal::page()->trigSuccess('Tu pourras changer l\'affichage de ta promotion dès que ta nouvelle promotion aura été validée.');
         }
     }
 
-    public function value(ProfilePage &$page, $field, $value, &$success)
+    public function value(ProfilePage $page, $field, $value, &$success)
     {
         $entryYear = $page->profile->entry_year;
         $gradYear  = $page->profile->grad_year;
-        $yearpromo = $page->profile->grad_year;
-        if ($page->profile->mainEducation() == 'X') {
-            $yearpromo -= $page->profile->mainEducationDuration();
-        }
+        $yearpromo = $page->profile->yearpromo();
         $success   = true;
         if (is_null($value) || $value == $yearpromo) {
             if ($gradYear != $entryYear + $page->profile->mainEducationDuration()) {
@@ -491,7 +582,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
@@ -517,46 +614,61 @@ class ProfileSettingPromo implements ProfileSetting
 }
 
 
-class ProfileSettingGeneral extends ProfilePage
+class ProfilePageGeneral extends ProfilePage
 {
     protected $pg_template = 'profile/general.tpl';
 
-    public function __construct(PlWizard &$wiz)
+    public function __construct(PlWizard $wiz)
     {
         parent::__construct($wiz);
-        $this->settings['search_names']
-                                  = new ProfileSettingSearchNames();
-        $this->settings['birthdate'] = new ProfileSettingDate();
-        $this->settings['freetext_pub']
-                                  = $this->settings['photo_pub']
-                                  = new ProfileSettingPub();
-        $this->settings['freetext']
-                                  = $this->settings['nationality1']
-                                  = $this->settings['nationality2']
-                                  = $this->settings['nationality3']
-                                  = $this->settings['yourself']
-                                  = $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']
+                                        = $this->settings['profile_title']
+                                        = 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('freetext' => true, '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);
+            $this->settings['axfreetext'] = null;
+        } else {
+            $this->settings['yourself'] = null;
+            $this->settings['birthdate'] = new ProfileSettingDate();
+        }
+        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->watched['freetext'] = true;
+        }
+
+        Platal::page()->assign('is_registered', ($this->owner->perms ? true : false));
     }
 
     protected function _fetchData()
     {
         // Checkout all data...
-        $res = XDB::query("SELECT  p.nationality1, p.nationality2, p.nationality3, p.birthdate,
+        $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.freetext, p.freetext_pub, p.axfreetext, p.ax_id AS matricule_ax, pd.yourself,
+                                   p.deathdate, IF(p.birthdate_ref = 0, '', p.birthdate_ref) AS birthdate_ref,
+                                   p.title AS profile_title
                              FROM  profiles              AS p
                        INNER JOIN  profile_display       AS pd ON (pd.pid = p.pid)
                             WHERE  p.pid = {?}", $this->pid());
@@ -566,7 +678,11 @@ class ProfileSettingGeneral extends ProfilePage
         $res = XDB::query("SELECT  pub
                              FROM  profile_photos
                             WHERE  pid = {?}", $this->pid());
-        $this->values['photo_pub'] = $res->fetchOneCell();
+        if ($res->numRows() == 0) {
+            $this->values['photo_pub'] = 'private';
+        } else {
+            $this->values['photo_pub'] = $res->fetchOneCell();
+        }
 
         if ($this->owner) {
             $res = XDB::query("SELECT  COUNT(*)
@@ -583,7 +699,7 @@ class ProfileSettingGeneral extends ProfilePage
     {
         if ($this->changed['nationality1'] || $this->changed['nationality2'] || $this->changed['nationality3']
             || $this->changed['birthdate'] || $this->changed['freetext'] || $this->changed['freetext_pub']
-            || $this->changed['email_directory']) {
+            || $this->changed['axfreetext'] || $this->changed['email_directory'] || $this->changed['profile_title']) {
             if ($this->values['nationality3'] == "") {
                 $this->values['nationality3'] = NULL;
             }
@@ -616,11 +732,12 @@ class ProfileSettingGeneral extends ProfilePage
 
             XDB::execute("UPDATE  profiles
                              SET  nationality1 = {?}, nationality2 = {?}, nationality3 = {?}, birthdate = {?},
-                                  freetext = {?}, freetext_pub = {?}, email_directory = {?}
+                                  freetext = {?}, freetext_pub = {?}, axfreetext = {?}, email_directory = {?}, title = {?}
                            WHERE  pid = {?}",
                           $this->values['nationality1'], $this->values['nationality2'], $this->values['nationality3'],
-                          preg_replace('@(\d{2})/(\d{2})/(\d{4})@', '\3-\2-\1', $this->values['birthdate']),
-                          $this->values['freetext'], $this->values['freetext_pub'], $new_email, $this->pid());
+                          ProfileSettingDate::toSQLDate($this->values['birthdate']),
+                          $this->values['freetext'], $this->values['freetext_pub'], $this->values['axfreetext'], $new_email,
+                          $this->values['profile_title'], $this->pid());
         }
         if ($this->changed['photo_pub']) {
             XDB::execute("UPDATE  profile_photos
@@ -628,7 +745,7 @@ class ProfileSettingGeneral extends ProfilePage
                            WHERE  pid = {?}",
                          $this->values['photo_pub'], $this->pid());
         }
-        if ($this->changed['yourself']) {
+        if (S::user()->isMe($this->owner) && $this->changed['yourself']) {
             if ($this->owner) {
                 XDB::execute('UPDATE  accounts
                                  SET  display_name = {?}
@@ -642,20 +759,49 @@ class ProfileSettingGeneral extends ProfilePage
         }
         if ($this->changed['promo_display']) {
             if ($this->values['promo_display']{0} == $this->profile->mainEducation()) {
-                if (($this->profile->mainEducation() == 'X'
-                     && intval(substr($this->values['promo_display'], 1, 4)) >= $this->profile->entry_year)
+                $yearpromo = intval(substr($this->values['promo_display'], 1, 4));
+                if (($this->profile->mainEducation() == 'X' && $yearpromo >= $this->profile->entry_year)
                     || ($this->profile->mainEducation() != 'X'
-                        && intval(substr($this->values['promo_display'], 1, 4)) >= $this->profile->entry_year + $this->profile->mainEducationDuration())) {
+                        && $yearpromo >= $this->profile->entry_year + $this->profile->mainEducationDuration())) {
                     XDB::execute('UPDATE  profile_display
                                      SET  promo = {?}
                                    WHERE  pid = {?}',
                                  $this->values['promo_display'], $this->pid());
+                    XDB::execute('UPDATE  profile_education
+                                     SET  promo_year = {?}
+                                   WHERE  pid = {?} AND FIND_IN_SET(\'primary\', flags)',
+                                 $yearpromo, $this->pid());
                 }
             }
         }
+        if ($this->changed['birthdate_ref'] && S::admin() && !$this->owner->perms) {
+            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()
+                           WHERE  pid = {?} AND deathdate_rec IS NULL',
+                         ProfileSettingDate::toSQLDate($this->values['deathdate']), $this->pid());
+            if (XDB::affectedRows() > 0) {
+                $this->profile->clear();
+                if ($this->owner) {
+                    $this->owner->clear(true);
+                }
+            } else {
+                /* deathdate_rec was not NULL, this is just an update of the death date
+                 */
+                XDB::execute('UPDATE  profiles
+                                 SET  deathdate = {?}
+                               WHERE  pid = {?}',
+                             ProfileSettingDate::toSQLDate($this->values['deathdate']), $this->pid());
+            }
+        }
     }
 
-    public function _prepare(PlPage &$page, $id)
+    public function _prepare(PlPage $page, $id)
     {
         require_once "education.func.inc.php";
 
@@ -665,23 +811,19 @@ class ProfileSettingGeneral extends ProfilePage
         $page->assign('edu_fields', $res->fetchAllAssoc());
 
         require_once "emails.combobox.inc.php";
-        fill_email_combobox($page, $this->owner);
+        fill_email_combobox($page, array('source', 'redirect', 'job', 'directory'), $this->owner);
 
         $res = XDB::query("SELECT  nw.nwid AS type, nw.name
                              FROM  profile_networking_enum AS nw
                          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);
     }
 }
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
 ?>