Changeset 4235

Timestamp:

Nov 9, 2009, 9:03:08 PM (14 years ago)

Author:

Eric

Message:

[NBC_UserAdvManager] Merged from Trunk to Branch 2.12

• 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 og DE, ES and IT languages. IT language translation is still to do.
• Adding of description.txt files in language directories.

Location:

extensions/NBC_UserAdvManager/branches/2.12

Files:

• language/de_DE (added)
• language/de_DE/description.txt (added)
• language/de_DE/index.php (added)
• language/de_DE/plugin.lang.php (added)
• language/en_UK/description.txt (added)
• language/en_UK/plugin.lang.php (modified) (8 diffs)
• language/es_ES (added)
• language/es_ES/description.txt (added)
• language/es_ES/index.php (added)
• language/es_ES/plugin.lang.php (added)
• language/fr_FR/description.txt (added)
• language/fr_FR/plugin.lang.php (modified) (4 diffs)
• language/it_IT (added)
• language/it_IT/description.txt (added)
• language/it_IT/index.php (added)
• language/it_IT/plugin.lang.php (added)
• main.inc.php (modified) (4 diffs)

extensions/NBC_UserAdvManager/branches/2.12/language/en_UK/plugin.lang.php

@@ -9 +9 @@
 $lang['Title_Tab1'] = 'UserAdvManager - General Setup';
 $lang['Tab_Global'] = 'General Setup';
-$lang['UserAdvManager_Mail_Info'] = ' Mail information user:';
-$lang['UserAdvManager_Mail_Info_true'] = ' Send an information mail to the user when he registes or updates his profile.';
-$lang['UserAdvManager_Mail_Info_false'] = ' Turns off the sending of mail. (default)';
+$lang['UserAdvManager_Mail_Info'] = ' Mail information to user:';
+$lang['UserAdvManager_Mail_Info_true'] = ' Send mail to the user by taking over its connection information when registering or updating their profile.';
+$lang['UserAdvManager_Mail_Info_false'] = ' Turns off the mail sending. (default)';
 $lang['UserAdvManager_MailInfo_Text'] = ' Text used to introduce the email sent to user to allow him to validate his email address<br><b style="color: red;">(!!! </b><b style="text-decoration: underline; color: red;">WARNING !</b> <b style="color: red;">Text modification is available ONLY if Mail information user is enabled. Use the multi language tags from Extended Description plugin if this plugin is activated !!!)</b>';
-$lang['UserAdvManager_No_Casse'] = ' User insensitive';
-$lang['UserAdvManager_No_Casse_true'] = ' Make the user account insensitive at the registration and the identification step';
-$lang['UserAdvManager_No_Casse_false'] = ' Let the user-sensitive. (default)';
-$lang['UserAdvManager_Username_Char'] = ' Limited charset for unsername';
+$lang['UserAdvManager_No_Casse'] = ' User name case insensitive';
+$lang['UserAdvManager_No_Casse_true'] = ' Make the user account case insensitive at the registration and the identification step';
+$lang['UserAdvManager_No_Casse_false'] = ' Let the user case sensitive. (default)';
+$lang['UserAdvManager_Username_Char'] = ' Limited charset for username';
 $lang['UserAdvManager_Username_Char_true'] = ' The following characters will be forbidden for username choice';
 $lang['UserAdvManager_Username_Char_false'] = ' Use the default username charset control. (default)';
@@ -41 +41 @@
 $lang['UserAdvManager_Password_Enforced'] = 'Strengthening passwords - Enabling this option makes the seizure of the password required for visitors registration. Also, the password entered by the visitor will meet with a score of complexity (<b style="color: green;">activate and save settings to display more informations</b>).';
 $lang['UserAdvManager_Password_Enforced_Info'] = '<b style="text-decoration: underline; color: green;">Explanations:</b> <b style="color: green;">A password score is calculated on the basic parameters: length, type of characters used (letters, digits, uppercase, lowercase, special characters). If the password of the user does not score, the score reached is displayed with the minimal score to reach and an indication to increase the value of this score. To give you an idea, a score below 100 is considered "low complexity". Between 100 and 500, the complexity is increased and average. Beyond 500, that\'s Fort Knox! ;-)<br>You can do your passwords complexity tests by using the field below. This will allow you to get an idea of the score to define a custom complexity.</b>';
