Changeset 4249 for extensions/NBC_UserAdvManager/trunk/main.inc.php

Timestamp:

Nov 11, 2009, 3:26:30 PM (14 years ago)

Author:

Eric

Message:

[NBC_UserAdvManager]

• Bug 1236 fixed : Admins couldn't add new users accounts in admin panel.
• Beginning of IT translation
• Some language files corrections

File:

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

extensions/NBC_UserAdvManager/trunk/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: NBC UserAdvManager
-Version: 2.12.5
+Version: 2.12.6
 Description: Renforcer les possibilités de gestion des utilisateurs - Enforce users management
 Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216
@@ -96 +96 @@
             Adding DE, ES and IT languages. All translations are not finalized and could be improved.
             Adding of description.txt file in language directories.
+
+-- 2.12.6 : Bug 1236 fixed -  Admins was unable to add a new user in the user_list page.
+            Beginning of IT translations
 */
 
@@ -262 +265 @@
     return l10n('reg_err_login5');
   }
-  
-  /* ***************************** */
-  /* Standard Piwigo's email check */
-  /* ***************************** */
-  $atom   = '[-a-z0-9!#$%&\'*+\\/=?^_`{|}~]';   // before  arobase
-  $domain = '([a-z0-9]([-a-z0-9]*[a-z0-9]+)?)'; // domain name
-  $regex = '/^' . $atom . '+' . '(\.' . $atom . '+)*' . '@' . '(' . $domain . '{1,63}\.)+' . $domain . '{2,63}$/i';
-
-  if (!preg_match($regex, $_POST['mail_address']))
-  {
-    return l10n('reg_err_mail_address');
-  }
-
-  if (!empty($_POST['mail_address']))
-  {
-    $query = '
+
+  if (script_basename() == 'admin' and isset($_GET['page']) and $_GET['page'] == 'user_list') /* not the same email variable if we are on users registration page or on admin's user registration page*/
+  {
+    /* ***************************** */
+    /* Standard Piwigo's email check */
+    /* ***************************** */
+    $atom   = '[-a-z0-9!#$%&\'*+\\/=?^_`{|}~]';   // before  arobase
+    $domain = '([a-z0-9]([-a-z0-9]*[a-z0-9]+)?)'; // domain name
+    $regex = '/^' . $atom . '+' . '(\.' . $atom . '+)*' . '@' . '(' . $domain . '{1,63}\.)+' . $domain . '{2,63}$/i';
+  
+    if (!preg_match($regex, $_POST['email']))
+    {
+      return l10n('reg_err_mail_address');
+    }
+    
+    if (!empty($_POST['email']))
+    {
+      $query = '
+select count(*)
+from '.USERS_TABLE.'
+where upper('.$conf['user_fields']['email'].') = upper(\''.$_POST['email'].'\');';
+      list($count) = mysql_fetch_array(pwg_query($query));
+      if ($count != 0)
+      {
+        return l10n('reg_err_mail_address_dbl');
+      }
+    }
+  }
+  else
+  {
+    /* ***************************** */
+    /* Standard Piwigo's email check */
+    /* ***************************** */
+    $atom   = '[-a-z0-9!#$%&\'*+\\/=?^_`{|}~]';   // before  arobase
+    $domain = '([a-z0-9]([-a-z0-9]*[a-z0-9]+)?)'; // domain name
+    $regex = '/^' . $atom . '+' . '(\.' . $atom . '+)*' . '@' . '(' . $domain . '{1,63}\.)+' . $domain . '{2,63}$/i';
+
+    if (!preg_match($regex, $_POST['mail_address']))
+    {
+      return l10n('reg_err_mail_address');
+    }
+    
+    if (!empty($_POST['mail_address']))
+    {
+      $query = '
 select count(*)
 from '.USERS_TABLE.'
 where upper('.$conf['user_fields']['email'].') = upper(\''.$_POST['mail_address'].'\');';
-    list($count) = mysql_fetch_array(pwg_query($query));
-    if ($count != 0)
-    {
-      return l10n('reg_err_mail_address_dbl');
+      list($count) = mysql_fetch_array(pwg_query($query));
+      if ($count != 0)
+      {
+        return l10n('reg_err_mail_address_dbl');
+      }
     }
   }