Changeset 17511

Timestamp:

Aug 9, 2012, 10:18:14 PM (12 years ago)

Author:

Eric

Message:

r17510 merged from trunk to branch 2.30

Location:

extensions/UserAdvManager/branches/2.30

Files:

• changelog.txt.php (modified) (1 diff)
• include/functions.inc.php (modified) (2 diffs)
• language/en_UK/plugin.lang.php (modified) (2 diffs)
• language/fr_FR/plugin.lang.php (modified) (2 diffs)
• main.inc.php (modified) (2 diffs)

extensions/UserAdvManager/branches/2.30/changelog.txt.php

@@ -293 +293 @@
 
 -- 2.30.6 : Bug 2618 fixed - Apache crash when php 5.3.10 is used
+
+-- 2.30.7 : Bug 2658 fixed - Compatibility check between UAM's "email exclusion" option and Piwigo's "Mail address is mandatory for all users" to avoid configuration conflicts.
 */
 ?>

extensions/UserAdvManager/branches/2.30/include/functions.inc.php

@@ -25 +25 @@
 
   return $menu;
+}
+
+
+/**
+ * Triggered on loc_begin_admin_page
+ * 
+ * Check options compatibility
+ */
+function UAM_check_compat()
+{
+  global $conf, $page;
+ 
+  // Check mandatory email address for email exclusion
+  $conf_UAM = unserialize($conf['UserAdvManager']);
+  if (!$conf['obligatory_user_mail_address'] and $conf_UAM[10] = 'true')
+  {
+    array_push($page['warnings'], l10n('UAM_mail_exclusion_error'));
+  }
 }
 
@@ -2399 +2417 @@
     ON u.'.$conf['user_fields']['id'].' = ug.user_id
 WHERE u.'.$conf['user_fields']['id'].' >= 3
+  AND u.username NOT LIKE "16"
+  AND u.username NOT LIKE "18"
 ORDER BY ug.lastvisit DESC
 ;';

extensions/UserAdvManager/branches/2.30/language/en_UK/plugin.lang.php

@@ -235 +235 @@
 $lang['UAM %d users pwdreseted'] = 'Password renewal required for %d users';
 $lang['UAM_Error_Using_illegal_Kdays'] = 'Using the [Kdays] tag is allowed only if the deadline for registration confirmation limited is active. Refer to the text field in red to correct the problem.';
-$lang['UAM_Default_InfoMail_Txt'] = 'Hello [username]! Thank you to have register on [mygallery].
-
-Please, find find below your connexion information.';
+$lang['UAM_Default_InfoMail_Txt'] = 'Hello [username]!
+
+You made significant changes in your profile on the gallery [mygallery]. Please, find below your new settings:';
 $lang['UAM_Default_ConfirmMail_Txt'] = 'Hello [username]! Thank you to have register on [mygallery].
 
@@ -403 +403 @@
 $lang['UAM_Tracking confirmations'] = 'Tracking confirmations';
 // --------- End: New or revised $lang ---- from version 2.30.3
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.40.4 and 2.30.7
+$lang['UAM_mail_exclusion_error'] = 'The Piwigo\'s option "The email address is mandatory for all users" has been disabled while the UserAdvancedManager\'s (UAM) plugin option "Exclusion of mail domains" remained active. This combination is illogical and not compatible!<br><br>
+Please, Reactivate the Piwigo\'s option "The email address is mandatory for all users" to be able then to disable UAM\'s option "Exclusion of mail domains" if that\'s what you want.<br><br>
+Note: This message will disappear after you have made the necessary correction and reloaded the admin page.<br><br>';
+// --------- End: New or revised $lang ---- from version 2.40.4 and 2.30.7
 ?>

extensions/UserAdvManager/branches/2.30/language/fr_FR/plugin.lang.php

@@ -248 +248 @@
 $lang['UAM %d users pwdreseted'] = 'Renouvellement de mot de passe demandé pour %d utilisateurs';
 $lang['UAM_Error_Using_illegal_Kdays'] = 'L\'utilisation de la balise [Kdays] n\'est autorisée que si la limitation du délai de confirmation d\'inscription est active. Reportez vous au champ de texte en rouge pour corriger le problème.';
-$lang['UAM_Default_InfoMail_Txt'] = 'Bonjour [username] et merci de vous être inscrit sur la galerie [mygallery].
-
-Vous trouverez ci-dessous vos informations de connexion sur la galerie.';
+$lang['UAM_Default_InfoMail_Txt'] = 'Bonjour [username]!
+
+Vous avez effectué des modifications importantes de profil sur la galerie [mygallery]. Voici vos nouveaux paramètres :';
 $lang['UAM_Default_GhstReminder_Txt'] = 'Bonjour [username].
         
@@ -408 +408 @@
 $lang['UAM_Tracking confirmations'] = 'Suivi des confirmations';
 // --------- End: New or revised $lang ---- from version 2.30.3
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.40.4 and 2.30.7
+$lang['UAM_mail_exclusion_error'] = 'L\'option de Piwigo "L\'adresse mail est obligatoire pour tous les utilisateurs" a été désactivée alors que l\'option du plugin UserAdvancedManager (UAM) "Exclusion des domaines de messagerie" est resté active. Cette combinaison est illogique et non compatible!<br><br>
+Veuillez réactivez l\'option de Piwigo "L\'adresse mail est obligatoire pour tous les utilisateurs" pour pouvoir désactiver ensuite l\'option UAM "Exclusion des domaines de messagerie" si c\'est ce que vous souhaitez.<br><br>
+Note : Ce message disparaitra après que vous ayez effectué la correction nécessaire et rechargé la page d\'administration.<br><br>';
+// --------- End: New or revised $lang ---- from version 2.40.4 and 2.30.7
 ?>

extensions/UserAdvManager/branches/2.30/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: UserAdvManager
-Version: 2.30.6
+Version: 2.30.7
 Description: Renforcer la gestion des utilisateurs - Enforce users management
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=216
@@ -258 +258 @@
   }
 }
+
+
+// Check options compatibility between UAM and Piwigo at admin page load
+// ---------------------------------------------------------------------
+add_event_handler('loc_begin_admin_page', 'UAM_check_compat');
 ?>