-$lang['UserAdvManager_PasswordTest'] = 'Passowrd to test : ';
+$lang['UserAdvManager_PasswordTest'] = 'Password to test : ';
 $lang['UserAdvManager_ScoreTest'] = 'Score : ';
 $lang['PasswordTest'] = 'Score calculation';
@@ -64 +64 @@
 $lang['Title_Tab2'] = 'UserAdvManager - ConfirmMail Settings';
 $lang['Tab_ConfirmMail'] = 'ConfirmMail Settings';
-$lang['UserAdvManager_ConfirmMail_Info'] = 'Time limitation for validation of registration :<br>If you enable this option, select the desired time (x) )in the field below. Visitors who register will then have x days to validate their registration. After this period the validation link they have received by mail will be expired.<br>';
+$lang['UserAdvManager_ConfirmMail_Info'] = 'Time limitation for validation of registration :<br>If you enable this option, select the desired time (x) in the field below. Visitors who register will then have x days to validate their registration. After this period the validation link they have received by mail will be expired.<br>';
 $lang['UserAdvManager_ConfirmMail_TimeOut_true'] = 'Enable limiting the registration deadline.';
 $lang['UserAdvManager_ConfirmMail_TimeOut_false'] = 'Disable limiting the registration deadline. (Default)';
@@ -86 +86 @@
 - Generate email reminder <b>without</b> generating a new key. Warning: Send an email reminder to targeted visitors. This function does not reset the date of registration of targeted visitors and the timeout is still valid.
 <br>
-- Generate email reminder <b>with</b> generating a new key. Warning : Send an email reminder to targeted visitors. This function also resets the date of registration of targeted visitors which equates to extend the deadline for validation.<br>
+- Generate email reminder <b>with</b> generating a new key. Warning : Send an email reminder to targeted visitors. This function also resets the date of registration of targeted visitors which equates to extend the deadline for validation.
+<br>
 - Submit a registration awaiting validation manually even if the expiry date has passed <b>(forcing validation)</b>.
 <br>';
@@ -119 +120 @@
 $lang['Add of %s'] = 'Add of %s';
 $lang['Update of %s'] = 'Update of %s';
-$lang['Link: %s'] = 'Please, click on this link to confirm your regsitration : %s';
+$lang['Link: %s'] = 'Please, click on this link to confirm your registration : %s';
 $lang['Reminder_with_key_of_%s'] = '%s, your validation key has been renewed';
 $lang['Reminder_without_key_of_%s'] = '%s, your validation key will expire';
@@ -141 +142 @@
 if ( isset($conf_UserAdvManager[1]) and $conf_UserAdvManager[1] == 'true' )
         $lang['reg_err_login5'] = 'Username already exist, WARNING name is case insensitive (Shift = Tiny).';
-$lang['reg_err_login6'] = 'Username does not match the following characters: ';
+$lang['reg_err_login6'] = 'Username does not have to match the following characters: ';
 $lang['reg_err_login7'] = 'Your email provider is banned for registration. Banned email providers are: ';
 $lang['UserAdvManager_empty_pwd'] = '[empty password]';
@@ -151 +152 @@
 $lang['No_validation_for_default_user'] = 'The default account is not subject to validation';
 $lang['No_validation_for_Webmaster'] = 'The "Webmaster" account is not subject to validation';
-$lang['No_validation_for_your_account'] = 'You personnal admin account is not subject to validation';
+$lang['No_validation_for_your_account'] = 'Your personnal admin account is not subject to validation';
 $lang['Database_Error'] = '<b><u>Warning! Critical integrity error in your database.</u></b><br><br>Please check the integrity of the #_user_confirm_mail table.';
 // --------- Starting below: New or revised $lang ---- from version 2.12.0 and 2.12.1
@@ -192 +193 @@
 // --------- End: New or revised $lang ---- from version 2.12.0 and 2.12.1
 // --------- Starting below: New or revised $lang ---- from version 2.12.2
-$lang['GT_Reset'] = 'Reset Ghost Tracker.';
+$lang['GT_Reset'] = 'Reset Ghost Tracker';
 // --------- End: New or revised $lang ---- from version 2.12.2
 ?>

extensions/NBC_UserAdvManager/branches/2.12/language/fr_FR/plugin.lang.php

@@ -10 +10 @@
 $lang['Tab_Global'] = 'Configuration Générale';
 $lang['UserAdvManager_Mail_Info'] = 'Mail d\'information à l\'utilisateur :';
