Changeset 4384 for extensions/NBC_UserAdvManager/trunk/include/functions_UserAdvManager.inc.php

Timestamp:

Nov 29, 2009, 2:18:37 AM (14 years ago)

Author:

Eric

Message:

[NBC_UserAdvManager] Pre 2.13

• Translations improvements.
• Bug 1260 fixed - Username case sensitivity is now fully functionnal in all users entries (user registration and admin panel)
• Code refactory and improvements.

File:

• extensions/NBC_UserAdvManager/trunk/include/functions_UserAdvManager.inc.php (modified) (3 diffs)

extensions/NBC_UserAdvManager/trunk/include/functions_UserAdvManager.inc.php

@@ -625 +625 @@
   if (isset($username))
   {
-    $usercase = strtolower($username);
     $query = "
 SELECT ".$conf['user_fields']['username']."
-  FROM ".USERS_TABLE."
-WHERE LOWER(".stripcslashes($conf['user_fields']['username']).") = '".$usercase."'
-;";
-    list($usercase) = mysql_fetch_row(pwg_query($query));
-
-    return isset($username) ? stripslashes($usercase) : '';
+FROM ".USERS_TABLE."
+WHERE LOWER(".stripslashes($conf['user_fields']['username']).") = '".strtolower($username)."'
+;";
+    $users = mysql_num_rows(pwg_query($query));
+    if ($users > 0)
+    {
+      return true;
+    }
+    else
+    {
+      return false;
+    }
   }
 }
@@ -647 +652 @@
   if (isset($login) and isset($conf_nbc_UserAdvManager[8]) and $conf_nbc_UserAdvManager[8] <> '')
   {
-        $pattern = '/'.$conf_nbc_UserAdvManager[8].'/';
-    if ( preg_match($pattern, $login) )
-      return false;
-    else
-      return true;
+    $conf_nbc_CharExclusion = preg_split("/[\s,]+/",$conf_nbc_UserAdvManager[8]);
+    for ($i = 0 ; $i < count($conf_nbc_CharExclusion) ; $i++)
+    {
+      $pattern = '/'.$conf_nbc_CharExclusion[$i].'/i';
+      if (preg_match($pattern, $login))
+      {
+        return true;
+      }
+    }
   }
   else
   {
-    return true;
+    return false;
   }
 }
@@ -667 +676 @@
 
         $conf_nbc_UserAdvManager = isset($conf['nbc_UserAdvManager']) ? explode(";" , $conf['nbc_UserAdvManager']) : array();
-        if (isset($conf_nbc_UserAdvManager[12]))
+  
+        if (isset($email) and isset($conf_nbc_UserAdvManager[13]) and $conf_nbc_UserAdvManager[13] <> '')
         {
-                $ncsemail = strtolower($email);
+                //$ncsemail = strtolower($email);
                 $conf_nbc_MailExclusion = preg_split("/[\s,]+/",$conf_nbc_UserAdvManager[13]);
                 for ($i = 0 ; $i < count($conf_nbc_MailExclusion) ; $i++)
                 {
-                        $pattern = '/'.$conf_nbc_MailExclusion[$i].'/';
-                        if (preg_match($pattern, $ncsemail))
+                        $pattern = '/'.$conf_nbc_MailExclusion[$i].'/i';
+                        if (preg_match($pattern, $email))
       {
-                        return false;
-      }
-      else
-      {
-                        return true;
+                        return true;
       }
                 }
         }
+  else
+  {
+    return false;
+  }
 }