X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Fgeneral.inc.php;h=981d9859a56e447843e64ed938c7e44b86b0cec1;hb=7b094a73666cee7650946254c82800e25965db41;hp=e80a593f02834da27499da46d85a70df5859d592;hpb=1f5cd0048509cf752b1a95106367ca0b1a75683c;p=platal.git diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php index e80a593..981d985 100644 --- a/modules/profile/general.inc.php +++ b/modules/profile/general.inc.php @@ -19,8 +19,6 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ -require_once 'name.func.inc.php'; - class ProfileSettingSearchNames implements ProfileSetting { private $private_name_end; @@ -128,6 +126,10 @@ class ProfileSettingSearchNames implements ProfileSetting $value[] = $sn; } while ($sn = $sn_all->next()); } + $namesRequest = ProfileValidate::get_typed_requests($page->pid(), 'usage'); + if (count($namesRequest) > 0) { + Platal::page()->assign('validation', true); + } $value = $this->clean($value); } else { require_once 'name.func.inc.php'; @@ -191,7 +193,7 @@ class ProfileSettingSearchNames implements ProfileSetting $res = XDB::query("SELECT public_name, private_name FROM profile_display WHERE pid = {?}", - S::v('uid')); + $page->pid()); list($public_name, $private_name) = $res->fetchOneRow(); if ($success) { $sn_types_private = build_types('private'); @@ -208,6 +210,7 @@ class ProfileSettingSearchNames implements ProfileSetting public function save(ProfilePage &$page, $field, $value) { require_once 'name.func.inc.php'; + $sn_old = build_sn_pub($page->pid()); XDB::execute("DELETE FROM s USING profile_name AS s @@ -218,7 +221,7 @@ class ProfileSettingSearchNames implements ProfileSetting // Only requires validation if modification in public names if ($has_new) { - $new_names = new NamesReq(S::user(), $this->search_names, $this->private_name_end); + $new_names = new NamesReq(S::user(), $page->profile, $this->search_names, $this->private_name_end); $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.'); @@ -226,9 +229,19 @@ class ProfileSettingSearchNames implements ProfileSetting $display_names = array(); build_display_names($display_names, $this->search_names, $page->profile->isFemale(), $this->private_name_end); - set_profile_display($display_names, $page->pid()); + set_profile_display($display_names, $page->profile); } } + + public function getText($value) { + $names = array(); + foreach ($value as $name) { + if ($name['name'] != '') { + $names[] = $name['type_name'] . ' : ' . $name['name']; + } + } + return implode(', ' , $names); + } } class ProfileSettingEdu implements ProfileSetting @@ -237,8 +250,8 @@ class ProfileSettingEdu implements ProfileSetting } static function sortByGradYear($line1, $line2) { - $a = (int) $line1['grad_year']; - $b = (int) $line2['grad_year']; + $a = (isset($line1['grad_year'])) ? (int) $line1['grad_year'] : 0; + $b = (isset($line2['grad_year'])) ? (int) $line2['grad_year'] : 0; if ($a == $b) { return 0; } @@ -248,21 +261,27 @@ class ProfileSettingEdu implements ProfileSetting public function value(ProfilePage &$page, $field, $value, &$success) { $success = true; - if (is_null($value) || !is_array($value)) { + 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) ORDER BY id", $page->pid()); + } else if (!is_array($value)) { + $value = null; } else { $i = 0; foreach ($value as $key=>&$edu) { - if (($edu['grad_year'] < 1921) || ($edu['grad_year'] > (date('Y') + 4))) { - Platal::page()->trigError('L\'année d\'obtention du diplôme est mal renseignée, elle doit être du type : 2004.'); - $edu['error'] = true; + 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; + $edu['warning'] = true; + } if ($key != $i) { $value[$i] = $edu; unset($value[$key]); @@ -281,14 +300,30 @@ 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']); } } } + + public function getText($value) { + $schoolsList = DirEnum::getOptions(DirEnum::EDUSCHOOLS); + $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']; + } + return implode(', ', $educations); + } } class ProfileSettingEmailDirectory implements ProfileSetting @@ -314,6 +349,10 @@ class ProfileSettingEmailDirectory implements ProfileSetting } return $value; } + + public function getText($value) { + return $value; + } } class ProfileSettingNetworking implements ProfileSetting @@ -387,6 +426,15 @@ class ProfileSettingNetworking implements ProfileSetting $page->pid(), $id, $network['type'], $network['address'], $network['pub']); } } + + public function getText($value) { + $networkings = array(); + foreach ($value as $network) { + $networkings[] = 'nom : ' . $network['name'] . ', adresse : ' . $network['address'] + . ', affichage : ' . $network['pub']; + } + return implode(' ; ' , $networkings); + } } class ProfileSettingPromo implements ProfileSetting @@ -412,9 +460,7 @@ 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(), $gradYearNew); + $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.'); } @@ -460,10 +506,14 @@ class ProfileSettingPromo implements ProfileSetting } return intval($value); } + + public function getText($value) { + return $value; + } } -class ProfileSettingGeneral extends ProfilePage +class ProfilePageGeneral extends ProfilePage { protected $pg_template = 'profile/general.tpl'; @@ -488,7 +538,7 @@ class ProfileSettingGeneral extends ProfilePage $this->settings['email_directory_new'] = new ProfileSettingEmailDirectory(); $this->settings['networking'] = new ProfileSettingNetworking(); - $this->settings['tels'] = new ProfileSettingPhones('user', 0); + $this->settings['tels'] = new ProfileSettingPhones(); $this->settings['edus'] = new ProfileSettingEdu(); $this->settings['promo'] = new ProfileSettingPromo(); $this->watched= array('freetext' => true, 'tels' => true, @@ -501,17 +551,12 @@ class ProfileSettingGeneral extends ProfilePage { // Checkout all data... $res = XDB::query("SELECT p.nationality1, p.nationality2, p.nationality3, p.birthdate, - pp.display_tel as mobile, pp.pub as mobile_pub, p.email_directory as email_directory, pd.promo AS promo_display, p.freetext, p.freetext_pub, p.ax_id AS matricule_ax, pd.yourself FROM profiles AS p INNER JOIN profile_display AS pd ON (pd.pid = p.pid) - LEFT JOIN profile_phones AS pp ON (pp.pid = p.pid AND link_type = 'user') WHERE p.pid = {?}", $this->pid()); $this->values = $res->fetchOneAssoc(); - if ($this->owner) { - $this->values['yourself'] = $this->owner->displayName(); - } // Retreive photo informations $res = XDB::query("SELECT pub @@ -522,7 +567,7 @@ class ProfileSettingGeneral extends ProfilePage if ($this->owner) { $res = XDB::query("SELECT COUNT(*) FROM requests - WHERE type = 'photo' AND uid = {?}", + WHERE type = 'photo' AND pid = {?}", $this->owner->id()); $this->values['nouvellephoto'] = $res->fetchOneCell(); } else { @@ -543,10 +588,22 @@ class ProfileSettingGeneral extends ProfilePage $this->values['nationality3'] = NULL; } if ($this->values['nationality1'] == "") { - $this->values['nationality1'] = $this->values['nationality2']; + $this->values['nationality1'] = $this->values['nationality2']; $this->values['nationality2'] = $this->values['nationality3']; $this->values['nationality3'] = NULL; } + if ($this->values['nationality1'] == $this->values['nationality2'] + && $this->values['nationality2'] == $this->values['nationality3']) { + $this->values['nationality2'] = NULL; + $this->values['nationality3'] = NULL; + } else if ($this->values['nationality1'] == $this->values['nationality2']) { + $this->values['nationality2'] = $this->values['nationality3']; + $this->values['nationality3'] = NULL; + } else if ($this->values['nationality2'] == $this->values['nationality3'] + || $this->values['nationality1'] == $this->values['nationality3']) { + $this->values['nationality3'] = NULL; + } + $new_email = ($this->values['email_directory'] == "new@example.org") ? $this->values['email_directory_new'] : $this->values['email_directory']; if ($new_email == "") { @@ -568,10 +625,16 @@ class ProfileSettingGeneral extends ProfilePage $this->values['photo_pub'], $this->pid()); } if ($this->changed['yourself']) { - XDB::execute('UPDATE accounts - SET display_name = {?} - WHERE uid = {?}', - $this->values['yourself'], $this->owner->id()); + if ($this->owner) { + XDB::execute('UPDATE accounts + SET display_name = {?} + WHERE uid = {?}', + $this->values['yourself'], $this->owner->id()); + } + XDB::execute('UPDATE profile_display + SET yourself = {?} + WHERE pid = {?}', $this->values['yourself'], + $this->pid()); } if ($this->changed['promo_display']) { if ($this->values['promo_display']{0} == $this->profile->mainEducation()) { @@ -598,7 +661,7 @@ class ProfileSettingGeneral extends ProfilePage $page->assign('edu_fields', $res->fetchAllAssoc()); require_once "emails.combobox.inc.php"; - fill_email_combobox($page, $this->owner, $this->profile); + fill_email_combobox($page, $this->owner); $res = XDB::query("SELECT nw.nwid AS type, nw.name FROM profile_networking_enum AS nw