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

Timestamp:

Oct 22, 2013, 1:29:23 PM (11 years ago)

Author:

Eric

Message:

merge r25062 from trunk to branch 2.50 :
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

pt_BR and tr_TR translation updates

File:

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

extensions/UserAdvManager/branches/2.50/include/functions.inc.php

@@ -155 +155 @@
       elseif (is_admin() and isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'false')
       {
+        SetValidated($register_user['id']);
         SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
       }
@@ -176 +177 @@
       elseif (is_admin() and isset($conf_UAM['ADMINCONFMAIL']) and $conf_UAM['ADMINCONFMAIL'] == 'false')
       {
+        SetValidated($register_user['id']);
         SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
       }
@@ -446 +448 @@
   }
 
-  // Avoid login into public galleries until registration confirmation is done
+  // Avoid login into private 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']))
@@ -771 +773 @@
   {
     if (count($collection) > 0)
-                {
+                {
       // Process if a non-admin nor webmaster user is logged
       // ---------------------------------------------------
@@ -1621 +1623 @@
   if (isset($conf_UAM['ADD_GALLERY_URL_TO_EMAILS']) and $conf_UAM['ADD_GALLERY_URL_TO_EMAILS'] == 'true')
   {
-    UAMLog(get_absolute_root_url(),'','','');
     pwg_mail($email, array(
       'subject' => $subject,
@@ -2795 +2796 @@
   $query = '
 SELECT DISTINCT u.'.$conf['user_fields']['id'].' AS id,
+                u.UAM_validated,
                 ui.registration_date
 FROM '.USERS_TABLE.' AS u
@@ -2802 +2804 @@
   AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
   AND (TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= "'.$conf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'].'")
+  AND u.UAM_validated <> "true"
 ORDER BY ui.registration_date ASC;';