<?php
/***************************************************************************
- * Copyright (C) 2003-2009 Polytechnique.org *
+ * Copyright (C) 2003-2010 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
class ProfileSearchNames implements ProfileSetting
{
- private $public_name;
- private $private_name;
- private $directory_name;
- private $short_name;
- private $sort_name;
+ private $private_name_end;
+ private $search_names;
private function matchWord($old, $new, $newLen)
{
private function prepareField($value)
{
- $value = strtoupper(replace_accent($value));
+ $value = mb_strtoupper($value);
return preg_replace('/[^A-Z]/', ' ', $value);
}
private function prepare(ProfilePage &$page, $field, $value, $init, &$success)
{
$success = true;
- $ini = $this->prepareField($init);
- $new = $this->prepareField($value);
+ $ini = $this->prepareField($init);
+ $new = $this->prepareField($value);
$newLen = strlen($new);
$success = $this->matchWord($ini, $new, $newLen)
- || ($field == 'Nom patronymique' && $new == 'DE ' . $ini);
+ || ($field == 'lastname' && $new == 'DE ' . $ini);
if (!$success) {
$field = strtolower($field);
Platal::page()->trigError("Le " . $field . " que tu as choisi (" . $value .
public function value(ProfilePage &$page, $field, $value, &$success)
{
- $success = true;
+ $success = true;
$success_tmp = true;
+
if (is_null($value)) {
$sn_all = XDB::iterator("SELECT CONCAT(sn.particle, sn.name) AS name,
- sn.particle, sn.typeid, e.name AS type,
+ sn.particle, sn.typeid, e.type, e.name AS type_name,
FIND_IN_SET('has_particle', e.flags) AS has_particle,
FIND_IN_SET('always_displayed', e.flags) AS always_displayed,
FIND_IN_SET('public', e.flags) AS pub
- FROM profile_name_search AS sn
- INNER JOIN profile_name_search_enum AS e ON (e.id = sn.typeid)
+ FROM profile_name AS sn
+ INNER JOIN profile_name_enum AS e ON (e.id = sn.typeid)
WHERE sn.pid = {?} AND NOT FIND_IN_SET('not_displayed', e.flags)
ORDER BY NOT FIND_IN_SET('always_displayed', e.flags), e.id, sn.name",
$page->pid());
- $sn_types = XDB::iterator("SELECT id, name, FIND_IN_SET('has_particle', flags) AS has_particle
- FROM profile_name_search_enum
+ $sn_types = XDB::iterator("SELECT id, type, name,
+ FIND_IN_SET('has_particle', flags) AS has_particle
+ FROM profile_name_enum
WHERE NOT FIND_IN_SET('not_displayed', flags)
AND FIND_IN_SET('always_displayed', flags)
ORDER BY id");
$sn = $sn_all->next();
}
} else {
- $value[] = array('typeid' => $sn_type['id'],
- 'type' => $sn_type['name'],
- 'pub' => 1,
+ $value[] = array('name' => '',
+ 'particle' => '',
+ 'typeid' => $sn_type['id'],
+ 'type' => $sn_type['type'],
+ 'type_name' => $sn_type['name'],
'has_particle' => $sn_type['has_particle'],
- 'always_displayed' => 1);
+ 'always_displayed' => 1,
+ 'pub' => 1);
}
}
- while ($sn) {
- $value[] = $sn;
- $sn = $sn_all->next();
+ if ($sn) {
+ do {
+ $value[] = $sn;
+ } while ($sn = $sn_all->next());
}
} else {
+ require_once 'name.func.inc.php';
+
$res = XDB::query("SELECT s.particle, s.name
- FROM profile_name_search AS s
- INNER JOIN profile_name_search_enum AS e ON (e.id = s.typeid)
- WHERE s.pid = {?} AND e.name LIKE '%initial'
- ORDER BY e.name = 'Prénom initial'",
+ 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'",
$page->pid());
$res = $res->fetchAllAssoc();
$initial = array();
- $initial['Nom patronymique'] = $res[0]['particle'] . $res[0]['name'];
- $initial['Prénom'] = $res[1]['name'];
- $search_names = array();
- foreach ($value as $key => &$sn) {
+ $initial['lastname'] = $res[0]['particle'] . $res[0]['name'];
+ $initial['firstname'] = $res[1]['name'];
+ $sn_types = build_types();
+ $this->search_names = array();
+ foreach ($value as &$sn) {
$sn['name'] = trim($sn['name']);
- if ($sn['type'] == 'Prénom' || $sn['type'] == 'Nom patronymique') {
+ if ($sn['type'] == 'firstname' || $sn['type'] == 'lastname') {
$sn['name'] = $this->prepare($page, $sn['type'], $sn['name'],
$initial[$sn['type']], $success_tmp);
$success = $success && $success_tmp;
}
+ if ($sn['pub']) {
+ if (isset($sn['particle']) && ($sn['particle'] != '')) {
+ list($particle, $name) = explode(' ', $sn['name'], 2);
+ $particle = trim($particle) . ' ';
+ if (!$name) {
+ list($particle, $name) = explode('\'', $sn['name'], 2);
+ $particle = trim($particle);
+ }
+ } else {
+ $particle = '';
+ $name = $sn['name'];
+ }
+ }
if ($sn['name'] != '') {
- if (!isset($search_names[$sn['typeid']])) {
- $search_names[$sn['typeid']] = array($sn['name'], $name);
+ if ($sn['pub']) {
+ $this->search_names[$sn['typeid']] = array('fullname' => $sn['name'],
+ 'name' => $name,
+ 'particle' => $particle,
+ 'pub' => $sn['pub']);
} else {
- $search_names[$sn['typeid']] = array_merge($search_names[$sn['typeid']], array($name));
+ if (isset($this->search_names[$sn['typeid']])) {
+ $this->search_names[$sn['typeid']][] = $sn['name'];
+ } else {
+ $this->search_names[$sn['typeid']] = array('fullname' => $sn['name']);
+ }
+ $sn['type_name'] = $sn_types[$sn['typeid']];
}
}
}
- require_once 'name.func.inc.php';
- $sn_types_public = build_types('public');
- $sn_types_private = build_types('private');
- $full_name = build_full_name($search_names, $sn_types_public);
- $this->directory_name = build_directory_name($search_names, $sn_types_public, $full_name);
- $this->short_name = short_name($search_names, $sn_types_public);
- $this->sort_name = short_name($search_names, $sn_types_public);
- $this->public_name = build_public_name($search_names, $sn_types_public, $full_name);
- $this->private_name = $this->public_name . build_private_name($search_names, $sn_types_private);
- Platal::page()->assign('public_name', $this->public_name);
- Platal::page()->assign('private_name', $this->private_name);
+ $res = XDB::query("SELECT public_name, private_name
+ FROM profile_display
+ WHERE pid = {?}",
+ S::v('uid'));
+ list($public_name, $private_name) = $res->fetchOneRow();
+ if ($success) {
+ $sn_types_private = build_types('private');
+ $this->private_name_end = build_private_name($this->search_names, $sn_types_private);
+ $private_name = $public_name . $this->private_name_end;
+ }
+ Platal::page()->assign('public_name', $public_name);
+ Platal::page()->assign('private_name', $private_name);
}
+
return $value;
}
public function save(ProfilePage &$page, $field, $value)
{
+ require_once 'name.func.inc.php';
+ $sn_old = build_sn_pub();
XDB::execute("DELETE FROM s
- USING profile_name_search AS s
- INNER JOIN profile_name_search_enum AS e ON (s.typeid = e.id)
+ USING profile_name AS s
+ 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());
- foreach ($value as $sn) {
- if ($sn['name'] != '') {
- if ($sn['particle']) {
- list($particle, $name) = explode(' ', $sn['name'], 2);
- $particle = trim($particle) . ' ';
- if (!$name) {
- list($particle, $name) = explode('\'', $sn['name'], 2);
- $particle = trim($particle);
- }
- } else {
- $particle = '';
- $name = $sn['name'];
- }
- $name = trim($name);
- XDB::execute("INSERT INTO profile_name_search (particle, name, typeid, pid)
- VALUES ({?}, {?}, {?}, {?})",
- $particle, $name, $sn['typeid'], $this->pid());
- }
+ $has_new = set_alias_names($this->search_names, $sn_old);
+
+ // 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->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.");
+ } else {
+ $display_names = array();
+ build_display_names($display_names, $this->search_names, $this->private_name_end);
+ set_profile_display($display_names);
}
- XDB::execute("UPDATE profile_display
- SET public_name = {?}, private_name = {?},
- directory_name = {?}, short_name = {?}, sort_name = {?}
- WHERE pid = {?}",
- $this->public_name, $this->private_name, $this->directory_name,
- $this->short_name, $this->sort_name, $this->pid());
- /*require_once('user.func.inc.php');
- user_reindex(S::v('uid'));*/
}
}
= $this->settings['yourself']
= $this->settings['promo']
= null;
- $this->settings['synchro_ax']
- = new ProfileBool();
$this->settings['email_directory']
= new ProfileEmail();
$this->settings['email_directory_new']
pr.nationality1, pr.nationality2, pr.nationality3, pr.birthdate,
t.display_tel as mobile, t.pub as mobile_pub,
d.email_directory as email_directory,
- pr.freetext, pr.freetext_pub as freetext_pub
+ pr.freetext, pr.freetext_pub, pr.ax_id AS matricule_ax, p.yourself
FROM profiles AS pr
INNER JOIN profile_display AS p ON (p.pid = pr.pid)
INNER JOIN profile_education AS e ON (e.uid = pr.pid AND FIND_IN_SET('primary', e.flags))
// Retreive photo informations
$res = XDB::query("SELECT pub
- FROM photo
- WHERE uid = {?}", $this->pid());
+ FROM profile_photos
+ WHERE pid = {?}", $this->pid());
$this->values['photo_pub'] = $res->fetchOneCell();
if ($this->owner) {
XDB::execute("UPDATE profiles
SET nationality1 = {?}, nationality2 = {?}, nationality3 = {?}, birthdate = {?},
freetext = {?}, freetext_pub = {?}
- WHERE user_id = {?}",
+ WHERE pid = {?}",
$this->values['nationality1'], $this->values['nationality2'], $this->values['nationality3'],
preg_replace('@(\d{2})/(\d{2})/(\d{4})@', '\3-\2-\1', $this->values['birthdate']),
- $this->values['freetext'], $this->values['freetext_pub'],
- $this->pid());
+ $this->values['freetext'], $this->values['freetext_pub'], $this->pid());
}
if ($this->changed['email_directory']) {
$new_email = ($this->values['email_directory'] == "new@example.org") ?
$this->pid(), $new_email);
}
if ($this->changed['photo_pub']) {
- XDB::execute("UPDATE photo
+ XDB::execute("UPDATE profile_photos
SET pub = {?}
- WHERE uid = {?}",
+ WHERE pid = {?}",
$this->values['photo_pub'], $this->pid());
}
if ($this->changed['yourself']) {
projects / platal.git / blobdiff