global $globals;
$this->entriesPerPage = $globals->search->per_page;
if (@$params['with_score']) {
- $this->addSortKey('score', array('-score', '-date', '-d.promo', 'name_sort'), 'pertinence');
+ $this->addSortKey('score', array('-score', '-date', '-d.promo', 'sort_name'), 'pertinence');
}
- $this->addSortKey('name', array('name_sort'), 'nom');
- $this->addSortKey('promo', array('-d.promo', 'name_sort'), 'promotion');
- $this->addSortKey('date_mod', array('-date', '-d.promo', 'name_sort'), 'dernière modification');
+ $this->addSortKey('name', array('sort_name'), 'nom');
+ $this->addSortKey('promo', array('-d.promo', 'sort_name'), 'promotion');
+ $this->addSortKey('date_mod', array('-date', '-d.promo', 'sort_name'), 'dernière modification');
parent::__construct($set, $data, $params);
}
edu3.grad_year AS edugrad_year3, f3.field AS edufield3, edu3.program AS eduprogram3,
adr.city, gp.a2, gp.pays AS countrytxt, gr.name AS region,
(COUNT(em.email) > 0 OR FIND_IN_SET('googleapps', u.mail_storage) > 0) AS actif,
- nd.display AS name_display, nd.tooltip AS name_tooltip, nd.sort AS name_sort" .
+ d.directory_name, d.sort_name" .
(S::logged() ? ", c.contact AS contact" : '');
}
LEFT JOIN geoloc_pays AS gp ON (adr.country = gp.a2)
LEFT JOIN geoloc_region AS gr ON (adr.country = gr.a2 AND adr.region = gr.region)
LEFT JOIN emails AS em ON (em.uid = u.user_id AND em.flags = 'active')
- INNER JOIN profile_names_display AS nd ON (nd.user_id = u.user_id)
INNER JOIN profile_display AS d ON (d.pid = u.user_id)" . (S::logged() ?
"LEFT JOIN contacts AS c ON (c.contact = u.user_id AND c.uid = " . S::v('uid') . ")"
: "");
{
$this->entriesPerPage = 10;
$this->addSortKey('rand', array('RAND(' . S::i('uid') . ')'), 'aléatoirement');
- $this->addSortKey('name', array('name_sort'), 'nom');
- $this->addSortKey('promo', array('-promo', 'name_sort'), 'promotion');
- $this->addSortKey('date_mod', array('-date', '-promo', 'name_sort'), 'dernière modification');
+ $this->addSortKey('name', array('sort_name'), 'nom');
+ $this->addSortKey('promo', array('-d.promo', 'sort_name'), 'promotion');
+ $this->addSortKey('date_mod', array('-date', '-d.promo', 'sort_name'), 'dernière modification');
parent::__construct($set, $data, $params);
}
{
return "m.uid, d.promo, u.hruid,
m.expertise, mp.country, ms.sectorid, ms.subsectorid,
- nd.display AS name_display, nd.tooltip AS name_tooltip, nd.sort AS name_sort";
+ d.directory_name, d.sort_name";
}
public function joins()
{
- return "INNER JOIN profile_names_display AS nd ON (nd.user_id = u.user_id)
- INNER JOIN profile_display AS d ON (d.pid = u.user_id)";
+ return "INNER JOIN profile_display AS d ON (d.pid = u.user_id)";
}
public function bounds()
public function __construct(PlSet &$set, $data, array $params)
{
$this->entriesPerPage = 24;
- $this->order = explode(',', Env::v('order', 'name_sort'));
+ $this->order = explode(',', Env::v('order', 'sort_name'));
if (@$params['with_score']) {
- $this->addSortKey('score', array('-score', '-watch_last', '-promo', 'name_sort'), 'pertinence');
+ $this->addSortKey('score', array('-score', '-watch_last', '-d.promo', 'sort_name'), 'pertinence');
}
- $this->addSortKey('name', array('name_sort'), 'nom');
- $this->addSortKey('promo', array('-promo', 'name_sort'), 'promotion');
+ $this->addSortKey('name', array('sort_name'), 'nom');
+ $this->addSortKey('promo', array('-d.promo', 'sort_name'), 'promotion');
parent::__construct($set, $data, $params);
}
public function fields()
{
- return "u.user_id, nd.display AS name_display, nd.tooltip AS name_tooltip, nd.sort AS name_sort, u.promo, d.promo, u.hruid ";
+ return "u.user_id, d.directory_name, d.sort_name, u.promo, d.promo, u.hruid ";
}
public function joins()
{
- return "INNER JOIN photo AS p ON (p.uid = u.user_id)
- INNER JOIN profile_display AS d ON (d.pid = u.user_id)
- INNER JOIN profile_names_display AS nd ON (nd.user_id = u.user_id)";
+ return "INNER JOIN photo AS p ON (p.uid = u.user_id)
+ INNER JOIN profile_display AS d ON (d.pid = u.user_id)";
}
public function bounds()
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
-class ProfileNom implements ProfileSetting
+class ProfileSearchNames implements ProfileSetting
{
+ private $public_name;
+ private $private_name;
+ private $directory_name;
+ private $short_name;
+ private $sort_name;
+
private function matchWord($old, $new, $newLen)
{
return ($i = strpos($old, $new)) !== false
return preg_replace('/[^A-Z]/', ' ', $value);
}
- public function value(ProfilePage &$page, $field, $value, &$success)
+ private function prepare(ProfilePage &$page, $field, $value, $init, &$success)
{
$success = true;
- $current = S::v($field);
- $init = S::v($field . '_ini');
- if (is_null($value)) {
- return $current;
- }
- if ($value == $current || $value == $init) {
- return $value;
- }
$ini = $this->prepareField($init);
- $old = $this->prepareField($current);
$new = $this->prepareField($value);
- $newLen = strlen($new);
- $success = $this->matchWord($old, $new, $newLen)
- || $this->matchWord($ini, $new, $newLen)
- || ($field == 'nom' && $new == 'DE ' . $old);
+ $newLen = strlen($new);
+ $success = $this->matchWord($ini, $new, $newLen)
+ || ($field == 'Nom patronymique' && $new == 'DE ' . $ini);
if (!$success) {
- Platal::page()->trigError("Le $field que tu as choisi ($value) est trop loin de ton $field initial ($init)"
- . (($init == $current)? "" : " et de ton prénom précédent ($current)"));
+ $field = strtolower($field);
+ Platal::page()->trigError("Le " . $field . " que tu as choisi (" . $value .
+ ") est trop loin de ton " . $field . " initial (" . $init . ").");
+ }
+ return $success ? $value : $init;
+ }
+
+ public function value(ProfilePage &$page, $field, $value, &$success)
+ {
+ $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,
+ 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)
+ 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",
+ S::v('uid'));
+
+ $sn_types = XDB::iterator("SELECT id, name, FIND_IN_SET('has_particle', flags) AS has_particle
+ FROM profile_name_search_enum
+ WHERE NOT FIND_IN_SET('not_displayed', flags)
+ AND FIND_IN_SET('always_displayed', flags)
+ ORDER BY id");
+
+ $value = array();
+ $sn = $sn_all->next();
+ while ($sn_type = $sn_types->next()) {
+ if ($sn_type['id'] == $sn['typeid']) {
+ $value[] = $sn;
+ $sn = $sn_all->next();
+ } else {
+ $value[] = array('typeid' => $sn_type['id'],
+ 'type' => $sn_type['name'],
+ 'pub' => 1,
+ 'has_particle' => $sn_type['has_particle'],
+ 'always_displayed' => 1);
+ }
+ }
+ do {
+ $value[] = $sn;
+ } while ($sn = $sn_all->next());
+ } else {
+ $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'",
+ S::i('uid'));
+ $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) {
+ $sn['name'] = trim($sn['name']);
+ if ($sn['type'] == 'Prénom' || $sn['type'] == 'Nom patronymique') {
+ $sn['name'] = $this->prepare($page, $sn['type'], $sn['name'],
+ $initial[$sn['type']], $success_tmp);
+ $success = $success && $success_tmp;
+ }
+ if ($sn['name'] != '') {
+ if (!isset($search_names[$sn['typeid']])) {
+ $search_names[$sn['typeid']] = array($sn['name'], $name);
+ } else {
+ $search_names[$sn['typeid']] = array_merge($search_names[$sn['typeid']], array($name));
+ }
+ }
+ }
+ 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);
}
- return $success ? $value : $current;
+ return $value;
}
- public function save(ProfilePage &$page, $field, $new_value)
+ public function save(ProfilePage &$page, $field, $value)
{
- $_SESSION[$field] = $new_value;
+ XDB::execute("DELETE FROM s
+ USING profile_name_search AS s
+ INNER JOIN profile_name_search_enum AS e ON (s.typeid = e.id)
+ WHERE s.pid = {?} AND NOT FIND_IN_SET('not_displayed', e.flags)",
+ S::i('uid'));
+ 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'], S::i('uid'));
+ }
+ }
+ 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, S::v('uid'));
+ /*require_once('user.func.inc.php');
+ user_reindex(S::v('uid'));*/
}
}
public function __construct(PlWizard &$wiz)
{
parent::__construct($wiz);
+ $this->settings['search_names']
+ = new ProfileSearchNames();
$this->settings['birthdate'] = new ProfileDate();
$this->settings['freetext_pub']
= $this->settings['photo_pub']
= $this->settings['nationality1']
= $this->settings['nationality2']
= $this->settings['nationality3']
- = $this->settings['nick']
= $this->settings['yourself']
- = $this->settings['display_name']
- = $this->settings['sort_name']
- = $this->settings['tooltip_name']
- = $this->settings['promo_display']
- = $this->settings['search_names']
+ = $this->settings['promo']
= null;
$this->settings['synchro_ax']
= new ProfileBool();
$this->watched= array('freetext' => true, 'tels' => true,
'networking' => true, 'edus' => true,
'nationality1' => true, 'nationality2' => true,
- 'nationality3' => true, 'nick' => true);
+ 'nationality3' => true, 'search_names' => true);
}
protected function _fetchData()
{
// Checkout all data...
- $res = XDB::query("SELECT p.promo AS promo_display, e.entry_year AS entry_year, e.grad_year AS grad_year,
+ $res = XDB::query("SELECT p.promo, e.entry_year AS entry_year, e.grad_year AS grad_year,
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,
- n.yourself, n.display AS display_name, n.sort AS sort_name,
- n.tooltip AS tooltip_name
+ pr.freetext, pr.freetext_pub as freetext_pub
FROM profiles AS pr
- INNER JOIN profile_names_display AS n ON (n.user_id = pr.pid)
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))
LEFT JOIN profile_phones AS t ON (t.uid = pr.pid AND link_type = 'user')
LEFT JOIN profile_directory AS d ON (d.uid = pr.pid)
WHERE pr.pid = {?}", $this->pid());
$this->values = $res->fetchOneAssoc();
+ if ($this->owner) {
+ $this->values['yourself'] = $this->owner->displayName();
+ }
// Retreive photo informations
$res = XDB::query("SELECT pub
$this->values['nouvellephoto'] = 0;
}
- // Retreive search names info
- $sn_all = XDB::iterator("SELECT IF(sn.particle = '', sn.name, CONCAT(sn.particle, ' ', sn.name)) AS name,
- sn.particle, sn.typeid, e.name AS type,
- 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)
- 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",
- $this->pid());
-
- $sn_types = XDB::iterator("SELECT id, name, FIND_IN_SET('has_particle', flags) AS has_particle
- FROM profile_name_search_enum
- WHERE NOT FIND_IN_SET('not_displayed', flags)
- AND FIND_IN_SET('always_displayed', flags)
- ORDER BY id");
-
- $this->values['search_names'] = array();
- $sn = $sn_all->next();
- while ($sn_type = $sn_types->next()) {
- if ($sn_type['id'] == $sn['typeid']) {
- $this->values['search_names'][] = $sn;
- $sn = $sn_all->next();
- } else {
- $this->values['search_names'][] = array('typeid' => $sn_type['id'],
- 'type' => $sn_type['name'],
- 'pub' => 1,
- 'has_particle' => $sn_type['has_particle'],
- 'always_displayed' => 1);
- }
- }
- do {
- $this->values['search_names'][] = $sn;
- } while ($sn = $sn_all->next());
-
- // Proposes choice for promo_display
+ // Proposes choice for promotion
if ($this->values['entry_year'] != $this->values['grad_year'] - 3) {
for ($i = $this->values['entry_year']; $i < $this->values['grad_year'] - 2; $i++) {
$this->values['promo_choice'][] = "X" . $i;
WHERE uid = {?}",
$this->values['photo_pub'], $this->pid());
}
-
- if ($this->changed['yourself'] || $this->changed['search_names']) {
- if ($this->changed['search_names']) {
- XDB::execute("DELETE FROM s
- USING profile_name_search AS s
- INNER JOIN profile_name_search_enum AS e ON (s.typeid = e.id)
- WHERE s.pid = {?} AND NOT FIND_IN_SET('not_displayed', e.flags)",
- $this->pid());
- $search_names = array();
- foreach ($this->values['search_names'] as $sn) {
- if ($sn['name'] != '') {
- if ($sn['particle']) {
- list($particle, $name) = explode(' ', $sn['name'], 2);
- if (!$name) {
- list($particle, $name) = explode('\'', $sn['name'], 2);
- }
- } else {
- $particle = '';
- $name = $sn['name'];
- }
- $particle = trim($particle);
- $name = trim($name);
- $sn['name'] = trim($sn['name']);
- XDB::execute("INSERT INTO profile_name_search (particle, name, typeid, pid)
- VALUES ({?}, {?}, {?}, {?})",
- $particle, $name, $sn['typeid'], $this->pid());
- if (!isset($search_names[$sn['typeid']])) {
- $search_names[$sn['typeid']] = array($sn['name'], $name);
- } else {
- $search_names[$sn['typeid']] = array_merge($search_names[$sn['typeid']], array($name));
- }
- }
- }
-
- 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);
- $directory_name = build_directory_name($search_names, $sn_types_public, $full_name);
- $short_name = short_name($search_names, $sn_types_public);
- $sort_name = short_name($search_names, $sn_types_public);
- $this->values['public_name'] = build_public_name($search_names, $sn_types_public, $full_name);
- $this->values['private_name'] = $public_name . build_private_name($search_names, $sn_types_private);
- XDB::execute("UPDATE profile_display
- SET yourself = {?}, public_name = {?}, private_name = {?},
- directory_name = {?}, short_name = {?}, sort_name = {?}
- WHERE pid = {?}",
- $this->values['yourself'], $this->values['public_name'],
- $this->values['private_name'], $directory_name, $short_name,
- $sort_name, $this->pid());
- /*if ($this->changed['search_names']) {
- require_once('user.func.inc.php');
- user_reindex(S::v('uid'));
- }*/
- } else {
- XDB::execute("UPDATE profile_display
- SET yourself = {?}
- WHERE pid = {?}",
- $this->values['yourself'], $this->pid());
- }
+ if ($this->changed['yourself']) {
+ XDB::execute('UPDATE accounts
+ SET display_name = {?}
+ WHERE pid = {?}', $this->pid());
}
- if ($this->changed['promo_display']) {
+ if ($this->changed['promo']) {
XDB::execute("UPDATE profile_display
SET promo = {?}
WHERE pid = {?}",
- $this->values['promo_display'], $this->pid());
+ $this->values['promo'], $this->pid());
}
}
FROM profile_networking_enum AS nw
ORDER BY name");
$page->assign('network_list', $res->fetchAllAssoc());
+
+ $res = XDB::query("SELECT public_name, private_name
+ FROM profile_display
+ WHERE pid = {?}",
+ S::v('uid'));
+ $res = $res->fetchOneRow();
+ $page->assign('public_name', $res[0]);
+ $page->assign('private_name', $res[1]);
}
}
projects / platal.git / commitdiff