Changeset 17511


Ignore:
Timestamp:
08/09/12 22:18:14 (7 years ago)
Author:
Eric
Message:

r17510 merged from trunk to branch 2.30

Location:
extensions/UserAdvManager/branches/2.30
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserAdvManager/branches/2.30/changelog.txt.php

    r14312 r17511  
    293293 
    294294-- 2.30.6 : Bug 2618 fixed - Apache crash when php 5.3.10 is used 
     295 
     296-- 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. 
    295297*/ 
    296298?> 
  • extensions/UserAdvManager/branches/2.30/include/functions.inc.php

    r13823 r17511  
    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 
     
    23992417    ON u.'.$conf['user_fields']['id'].' = ug.user_id 
    24002418WHERE u.'.$conf['user_fields']['id'].' >= 3 
     2419  AND u.username NOT LIKE "16" 
     2420  AND u.username NOT LIKE "18" 
    24012421ORDER BY ug.lastvisit DESC 
    24022422;'; 
  • extensions/UserAdvManager/branches/2.30/language/en_UK/plugin.lang.php

    r13823 r17511  
    235235$lang['UAM %d users pwdreseted'] = 'Password renewal required for %d users'; 
    236236$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.'; 
    237 $lang['UAM_Default_InfoMail_Txt'] = 'Hello [username]! Thank you to have register on [mygallery]. 
    238  
    239 Please, find find below your connexion information.'; 
     237$lang['UAM_Default_InfoMail_Txt'] = 'Hello [username]! 
     238 
     239You made significant changes in your profile on the gallery [mygallery]. Please, find below your new settings:'; 
    240240$lang['UAM_Default_ConfirmMail_Txt'] = 'Hello [username]! Thank you to have register on [mygallery]. 
    241241 
     
    403403$lang['UAM_Tracking confirmations'] = 'Tracking confirmations'; 
    404404// --------- End: New or revised $lang ---- from version 2.30.3 
     405 
     406 
     407// --------- Starting below: New or revised $lang ---- from version 2.40.4 and 2.30.7 
     408$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> 
     409Please, 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> 
     410Note: This message will disappear after you have made the necessary correction and reloaded the admin page.<br><br>'; 
     411// --------- End: New or revised $lang ---- from version 2.40.4 and 2.30.7 
    405412?> 
  • extensions/UserAdvManager/branches/2.30/language/fr_FR/plugin.lang.php

    r13823 r17511  
    248248$lang['UAM %d users pwdreseted'] = 'Renouvellement de mot de passe demandé pour %d utilisateurs'; 
    249249$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.'; 
    250 $lang['UAM_Default_InfoMail_Txt'] = 'Bonjour [username] et merci de vous être inscrit sur la galerie [mygallery]. 
    251  
    252 Vous trouverez ci-dessous vos informations de connexion sur la galerie.'; 
     250$lang['UAM_Default_InfoMail_Txt'] = 'Bonjour [username]! 
     251 
     252Vous avez effectué des modifications importantes de profil sur la galerie [mygallery]. Voici vos nouveaux paramètres :'; 
    253253$lang['UAM_Default_GhstReminder_Txt'] = 'Bonjour [username]. 
    254254         
     
    408408$lang['UAM_Tracking confirmations'] = 'Suivi des confirmations'; 
    409409// --------- End: New or revised $lang ---- from version 2.30.3 
     410 
     411 
     412// --------- Starting below: New or revised $lang ---- from version 2.40.4 and 2.30.7 
     413$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> 
     414Veuillez 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> 
     415Note : Ce message disparaitra après que vous ayez effectué la correction nécessaire et rechargé la page d\'administration.<br><br>'; 
     416// --------- End: New or revised $lang ---- from version 2.40.4 and 2.30.7 
    410417?> 
  • extensions/UserAdvManager/branches/2.30/main.inc.php

    r14312 r17511  
    22/* 
    33Plugin Name: UserAdvManager 
    4 Version: 2.30.6 
     4Version: 2.30.7 
    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 compatibility 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.