Fixes last connexion on user admin page.

[platal.git] / include / name.func.inc.php

diff --git a/include/name.func.inc.php b/include/name.func.inc.php
index 7dd3687..1df275b 100644 (file)
--- a/include/name.func.inc.php
+++ b/include/name.func.inc.php
@@ -19,14 +19,17 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-// Some particles should not be capitalized (cf "ORTHOTYPO", by Jean-Pierre
-// Lacroux).
-// Note that some of them are allowed to use capital letters in some cases,
-// for instance "De" in American English.
-static $particles = array('d', 'de', 'an', 'auf', 'von', 'von dem',
-                          'von der', 'zu', 'of', 'del', 'de las',
-                          'de les', 'de los', 'las', 'los', 'y', 'a',
-                          'da', 'das', 'do', 'dos', 'af', 'av');
+class Particles
+{
+    // Some particles should not be capitalized (cf "ORTHOTYPO", by Jean-Pierre
+    // Lacroux).
+    // Note that some of them are allowed to use capital letters in some cases,
+    // for instance "De" in American English.
+    public static $particles = array('d', 'de', 'an', 'auf', 'von', 'von dem',
+                                     'von der', 'zu', 'of', 'del', 'de las',
+                                     'de les', 'de los', 'las', 'los', 'y', 'a',
+                                     'da', 'das', 'do', 'dos', 'af', 'av');
+}
 
 
 function build_javascript_names($data, $isFemale)
@@ -71,7 +74,7 @@ function build_display_names(array $public_names, array $private_names, $isFemal
     $display_names['private_name']   = $display_names['public_name'] . $private_last_name_end;
     $display_names['directory_name'] = build_directory_name($firstname, $full_last_name);
     $display_names['short_name']     = build_full_name($firstname, $short_last_name);
-    $display_names['sort_name']      = $short_last_name . ' ' . $firstname;
+    $display_names['sort_name']      = build_sort_name($firstname, $short_last_name);
 
     return $display_names;
 }
@@ -143,6 +146,22 @@ function build_full_name($firstname, $lastname)
     return $firstname . ' ' . $lastname;
 }
 
+// Returns the name on which the sort is performed, according to French
+// typographic rules.
+function build_sort_name($firstname, $lastname)
+{
+    // Remove uncapitalized particles.
+    $particles = "/^(d'|(" . implode(Particles::$particles, '|') . ') )/';
+    $name = preg_replace($particles, '', $lastname);
+    // Mac must also be uniformized.
+    $lastname = preg_replace("/^(Mac|Mc)( |)/", 'Mac', $name);
+
+    if ($firstname == '') {
+        return $lastname;
+    }
+    return $lastname . ' ' . $firstname;
+}
+
 /** Splits a name into tokens, as used in search_name.
  * Used for search_name rebuilding and for queries.
  */
@@ -178,7 +197,7 @@ function update_account_from_profile($uid)
               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
+                          a.full_name = pd.short_name, a.directory_name = pd.directory_name, a.sort_name = pd.sort_name
                    WHERE  a.uid = {?}",
                  $uid);
 }
@@ -250,7 +269,7 @@ function capitalize_name($name)
     }
 
     // Capitalizes the first token.
-    if (!in_array($token, $particles)) {
+    if (!in_array($token, Particles::$particles)) {
         $token = mb_ucfirst($token);
     }