Changeset 4234

Timestamp:

Nov 9, 2009, 8:58:14 PM (15 years ago)

Author:

Eric

Message:

[NBC_UserAdvManager]

• Bug 1233 fixed : "duplicate key error" when a user wants to register with an existing username. In fact, all standard Piwigo's register controls didn't work when plugin was activated. That fixes this too.

File:

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

extensions/NBC_UserAdvManager/trunk/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: NBC UserAdvManager
-Version: 2.12.4
+Version: 2.12.5
 Description: Renforcer les possibilités de gestion des utilisateurs - Enforce users management
 Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216
@@ -92 +92 @@
 -- 2.12.4 : Adding a password field control for SendMail2User - Neighborhood plugin compatibility improvement 
             Bug 1229 fixed - Email was no longer mandatory when plugin was active, even if Piwigo's email madatory option was set. 
+
+-- 2.12.5 : Bug 1233 fixed -  "duplicate key error" when a user wants to register with an existing username. In fact, all standard Piwigo's register controls didn't work when plugin was activated. That fixes this too.
+            Adding DE, ES and IT languages. All translations are not finalized and could be improved.
+            Adding of description.txt file in language directories.
 */
 
@@ -235 +239 @@
   global $errors, $conf;
 
+/* *********************************************************** */
+/* We need to reset the standard Piwigo's register controls    */
+/* because the call of register_user_check trigger resets them */
+/* *********************************************************** */
+  /* ********************************** */
+  /* Standard Piwigo's username control */
+  /* ********************************** */
+  if ($_POST['login'] == '')
+  {
+    return l10n('reg_err_login1');
+  }
+  if (preg_match('/^.* $/', $_POST['login']))
+  {
+    return l10n('reg_err_login2');
+  }
+  if (preg_match('/^ .*$/', $_POST['login']))
+  {
+    return l10n('reg_err_login3');
+  }
+  if (get_userid($_POST['login']))
+  {
+    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 = '
+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');
+    }
+  }
+/* ****************************************** */
+/* End of Piwigo's standard register controls */
+/* ****************************************** */
+
+
+/* ****************************************** */
+/* Here begins the advanced register controls */
+/* ****************************************** */
   $PasswordCheck = 0;
   
@@ -276 +336 @@
     $_POST['login'] = '';
     return($lang['reg_err_login1'] = l10n('reg_err_login6')."'".$conf_nbc_UserAdvManager[8]."'");
-  }
-
-  /* Email mandatory - Needed to be add here to avoid jump of standard Piwigo email control */
-  if (empty($_POST['mail_address']) and $conf['obligatory_user_mail_address'])
-  {
-    //$_POST['mail_address'] = '';
-    return l10n('reg_err_mail_address');
   }