X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fname.func.inc.php;h=6483449ee8340d9dbdaccedf159e882a331fba50;hb=65fae027e8ae613d174d2875825b83c7bae86c6a;hp=049b71544beaa1808b8f74f8f601156454205364;hpb=6e32823cd4907b77bbaf4af85ef6e1be986fbeef;p=platal.git diff --git a/include/name.func.inc.php b/include/name.func.inc.php index 049b715..6483449 100644 --- a/include/name.func.inc.php +++ b/include/name.func.inc.php @@ -1,6 +1,6 @@ $item) { + $names[$key] = explode(';', $item); + } + $lastnames = array( + 'lastname_main' => $names[0][0], + 'lastname_ordinary' => $names[0][1], + 'lastname_marital' => $names[0][2], + 'pseudonym' => $names[0][3] + ); + $firstnames = array( + 'firstname_main' => $names[1][0], + 'firstname_ordinary' => $names[1][1] + ); + $private_names_count = intval(count($names[2]) / 2); + $private_names = array(); + for ($i = 0; $i < $private_names_count; ++$i) { + $private_names[] = array('type' => $names[2][2 * $i], 'name' => $names[2][2 * $i + 1]); } - $sn_types_public = build_types('public'); - $sn_types_private = build_types('private'); - $full_name = build_full_name($search_names, $sn_types_public); - return build_public_name($search_names, $sn_types_public, $full_name) . ';' . - build_private_name($search_names, $sn_types_private); + + return build_first_name($firstnames) . ' ' . build_full_last_name($lastnames, $isFemale) . ';' . build_private_name($private_names); +} + +function build_email_alias(array $public_names) +{ + return PlUser::makeUserName(build_first_name($public_names), build_short_last_name($public_names)); } -function build_types($pub) +function build_display_names(array $public_names, array $private_names, $isFemale) { - if ($pub == 'public') { - $sql_pub = "AND FIND_IN_SET('public', flags)"; - } elseif ($pub == 'private') { - $sql_pub = "AND NOT FIND_IN_SET('public', flags)"; - } else { - $sql_pub = ""; - } - $sql = "SELECT id, name - FROM profile_name_search_enum - WHERE NOT FIND_IN_SET('not_displayed', flags)" . $sql_pub; - $sn_types = XDB::iterator($sql); - $types = array(); - while ($sn_type = $sn_types->next()) { - $types[$sn_type['name']] = $sn_type['id']; - } - return $types; + $short_last_name = build_short_last_name($public_names); + $full_last_name = build_full_last_name($public_names, $isFemale); + $private_last_name_end = build_private_name($private_names); + $firstname = build_first_name($public_names); + + $display_names = array(); + $display_names['public_name'] = $firstname . ' ' . $full_last_name; + $display_names['private_name'] = $display_names['public_name'] . $private_last_name_end; + $display_names['directory_name'] = $full_last_name . ' ' . $firstname; + $display_names['short_name'] = $firstname . ' ' . $short_last_name; + $display_names['sort_name'] = $short_last_name . ' ' . $firstname; + + return $display_names; } -function build_full_name(&$search_names, &$sn_types) +function build_short_last_name(array $lastnames) { - $name = ""; - if (isset($search_names[$sn_types['Nom usuel']])) { - $name .= $search_names[$sn_types['Nom usuel']][0] . " (" - . $search_names[$sn_types['Nom patronymique']][0] . ")"; + return ($lastnames['lastname_ordinary'] == '') ? $lastnames['lastname_main'] : $lastnames['lastname_ordinary']; +} + +function build_full_last_name(array $lastnames, $isFemale) +{ + if ($lastnames['lastname_ordinary'] != '') { + $name = $lastnames['lastname_ordinary'] . ' (' . $lastnames['lastname_main'] . ')'; } else { - $name .= $search_names[$sn_types['Nom patronymique']][0]; + $name = $lastnames['lastname_main']; } - if (isset($search_names[$sn_types['Nom marital']]) - || isset($search_names[$sn_types['Pseudonyme (nom de plume)']])) { - if (isset($search_names[$sn_types['Nom marital']])) { - $user = S::user(); - if ($user->isFemale()) { - $name .= " (Mme "; - } else { - $name .= " (M "; - } - $name .= $search_names[$sn_types['Nom marital']][0]; - if (isset($search_names[$sn_types['Pseudonyme (nom de plume)']])) { - $name .= ", "; - } - } - if (isset($search_names[$sn_types['Pseudonyme (nom de plume)']])) { - $name .= $search_names[$sn_types['Pseudonyme (nom de plume)']][0]; + if ($lastnames['lastname_marital'] != '' || $lastnames['pseudonym'] != '') { + $name .= ' ('; + if ($lastnames['lastname_marital'] != '') { + $name .= ($isFemale ? 'Mme ' : 'M ') . $lastnames['lastname_marital']; + $name .= (($lastnames['pseudonym'] == '') ? '' : ', '); } - $name .= ")"; + $name .= (($lastnames['pseudonym'] == '')? '' : $lastnames['pseudonym']) . ')'; } return $name; } -function build_public_name(&$search_names, &$sn_types, $full_name) +function build_first_name(array $firstnames) { - return $search_names[$sn_types['Prénom']][0] . " " . $full_name; + return ($firstnames['firstname_ordinary'] ? $firstnames['firstname_ordinary'] : $firstnames['firstname_main']); } -function build_private_name(&$search_names, &$sn_types) +function build_private_name(array $private_names) { - $name = ""; - if (isset($search_names[$sn_types['Surnom']]) - || (isset($search_names[$sn_types['Autre prénom']]) - || isset($search_names[$sn_types['Autre nom']]))) { - $name .= " ("; - if (isset($search_names[$sn_types['Surnom']])) { - $name .= "alias " . $search_names[$sn_types['Surnom']][0]; - $i = 2; - while (isset($search_names[$sn_types['Surnom']][$i])) { - $name .= ", " . $search_names[$sn_types['Surnom']][$i]; - $i++; - } - if (isset($search_names[$sn_types['Autre prénom']]) - || isset($search_names[$sn_types['Autre nom']])) { - $name .= ", "; - } - } - if (isset($search_names[$sn_types['Autre prénom']])) { - $name .= "autres prénoms : " . $search_names[$sn_types['Autre prénom']][0]; - $i = 2; - while (isset($search_names[$sn_types['Autre prénom']][$i])) { - $name .= ", " . $search_names[$sn_types['Autre prénom']][$i]; - $i++; - } - if (isset($search_names[$sn_types['Autre nom']])) { - $name .= ", "; - } - } - if (isset($search_names[$sn_types['Autre nom']])) { - $name .= "autres noms : " . $search_names[$sn_types['Autre nom']][0]; - $i = 2; - while (isset($search_names[$sn_types['Autre nom']][$i])) { - $name .= ", " . $search_names[$sn_types['Autre nom']][$i]; - $i++; - } + if (is_null($private_names) || count($private_names) == 0) { + return ''; + } + + static $types = array('nickname' => 'alias ', 'firstname' => 'autres prénoms : ', 'lastname' => 'autres noms : '); + $names_sorted = array('nickname' => array(), 'firstname' => array(), 'lastname' => array()); + + foreach ($private_names as $private_name) { + $names_sorted[$private_name['type']][] = $private_name['name']; + } + + $names_array = array(); + foreach ($names_sorted as $type => $names) { + if (count($names)) { + $names_array[] = $types[$type] . implode(', ', $names); } - $name .= ")"; } - return $name; + + return ' (' . implode(', ', $names_array) . ')'; +} + +/** Splits a name into tokens, as used in search_name. + * Used for search_name rebuilding and for queries. + */ +function split_name_for_search($name) { + return preg_split('/[[:space:]\'\-]+/', strtolower(replace_accent($name)), + -1, PREG_SPLIT_NO_EMPTY); +} + +/** Transform a name to its canonical value so it can be compared + * to another form (different case, with accents or with - instead + * of blanks). + * @see compare_basename to compare + */ +function name_to_basename($value) { + $value = mb_strtoupper(replace_accent($value)); + return preg_replace('/[^A-Z]/', ' ', $value); +} + +/** Compares two strings and check if they are two forms of the + * same name (different case, with accents or with - instead of + * blanks). + * @see name_to_basename to retreive the compared string + */ +function compare_basename($a, $b) { + return name_to_basename($a) == name_to_basename($b); } -function build_directory_name(&$search_names, &$sn_types, $full_name) +function update_account_from_profile($uid) { - return $full_name . " " . $search_names[$sn_types['Prénom']][0]; + XDB::execute("UPDATE accounts AS a + INNER JOIN account_profiles AS ap ON (ap.uid = a.uid AND FIND_IN_SET('owner', ap.perms)) + INNER JOIN profile_public_names AS ppn ON (ppn.pid = ap.pid) + INNER JOIN profile_display AS pd ON (pd.pid = ap.pid) + SET a.lastname = IF(ppn.lastname_ordinary = '', ppn.lastname_main, ppn.lastname_ordinary), + a.firstname = IF(ppn.firstname_ordinary = '', ppn.firstname_main, ppn.firstname_ordinary), + a.full_name = pd.short_name, a.directory_name = pd.directory_name + WHERE a.uid = {?}", + $uid); } -function short_name(&$search_names, &$sn_types) +function update_display_names(Profile $profile, array $public_names, array $private_names = null) { - $name = ""; - if (isset($search_names[$sn_types['Nom usuel']])) { - $name .= $search_names[$sn_types['Nom usuel']][0]; - } else { - $name .= $search_names[$sn_types['Nom patronymique']][0]; + if (is_null($private_names)) { + $private_names = XDB::fetchAllAssoc('SELECT type, name + FROM profile_private_names + WHERE pid = {?} + ORDER BY type, id', + $profile->id()); } - $name = " "; - if (isset($search_names[$sn_types['Prénom usuel']])) { - $name .= $search_names[$sn_types['Prénom usuel']][0]; - } else { - $name .= $search_names[$sn_types['Prénom']][0]; + $display_names = build_display_names($public_names, $private_names, $profile->isFemale()); + + XDB::execute('UPDATE profile_display + SET public_name = {?}, private_name = {?}, + directory_name = {?}, short_name = {?}, sort_name = {?} + WHERE pid = {?}', + $display_names['public_name'], $display_names['private_name'], + $display_names['directory_name'], $display_names['short_name'], + $display_names['sort_name'], $profile->id()); + + Profile::rebuildSearchTokens($profile->id(), false); + + if ($profile->owner()) { + update_account_from_profile($profile->owner()->id()); } - return $name; } -function sort_name(&$search_names, &$sn_types) +function update_public_names($pid, array $public_names) { - $name = ""; - if (isset($search_names[$sn_types['Nom usuel']])) { - $name .= $search_names[$sn_types['Nom usuel']][1]; - } else { - $name .= $search_names[$sn_types['Nom patronymique']][1]; + $public_names['particles'] = new PlFlagSet(); + static $suffixes = array('main', 'marital', 'ordinary'); + foreach ($suffixes as $suffix) { + if (isset($public_names['particle_' . $suffix]) && ($public_names['particle_' . $suffix] == 1 || $public_names['particle_' . $suffix] == 'on')) { + $public_names['particles']->addFlag($suffix, 1); + } } - $name .= $search_names[$sn_types['Prénom']][0]; - return $name; + + XDB::execute('UPDATE profile_public_names + SET particles = {?}, lastname_main = {?}, lastname_marital = {?}, lastname_ordinary = {?}, + firstname_main = {?}, firstname_ordinary = {?}, pseudonym = {?} + WHERE pid = {?}', + $public_names['particles'], $public_names['lastname_main'], $public_names['lastname_marital'], $public_names['lastname_ordinary'], + $public_names['firstname_main'], $public_names['firstname_ordinary'], $public_names['pseudonym'], $pid); } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: