More robust $profile->yearpromo(): it does relies on displayed promotion as the lates...

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

diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php
index 8453ae0..85c3dd5 100644 (file)
--- a/modules/profile/general.inc.php
+++ b/modules/profile/general.inc.php
@@ -217,7 +217,7 @@ class ProfileSettingSearchNames implements ProfileSetting
                        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());
+        $has_new = set_alias_names($this->search_names, $sn_old, $page->pid(), $page->owner);
 
         // Only requires validation if modification in public names
         if ($has_new) {
@@ -490,10 +490,7 @@ class ProfileSettingPromo implements ProfileSetting
     {
         $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()) {
@@ -675,14 +672,18 @@ class ProfilePageGeneral 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());
                 }
             }
         }
@@ -717,7 +718,7 @@ class ProfilePageGeneral 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