<?php
/***************************************************************************
- * Copyright (C) 2003-2010 Polytechnique.org *
+ * Copyright (C) 2003-2011 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
return name_to_basename($value);
}
- private function prepare(ProfilePage &$page, $field, $value, $init, &$success)
+ private function prepare(ProfilePage $page, $field, $value, $init, &$success)
{
$success = true;
$ini = $this->prepareField($init);
return $value;
}
- public function value(ProfilePage &$page, $field, $value, &$success)
+ public function value(ProfilePage $page, $field, $value, &$success)
{
$success = true;
$success_tmp = true;
$this->search_names = array();
foreach ($value as &$sn) {
$sn['name'] = trim($sn['name']);
- if ($sn['type'] == 'firstname' || $sn['type'] == 'lastname') {
+ if (S::user()->isMe($page->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;
return $value;
}
- public function save(ProfilePage &$page, $field, $value)
+ public function save(ProfilePage $page, $field, $value)
{
require_once 'name.func.inc.php';
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) {
$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);
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)) {
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)",
$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 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();
$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
return $value;
}
- public function save(ProfilePage &$page, $field, $value)
+ public function save(ProfilePage $page, $field, $value)
{
XDB::execute("DELETE FROM profile_networking
WHERE pid = {?}",
}
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);
}
}
{
public function __construct(){}
- public function save(ProfilePage &$page, $field, $value)
+ public function save(ProfilePage $page, $field, $value)
{
$gradYearNew = $value;
if ($page->profile->mainEducation() == 'X') {
}
}
- 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()) {
{
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']
/* 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();
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
$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(*)
}
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());
}
}
}
}
}
- public function _prepare(PlPage &$page, $id)
+ public function _prepare(PlPage $page, $id)
{
require_once "education.func.inc.php";
$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
projects / platal.git / blobdiff