Ignore:
Timestamp:
Mar 21, 2013, 7:13:58 PM (11 years ago)
Author:
Eric
Message:

Bug 2877 - Disabling Confirmation of registration main option disables child options (child options remain configured and shown but no force or effect)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserAdvManager/trunk/include/functions.inc.php

    r21769 r21770  
    103103
    104104    // Perform user logout after registration if not validated
    105     if ((isset($conf_UAM['REJECTCONNECT']) and $conf_UAM['REJECTCONNECT'] == 'true') and !UAM_UsrReg_Verif($user['id']) and !is_admin() and !is_webmaster() )
     105    if ((isset($conf_UAM['CONFIRM_MAIL']) and ($conf_UAM['CONFIRM_MAIL']=='true' or $conf_UAM['CONFIRM_MAIL']=='local'))
     106          and (isset($conf_UAM['REJECTCONNECT']) and $conf_UAM['REJECTCONNECT'] == 'true')
     107          and !UAM_UsrReg_Verif($user['id'])
     108          and !is_admin()
     109          and !is_webmaster())
    106110    {
    107111      invalidate_user_cache();
     
    436440  // Performing User validation scheduled tasks
    437441  // ------------------------------------------
    438   if ((isset($conf_UAM['USRAUTO']) and $conf_UAM['USRAUTO'] == 'true'))
     442  if ((isset($conf_UAM['CONFIRM_MAIL']) and $conf_UAM['CONFIRM_MAIL']=='true')
     443        and (isset($conf_UAM['USRAUTO']) and $conf_UAM['USRAUTO'] == 'true'))
    439444  {
    440445    UAM_USR_ScheduledTasks();
     
    442447
    443448  // Avoid login into public galleries until registration confirmation is done
    444   if ((isset($conf_UAM['REJECTCONNECT']) and $conf_UAM['REJECTCONNECT'] == 'false') or ((isset($conf_UAM['REJECTCONNECT']) and $conf_UAM['REJECTCONNECT'] == 'true') and UAM_UsrReg_Verif($user['id'])) or  (!is_admin() and !is_webmaster()))
     449  if ((isset($conf_UAM['REJECTCONNECT']) and $conf_UAM['REJECTCONNECT'] == 'false')
     450        or ((isset($conf_UAM['REJECTCONNECT']) and $conf_UAM['REJECTCONNECT'] == 'true') and UAM_UsrReg_Verif($user['id']))
     451        or (!is_admin() and !is_webmaster()))
    445452  {
    446453    // Performing redirection to profile page on first login
Note: See TracChangeset for help on using the changeset viewer.