Moves make_firstname_case to PlUser.

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/classes/pluser.php b/classes/pluser.php
index bd111ba..d1ba961 100644 (file)
--- a/classes/pluser.php
+++ b/classes/pluser.php
@@ -373,7 +373,7 @@ abstract class PlUser
     private static function stripBadChars($text)
     {
         return str_replace(array(' ', "'"), array('-', ''),
-                           strtolower(stripslashed(replace_accent(trim($text)))));
+                           strtolower(stripslashes(replace_accent(trim($text)))));
     }
 
     /** Creates a username from a first and last name
@@ -402,7 +402,25 @@ abstract class PlUser
         return self::makeUserName($firstname, $lastname) . '.' . $cat;
     }
 
+    /** Reformats the firstname so that all letters are in lower case,
+     * except the first letter of each part of the name.
+     */
+    public static function fixFirstnameCase($firstname)
+    {
+        $firstname = strtolower($firstname);
+        $pieces = explode('-', $firstname);
+
+        foreach ($pieces as $piece) {
+            $subpieces = explode("'", $piece);
+            $usubpieces = '';
 
+            foreach ($subpieces as $subpiece) {
+                $usubpieces[] = ucwords($subpiece);
+            }
+            $upieces[] = implode("'", $usubpieces);
+        }
+        return implode('-', $upieces);
+    }
 }
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:

diff --git a/include/misc.inc.php b/include/misc.inc.php
index fa080e8..77be2b0 100644 (file)
--- a/include/misc.inc.php
+++ b/include/misc.inc.php
@@ -165,25 +165,6 @@ function soundex_fr($sIn)
     return substr( $sIn . '    ', 0, 4);
 }
 
-/** met les majuscules au debut de chaque atome du prénom
- * @param $prenom le prénom à formater
- * return STRING le prénom avec les majuscules
- */
-function make_firstname_case($prenom)
-{
-    $prenom = strtolower($prenom);
-    $pieces = explode('-',$prenom);
-
-    foreach ($pieces as $piece) {
-        $subpieces = explode("'",$piece);
-        $usubpieces="";
-        foreach ($subpieces as $subpiece)
-            $usubpieces[] = ucwords($subpiece);
-        $upieces[] = implode("'",$usubpieces);
-    }
-    return implode('-',$upieces);
-}
-
 /** Convert ip to uint (to store it in a database)
  */
 function ip_to_uint($ip)