Allow edition of the death date in the profile edition page.

[platal.git] / modules / profile / general.inc.php

diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php
index f89b8ac..7e2bfff 100644 (file)
--- a/modules/profile/general.inc.php
+++ b/modules/profile/general.inc.php
@@ -126,7 +126,6 @@ class ProfileSettingSearchNames implements ProfileSetting
                     $value[] = $sn;
                 } while ($sn = $sn_all->next());
             }
-            require_once 'validations.inc.php';
             $namesRequest = ProfileValidate::get_typed_requests($page->pid(), 'usage');
             if (count($namesRequest) > 0) {
                 Platal::page()->assign('validation', true);
@@ -211,7 +210,6 @@ class ProfileSettingSearchNames implements ProfileSetting
     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
@@ -275,6 +273,10 @@ class ProfileSettingEdu implements ProfileSetting
         } else {
             $i = 0;
             foreach ($value as $key=>&$edu) {
+                if ($edu['eduid'] < 1 || !isset($edu['degreeid']) || $edu['degreeid'] < 1) {
+                    Platal::page()->trigError('L\'université ou le diplôme d\'une formation manque.');
+                    $success = false;
+                }
                 if (($edu['grad_year'] < 1921) || ($edu['grad_year'] > (date('Y') + 4))) {
                     Platal::page()->trigWarning('L\'année d\'obtention du diplôme est mal ou non renseignée, elle doit être du type : 2004.');
                     $edu['grad_year'] = null;
@@ -298,11 +300,12 @@ class ProfileSettingEdu implements ProfileSetting
                      $page->pid());
         foreach ($value as $eduid=>&$edu) {
             if ($edu['eduid'] != '') {
+                $fieldId = ($edu['fieldid'] == 0) ? null : $edu['fieldid'];
                 XDB::execute("INSERT INTO  profile_education
                                       SET  id = {?}, pid = {?}, eduid = {?}, degreeid = {?},
                                            fieldid = {?}, grad_year = {?}, program = {?}",
                              $eduid, $page->pid(), $edu['eduid'], $edu['degreeid'],
-                             $edu['fieldid'], $edu['grad_year'], $edu['program']);
+                             $fieldId, $edu['grad_year'], $edu['program']);
             }
         }
     }
@@ -457,8 +460,6 @@ 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.');
@@ -512,7 +513,7 @@ class ProfileSettingPromo implements ProfileSetting
 }
 
 
-class ProfileSettingGeneral extends ProfilePage
+class ProfilePageGeneral extends ProfilePage
 {
     protected $pg_template = 'profile/general.tpl';
 
@@ -522,6 +523,9 @@ class ProfileSettingGeneral extends ProfilePage
         $this->settings['search_names']
                                   = new ProfileSettingSearchNames();
         $this->settings['birthdate'] = new ProfileSettingDate();
+        if (!S::user()->isMe($this->owner)) {
+            $this->settings['deathdate'] = new ProfileSettingDate();
+        }
         $this->settings['freetext_pub']
                                   = $this->settings['photo_pub']
                                   = new ProfileSettingPub();
@@ -551,7 +555,8 @@ class ProfileSettingGeneral extends ProfilePage
         // Checkout all data...
         $res = XDB::query("SELECT  p.nationality1, p.nationality2, p.nationality3, p.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.ax_id AS matricule_ax, pd.yourself,
+                                   p.deathdate
                              FROM  profiles              AS p
                        INNER JOIN  profile_display       AS pd ON (pd.pid = p.pid)
                             WHERE  p.pid = {?}", $this->pid());
@@ -614,7 +619,7 @@ class ProfileSettingGeneral extends ProfilePage
                                   freetext = {?}, freetext_pub = {?}, email_directory = {?}
                            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']),
+                          ProfileSettingDate::toSQLDate($this->values['birthdate']),
                           $this->values['freetext'], $this->values['freetext_pub'], $new_email, $this->pid());
         }
         if ($this->changed['photo_pub']) {
@@ -648,6 +653,25 @@ class ProfileSettingGeneral extends ProfilePage
                 }
             }
         }
+        if ($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)