Changeset 21804 for extensions/UserAdvManager/branches/2.50/include/functions.inc.php

Timestamp:

Mar 23, 2013, 4:38:35 PM (11 years ago)

Author:

Eric

Message:

r21769, r21770, r21773, r21787 and r21803 merged from trunk to branch 2.50:
Bug 2877 fixed - Disabling Confirmation of registration main option disables child options (child options remain configured and shown but no force or effect)
Bug 2878 fixed - [Kdays] flag was not translated in confirmation text sent by email to user
Update tr_TR, thanks to : LazBoy
Update da_DK, thanks to : Kaare
Update es_ES, thanks to : crazydark

File:

• extensions/UserAdvManager/branches/2.50/include/functions.inc.php (modified) (4 diffs)

extensions/UserAdvManager/branches/2.50/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
@@ -1134 +1141 @@
 
   $conf_UAM = unserialize($conf['UserAdvManager']);
+  $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
 
   include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');