Moves userComparison to class User.

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

diff --git a/classes/user.php b/classes/user.php
index 77bacbf..fb5a52b 100644 (file)
--- a/classes/user.php
+++ b/classes/user.php
@@ -629,6 +629,25 @@ class User extends PlUser
         $uids = call_user_func_array(array('XDB', 'fetchColumn'), $args);
         return self::getBulkUsersWithUIDs($uids, null, null, $fetchProfile);
     }
+
+    public static function compareNames($firstname, $lastname, $_firstname, $_lastname)
+    {
+        $_lastname  = mb_strtoupper($_lastname);
+        $_firstname = mb_strtoupper($_firstname);
+        $lastname   = mb_strtoupper($lastname);
+        $firstname  = mb_strtoupper($firstname);
+
+        $isOk  = (mb_strtoupper($_firstname) == mb_strtoupper($firstname));
+        $tokens = preg_split("/[ \-']/", $lastname, -1, PREG_SPLIT_NO_EMPTY);
+        $maxlen = 0;
+
+        foreach ($tokens as $str) {
+            $isOk &= (strpos($_lastname, $str) !== false);
+            $maxlen = max($maxlen, strlen($str));
+        }
+
+        return ($isOk && ($maxlen > 2 || $maxlen == strlen($_lastname)));
+    }
 }
 
 /** Iterator over a set of Users

diff --git a/core b/core
index 4314727..27b8c1c 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 4314727805eedd77202a6addef0d3ad4b666f678
+Subproject commit 27b8c1c62e8819b6cdc304d8ce03ffae78c7e722

diff --git a/modules/register/register.inc.php b/modules/register/register.inc.php
index e70fdae..a5abd6a 100644 (file)
--- a/modules/register/register.inc.php
+++ b/modules/register/register.inc.php
@@ -19,29 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-// {{{ function user_cmp
-
-function user_cmp($prenom, $nom, $_prenom, $_nom)
-{
-    $_nom    = mb_strtoupper($_nom);
-    $_prenom = mb_strtoupper($_prenom);
-    $nom     = mb_strtoupper($nom);
-    $prenom  = mb_strtoupper($prenom);
-
-    $is_ok   = mb_strtoupper($_prenom) == mb_strtoupper($prenom);
-
-    $tokens  = preg_split("/[ \-']/", $nom, -1, PREG_SPLIT_NO_EMPTY);
-    $maxlen  = 0;
-
-    foreach ($tokens as $str) {
-        $is_ok &= strpos($_nom, $str)!==false;
-        $maxlen = max($maxlen, strlen($str));
-    }
-
-    return $is_ok && ($maxlen > 2 || $maxlen == strlen($_nom));
-}
-
-// }}}
 // {{{ function check_mat
 
 function check_mat($promo, $mat, &$nom, &$prenom, &$ourmat, &$ourid, &$watch, &$naiss)