private function prepareField($value)
{
- $value = mb_strtoupper($value);
- return preg_replace('/[^A-Z]/', ' ', $value);
+ return name_to_basename($value);
}
private function prepare(ProfilePage &$page, $field, $value, $init, &$success)
$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);
+ }
$value = $this->clean($value);
} else {
require_once 'name.func.inc.php';
$res = XDB::query("SELECT s.particle, s.name
FROM profile_name AS s
INNER JOIN profile_name_enum AS e ON (e.id = s.typeid)
- WHERE s.pid = {?} AND e.type LIKE '%ini'
- ORDER BY e.type = 'firstname_ini'",
+ WHERE s.pid = {?} AND (e.type = 'lastname' OR e.type = 'firstname')
+ ORDER BY e.type = 'firstname'",
$page->pid());
$res = $res->fetchAllAssoc();
$initial = array();
}
if ($sn['pub']) {
if (isset($sn['particle']) && ($sn['particle'] != '')) {
+ // particle is before first blank
list($particle, $name) = explode(' ', $sn['name'], 2);
$particle = trim($particle) . ' ';
if (!$name) {
+ // particle is before first quote
list($particle, $name) = explode('\'', $sn['name'], 2);
$particle = trim($particle);
+ if (!$name) {
+ // actually there is no particle
+ $particle = '';
+ $name = $sn['name'];
+ }
}
} else {
$particle = '';
$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');
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
USING profile_name AS s
// 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.');
$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);
}
}
}
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;
}
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;
- $success = false;
+ 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;
}
}
}
+
+ 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
}
return $value;
}
+
+ public function getText($value) {
+ return $value;
+ }
}
class ProfileSettingNetworking implements ProfileSetting
public function value(ProfilePage &$page, $field, $value, &$success)
{
if (is_null($value)) {
- $value = XDB::fetchAllAssoc("SELECT n.address, n.network_type AS type, n.pub, m.name
+ $value = XDB::fetchAllAssoc("SELECT n.address, n.pub, n.nwid AS type
FROM profile_networking AS n
- INNER JOIN profile_networking_enum AS m ON (n.network_type = m.network_type)
WHERE n.pid = {?}",
$page->pid());
}
if (!is_array($value)) {
$value = array();
}
- $filters = XDB::fetchAllAssoc('type', 'SELECT filter, network_type AS type
+ $filters = XDB::fetchAllAssoc('type', 'SELECT filter, nwid AS type, name
FROM profile_networking_enum;');
$success = true;
foreach($value as $i=>&$network) {
$network['error'] = false;
$network['pub'] = $this->pub->value($page, 'pub', $network['pub'], $s);
$s = true;
- if ($filters[$network['type']] == 'web') {
+ $network['name'] = $filters[$network['type']]['name'];
+ if ($filters[$network['type']]['filter'] == 'web') {
$network['address'] = $this->web->value($page, 'address', $network['address'], $s);
- } elseif ($filters[$network['type']] == 'email') {
+ } elseif ($filters[$network['type']]['filter'] == 'email') {
$network['address'] = $this->email->value($page, 'address', $network['address'], $s);
- } elseif ($filters[$network['type']] == 'number') {
+ } elseif ($filters[$network['type']]['filter'] == 'number') {
$network['address'] = $this->number->value($page, 'address', $network['address'], $s);
}
if (!$s) {
}
$insert = array();
foreach ($value as $id=>$network) {
- XDB::execute("INSERT INTO profile_networking (pid, nwid, network_type, address, pub)
+ XDB::execute("INSERT INTO profile_networking (pid, id, nwid, address, pub)
VALUES ({?}, {?}, {?}, {?}, {?})",
$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
if ($page->profile->mainEducation() == 'X') {
$gradYearNew += $page->profile->mainEducationDuration();
}
- if ($value == $page->profile->entry_year + $page->profile->mainEducationDuration()) {
+ if (($page->profile->mainEducation() != 'X'
+ && $value == $page->profile->entry_year + $page->profile->mainEducationDuration())
+ || ($page->profile->mainEducation() == 'X' && $value == $page->profile->entry_year)) {
XDB::execute('UPDATE profile_display
SET promo = {?}
WHERE pid = {?}',
SET grad_year = {?}
WHERE pid = {?} AND FIND_IN_SET(\'primary\', flags)',
$gradYearNew, $page->profile->id());
- $page->trigSuccess('Ton statut "orange" a été supprimé.');
+ 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.');
}
{
$entryYear = $page->profile->entry_year;
$gradYear = $page->profile->grad_year;
+ $yearpromo = $page->profile->grad_year;
+ if ($page->profile->mainEducation() == 'X') {
+ $yearpromo -= $page->profile->mainEducationDuration();
+ }
$success = true;
- if (is_null($value) || $value == $page->profile->yearpromo()) {
+ if (is_null($value) || $value == $yearpromo) {
if ($gradYear != $entryYear + $page->profile->mainEducationDuration()) {
$promoChoice = array();
- for ($i = $entryYear + $page->profile->mainEducationDuration(); $i <= $gradYear; ++$i) {
- $promoChoice[] = $page->profile->mainEducation() . strval($i);
+ for ($i = $entryYear; $i <= $gradYear - $page->profile->mainEducationDuration(); ++$i) {
+ if ($page->profile->mainEducation() == 'X') {
+ $promoChoice[] = $page->profile->mainEducation() . strval($i);
+ } else {
+ $promoChoice[] = $page->profile->mainEducation() . strval($i + $page->profile->mainEducationDuration());
+ }
}
Platal::page()->assign('promo_choice', $promoChoice);
}
- if ($page->profile->mainEducation() == 'X') {
- return $page->profile->grad_year - $page->profile->mainEducationDuration();
- }
- return $page->profile->yearpromo();
+ return $yearpromo;
}
// If this profile belongs to an X, $promoNew needs to be changed to
}
return intval($value);
}
+
+ public function getText($value) {
+ return $value;
+ }
}
$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,
{
// 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
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 {
$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 == "") {
$this->values['photo_pub'], $this->pid());
}
if ($this->changed['yourself']) {
- XDB::execute('UPDATE accounts
- SET display_name = {?}
- WHERE pid = {?}', $this->pid());
+ 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()
- && intval(substr($this->values['promo_display'], 1, 4)) >= $this->profile->entry_year + $this->profile->mainEducationDuration()) {
- XDB::execute('UPDATE profile_display
- SET promo = {?}
- WHERE pid = {?}',
- $this->values['promo_display'], $this->pid());
+ 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)
+ || ($this->profile->mainEducation() != 'X'
+ && intval(substr($this->values['promo_display'], 1, 4)) >= $this->profile->entry_year + $this->profile->mainEducationDuration())) {
+ XDB::execute('UPDATE profile_display
+ SET promo = {?}
+ WHERE pid = {?}',
+ $this->values['promo_display'], $this->pid());
+ }
}
}
}
$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.network_type AS type, nw.name
+ $res = XDB::query("SELECT nw.nwid AS type, nw.name
FROM profile_networking_enum AS nw
ORDER BY name");
$page->assign('network_list', $res->fetchAllAssoc());
projects / platal.git / blobdiff