Changeset 21770

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)

Location:

extensions/UserAdvManager/trunk

Files:

• changelog.txt.php (modified) (1 diff)
• include/functions.inc.php (modified) (3 diffs)

extensions/UserAdvManager/trunk/changelog.txt.php

@@ -412 +412 @@
             Update it_IT, thanks to : salvatore
 
--- 2.50.6 : // TODO: Bug 2877
+-- 2.50.6 : Bug 2877 - Disabling Confirmation of registration option disables child options (child options remain configured and shown but no force or effect)
             Bug 2878 - [Kdays] flag was not translated in confirmation text sent by email to user
 */

extensions/UserAdvManager/trunk/include/functions.inc.php

@@ -103 +103 @@
 
     // Perform user logout after registration if not validated
-    if ((isset($conf_UAM['REJECTCONNECT']) and $conf_UAM['REJECTCONNECT'] == 'true') and !UAM_UsrReg_Verif($user['id']) and !is_admin() and !is_webmaster() )
+    if ((isset($conf_UAM['CONFIRM_MAIL']) and ($conf_UAM['CONFIRM_MAIL']=='true' or $conf_UAM['CONFIRM_MAIL']=='local'))
+          and (isset($conf_UAM['REJECTCONNECT']) and $conf_UAM['REJECTCONNECT'] == 'true')
+          and !UAM_UsrReg_Verif($user['id'])
+          and !is_admin()
+          and !is_webmaster())
     {
       invalidate_user_cache();
@@ -436 +440 @@
   // Performing User validation scheduled tasks
   // ------------------------------------------
-  if ((isset($conf_UAM['USRAUTO']) and $conf_UAM['USRAUTO'] == 'true'))
+  if ((isset($conf_UAM['CONFIRM_MAIL']) and $conf_UAM['CONFIRM_MAIL']=='true')
+        and (isset($conf_UAM['USRAUTO']) and $conf_UAM['USRAUTO'] == 'true'))
   {
     UAM_USR_ScheduledTasks();
@@ -442 +447 @@
 
   // Avoid login into public galleries until registration confirmation is done
-  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()))
+  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()))
   {
     // Performing redirection to profile page on first login