Changeset 17507


Ignore:
Timestamp:
08/09/12 22:03:31 (7 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:
5 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserAdvManager/trunk/changelog.txt.php

    r17448 r17507  
    320320            Update lv_LV, thanks to : agrisans 
    321321            Update el_GR, thanks to : bas_alba 
     322 
     323-- 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. 
     324            Update el_GR, thanks to : bas_alba 
     325            Update lv_LV, thanks to : agrisans 
    322326*/ 
    323327?> 
  • extensions/UserAdvManager/trunk/include/functions.inc.php

    r14857 r17507  
    2525 
    2626  return $menu; 
     27} 
     28 
     29 
     30/** 
     31 * Triggered on loc_begin_admin_page 
     32 *  
     33 * Check options compatibility 
     34 */ 
     35function UAM_check_compat() 
     36{ 
     37  global $conf, $page; 
     38  
     39  // Check mandatory email address for email exclusion 
     40  $conf_UAM = unserialize($conf['UserAdvManager']); 
     41  if (!$conf['obligatory_user_mail_address'] and $conf_UAM[10] = 'true') 
     42  { 
     43    array_push($page['warnings'], l10n('UAM_mail_exclusion_error')); 
     44  } 
    2745} 
    2846 
  • extensions/UserAdvManager/trunk/language/en_UK/plugin.lang.php

    r14729 r17507  
    420420$lang['UAM_Default_AdminValidationMail_Subject'] = '[username] - Registration validated on [mygallery]'; 
    421421// --------- End: New or revised $lang ---- from version 2.40 
     422 
     423 
     424// --------- Starting below: New or revised $lang ---- from version 2.40.4 
     425$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> 
     426Please, 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> 
     427Note: This message will disappear after you have made the necessary correction and reloaded the admin page.<br><br>'; 
     428// --------- End: New or revised $lang ---- from version 2.40.4 
    422429?> 
  • extensions/UserAdvManager/trunk/language/fr_FR/plugin.lang.php

    r14729 r17507  
    425425$lang['UAM_Default_AdminValidationMail_Subject'] = '[username] - Inscription validée sur [mygallery]'; 
    426426// --------- End: New or revised $lang ---- from version 2.40 
     427 
     428 
     429// --------- Starting below: New or revised $lang ---- from version 2.40.4 
     430$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> 
     431Veuillez 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> 
     432Note : Ce message disparaitra après que vous ayez effectué la correction nécessaire et rechargé la page d\'administration.<br><br>'; 
     433// --------- End: New or revised $lang ---- from version 2.40.4 
    427434?> 
  • extensions/UserAdvManager/trunk/main.inc.php

    r17448 r17507  
    22/* 
    33Plugin Name: UserAdvManager 
    4 Version: 2.40.3 
     4Version: auto 
    55Description: Renforcer la gestion des utilisateurs - Enforce users management 
    66Plugin URI: http://piwigo.org/ext/extension_view.php?eid=216 
     
    258258  } 
    259259} 
     260 
     261 
     262// Check options compatibilité between UAM and Piwigo at admin page load 
     263// --------------------------------------------------------------------- 
     264add_event_handler('loc_begin_admin_page', 'UAM_check_compat'); 
    260265?> 
Note: See TracChangeset for help on using the changeset viewer.