-$lang['UserAdvManager_Mail_Info_true'] = ' Envoyer un mail à l\'utilisateur reprenant ses infos lors de son inscription ou la mise à jour de son profil.';
+$lang['UserAdvManager_Mail_Info_true'] = ' Envoyer un mail à l\'utilisateur en reprenant ses informations de connexion lors de son inscription ou à la mise à jour de son profil.';
 $lang['UserAdvManager_Mail_Info_false'] = ' Désactive l\'envoi de mail d\'info. (valeur par défaut)';
 $lang['UserAdvManager_MailInfo_Text'] = ' Texte utilisé pour l\'introduction du mail envoyé à l\'utilisateur pour son inscription ou la mise à jour de son profil<br><b style="color: red;">(!!! </b><b style="text-decoration: underline; color: red;">ATTENTION !</b> <b style="color: red;">La modification du texte n\'est possible <b>QUE</b> si le mail d\'information à l\'utilisateur est activé. Utilisez la méthode multi language du plugin Extended Description si celui-ci est activé !!!)</b>';
@@ -16 +16 @@
 $lang['UserAdvManager_No_Casse_true'] = ' Rendre le compte utilisateur insensible à la casse, lors de l\'inscription et l\identification.';
 $lang['UserAdvManager_No_Casse_false'] = ' Laisser les utilisateur sensible à la casse. (valeur par défaut)';
-$lang['UserAdvManager_Username_Char'] = 'Caractères limités pour le nom d\'utilisateur';
+$lang['UserAdvManager_Username_Char'] = ' Caractères limités pour le nom d\'utilisateur';
 $lang['UserAdvManager_Username_Char_true'] = ' Interdire les caractères saisis dans le champs ci-après pour le nom d\'utilisateur lors de l\'inscription == ';
 $lang['UserAdvManager_Username_Char_false'] = ' Laisser le contrôle par défaut du nom d\'utilisateur. (valeur par défaut)';
@@ -64 +64 @@
 $lang['Title_Tab2'] = 'UserAdvManager - Configuration de ConfirmMail';
 $lang['Tab_ConfirmMail'] = 'Configuration de ConfirmMail';
-$lang['UserAdvManager_ConfirmMail_Info'] = 'Limitation du délai de validation de l\'inscription :<br>Si vous activez cette option, sélectionnez le délai (x) )souhaité dans la liste qui suit. Les visiteurs qui s\'inscriront alors auront x jours de délais pour valider leur inscription. Passé ce délai, le lien de validation qu\'ils auront reçu par mail sera expiré.<br>';
+$lang['UserAdvManager_ConfirmMail_Info'] = 'Limitation du délai de validation de l\'inscription :<br>Si vous activez cette option, sélectionnez le délai (x) souhaité dans la liste qui suit. Les visiteurs qui s\'inscriront alors auront x jours de délais pour valider leur inscription. Passé ce délai, le lien de validation qu\'ils auront reçu par mail sera expiré.<br>';
 $lang['UserAdvManager_ConfirmMail_TimeOut_true'] = 'Activer la limitation du délai d\'inscription.';
 $lang['UserAdvManager_ConfirmMail_TimeOut_false'] = 'Désactiver la limitation du délai d\'inscription. (valeur par défaut)';
@@ -86 +86 @@
 - Générer l\'email de rappel <b>sans génération</b> d\'une nouvelle clef. Rappel : Cette fonction ne réinitialise pas la date d\'inscription du visiteur ciblé et le délai d\'expiration est toujours d\'actualité.
 <br>
-- Générer l\'email de rappel <b>avec génération</b> d\'une nouvelle clef. Rappel : Cette fonction réinitialise également la date d\'inscription du visiteur ciblé ce qui équivaut à prolonger le délai de validation.<br>
+- Générer l\'email de rappel <b>avec génération</b> d\'une nouvelle clef. Rappel : Cette fonction réinitialise également la date d\'inscription du visiteur ciblé ce qui équivaut à prolonger le délai de validation.
+<br>
 - Valider manuellement une inscription en attente de validation même si la date d\'expiration est révolue <b>(forçage de la validation)</b>.
 <br>';

extensions/NBC_UserAdvManager/branches/2.12/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: NBC UserAdvManager
-Version: 2.12.4
-Description: Permet de renforcer les possibilités de gestion des utilisateurs - Enforce users management
+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
 Author: Nicco, Eric
@@ -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');
   }