X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Fgeneral.inc.php;h=8a03a4759712e0bad91d91f20cea6994dae96394;hb=82af3fc3b6e003b0cbbcf4faf4ed4f0ea5c07570;hp=66d94b3e9d26d7cb2a2f2f228ab750f521768f7a;hpb=245923e335d0da5bec9495991a7846be9f0563ab;p=platal.git diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php index 66d94b3..8a03a47 100644 --- a/modules/profile/general.inc.php +++ b/modules/profile/general.inc.php @@ -1,6 +1,6 @@ prepareField($init); @@ -78,7 +78,7 @@ class ProfileSettingSearchNames implements ProfileSetting return $value; } - public function value(ProfilePage &$page, $field, $value, &$success) + public function value(ProfilePage $page, $field, $value, &$success) { $success = true; $success_tmp = true; @@ -149,7 +149,7 @@ class ProfileSettingSearchNames implements ProfileSetting $this->search_names = array(); foreach ($value as &$sn) { $sn['name'] = trim($sn['name']); - if ($sn['type'] == 'firstname' || $sn['type'] == 'lastname') { + if (S::user()->isMe($this->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; @@ -207,7 +207,7 @@ class ProfileSettingSearchNames implements ProfileSetting return $value; } - public function save(ProfilePage &$page, $field, $value) + public function save(ProfilePage $page, $field, $value) { require_once 'name.func.inc.php'; @@ -237,7 +237,7 @@ class ProfileSettingSearchNames implements ProfileSetting $names = array(); foreach ($value as $name) { if ($name['name'] != '') { - $names[] = $name['type_name'] . ' : ' . $name['name']; + $names[] = mb_strtolower($name['type_name']) . ' : ' . $name['name']; } } return implode(', ' , $names); @@ -258,7 +258,7 @@ 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)) { @@ -293,7 +293,7 @@ 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)", @@ -315,12 +315,32 @@ 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); } @@ -329,9 +349,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(); @@ -370,7 +390,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 @@ -411,7 +431,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 = {?}", @@ -428,12 +448,12 @@ class ProfileSettingNetworking implements ProfileSetting } public function getText($value) { + static $pubs = array('public' => 'publique', 'ax' => 'annuaire AX', 'private' => 'privé'); $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); + return implode(', ' , $networkings); } } @@ -441,7 +461,7 @@ 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') { @@ -466,7 +486,7 @@ class ProfileSettingPromo implements ProfileSetting } } - 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; @@ -517,12 +537,11 @@ 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['nationality1'] = $this->settings['nationality2'] = $this->settings['nationality3'] @@ -544,12 +563,14 @@ class ProfilePageGeneral extends ProfilePage /* Some fields editable under condition */ if (!S::user()->isMe($this->owner)) { $this->settings['deathdate'] = new ProfileSettingDate(true); + $this->settings['birthdate'] = new ProfileSettingDate(true); + } else { + $this->settings['yourself'] = null; + $this->settings['birthdate'] = new ProfileSettingDate(); } if (S::user()->checkPerms('directory_private') || S::user()->isMyProfile($this->owner)) { - $this->settings['yourself'] - = $this->settings['freetext'] - = null; + $this->settings['freetext'] = null; $this->settings['freetext_pub'] = $this->settings['photo_pub'] = new ProfileSettingPub(); @@ -561,7 +582,7 @@ class ProfilePageGeneral extends ProfilePage 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.deathdate @@ -574,7 +595,11 @@ class ProfilePageGeneral 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(*) @@ -636,7 +661,7 @@ class ProfilePageGeneral 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 = {?} @@ -661,7 +686,7 @@ class ProfilePageGeneral extends ProfilePage } } } - if ($this->changed['deathdate']) { + 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', @@ -682,7 +707,7 @@ class ProfilePageGeneral extends ProfilePage } } - public function _prepare(PlPage &$page, $id) + public function _prepare(PlPage $page, $id) { require_once "education.func.inc.php";