Changeset 17507 for extensions/UserAdvManager/trunk

Timestamp:

Aug 9, 2012, 10:03:31 PM (12 years ago)

Author:

Eric

Message:

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.

New version 2.40.4 hard coded for publication

Location:

extensions/UserAdvManager/trunk

Files:

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

extensions/UserAdvManager/trunk/changelog.txt.php

@@ -320 +320 @@
             Update lv_LV, thanks to : agrisans
             Update el_GR, thanks to : bas_alba
+
+-- 2.40.4 : 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.
+            Update el_GR, thanks to : bas_alba
+            Update lv_LV, thanks to : agrisans
 */
 ?>

extensions/UserAdvManager/trunk/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'));
+  }
 }
 

extensions/UserAdvManager/trunk/language/en_UK/plugin.lang.php

@@ -420 +420 @@
 $lang['UAM_Default_AdminValidationMail_Subject'] = '[username] - Registration validated on [mygallery]';
 // --------- End: New or revised $lang ---- from version 2.40
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.40.4
+$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
 ?>

extensions/UserAdvManager/trunk/language/fr_FR/plugin.lang.php

@@ -425 +425 @@
 $lang['UAM_Default_AdminValidationMail_Subject'] = '[username] - Inscription validée sur [mygallery]';
 // --------- End: New or revised $lang ---- from version 2.40
+
+
+// --------- Starting below: New or revised $lang ---- from version 2.40.4
+$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
 ?>

extensions/UserAdvManager/trunk/main.inc.php

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