Changeset 25062


Ignore:
Timestamp:
10/21/13 18:00:06 (6 years ago)
Author:
Eric
Message:

Bug 2979 fixed - Users manually added by an admin with "Confirmation of registration for admins" disabled and "Automatic management of unconfirmed users" enabled will no longer receive a reminder email to confirm the registration

Location:
extensions/UserAdvManager/trunk
Files:
2 edited

Legend:

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

    r24371 r25062  
    455455             Update da_DK, thanks to : Kaare 
    456456             Update el_GR, thanks to : bas_alba 
    457               
     457 
     458 
     459-- 2.51.0 : Bug 2979 fixed - Users manually added by an admin with "Confirmation of registration for admins" disabled and "Automatic management of unconfirmed users" enabled will no longer receive a reminder email to confirm the registration 
     460            Bug 1109 fixed - Password enforcement features have been removed from UAM and set in a new dedicated plugin : Password Policy 
    458461*/ 
    459462?> 
  • extensions/UserAdvManager/trunk/include/functions.inc.php

    r24212 r25062  
    155155      elseif (is_admin() and isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'false') 
    156156      { 
     157        SetValidated($register_user['id']); 
    157158        SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false); 
    158159      } 
     
    176177      elseif (is_admin() and isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'false') 
    177178      { 
     179        SetValidated($register_user['id']); 
    178180        SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false); 
    179181      } 
     
    446448  } 
    447449 
    448   // Avoid login into public galleries until registration confirmation is done 
     450  // Avoid login into private galleries until registration confirmation is done 
    449451  if ((isset($conf_UAM['REJECTCONNECT']) and $conf_UAM['REJECTCONNECT'] == 'false') 
    450452        or ((isset($conf_UAM['REJECTCONNECT']) and $conf_UAM['REJECTCONNECT'] == 'true') and UAM_UsrReg_Verif($user['id'])) 
     
    771773  { 
    772774    if (count($collection) > 0) 
    773                 { 
     775                { 
    774776      // Process if a non-admin nor webmaster user is logged 
    775777      // --------------------------------------------------- 
     
    16211623  if (isset($conf_UAM['ADD_GALLERY_URL_TO_EMAILS']) and $conf_UAM['ADD_GALLERY_URL_TO_EMAILS'] == 'true') 
    16221624  { 
    1623     UAMLog(get_absolute_root_url(),'','',''); 
    16241625    pwg_mail($email, array( 
    16251626      'subject' => $subject, 
     
    27952796  $query = ' 
    27962797SELECT DISTINCT u.'.$conf['user_fields']['id'].' AS id, 
     2798                u.UAM_validated, 
    27972799                ui.registration_date 
    27982800FROM '.USERS_TABLE.' AS u 
     
    28022804  AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].' 
    28032805  AND (TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= "'.$conf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'].'") 
     2806  AND u.UAM_validated <> "true" 
    28042807ORDER BY ui.registration_date ASC;'; 
    28052808 
Note: See TracChangeset for help on using the changeset viewer.