Changeset 21598

Timestamp:

Mar 16, 2013, 1:35:19 PM (11 years ago)

Author:

Eric

Message:

Bug 2870 fixed - Error in tracking confirmation tab if $confdefault_user_id is set with an ID different than Guest user ID

Location:

extensions/UserAdvManager/trunk

Files:

• admin/UAM_admin.php (modified) (1 diff)
• changelog.txt.php (modified) (1 diff)
• include/functions.inc.php (modified) (5 diffs)

extensions/UserAdvManager/trunk/admin/UAM_admin.php

@@ -1336 +1336 @@
           'GROUPS'           => $groups_string,
           'REGISTRATION'     => $local_user['registration_date'],
-          'REMINDER'         => $reminder,    
+          'REMINDER'         => $reminder,   
           'EXPIRATION'       => $expiration,
         )

extensions/UserAdvManager/trunk/changelog.txt.php

@@ -398 +398 @@
             Update tr_TR, thanks to : LazBoy
             Update it_IT, thanks to : Ericnet
-            
+
+-- 2.50.3 : Bug 2870 fixed - Error in tracking confirmation tab if $conf['default_user_id'] is set with an ID different than Guest user ID
 */
 ?>

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

@@ -2629 +2629 @@
     ON u.'.$conf['user_fields']['id'].' = ug.user_id
 WHERE u.'.$conf['user_fields']['id'].' >= 3
+  AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
   AND (TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= "'.$conf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'].'"
   OR TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) < "'.$conf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'].'")
@@ -2704 +2705 @@
     ON u.'.$conf['user_fields']['id'].' = ui.user_id
 WHERE u.'.$conf['user_fields']['id'].' >= 3
+  AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
   AND (TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= "'.$conf_UAM_ConfirmMail['CONFIRMMAIL_DELAY'].'")
 ORDER BY ui.registration_date ASC;';
@@ -2744 +2746 @@
     ON u.'.$conf['user_fields']['id'].' = lv.user_id
 WHERE (TO_DAYS(NOW()) - TO_DAYS(lv.lastvisit) >= "'.$conf_UAM['GHOSTRACKER_DAYLIMIT'].'")
+AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
 ORDER BY lv.lastvisit ASC;';
 
@@ -2791 +2794 @@
     ON u.'.$conf['user_fields']['id'].' = lv.user_id
 WHERE (TO_DAYS(NOW()) - TO_DAYS(lv.lastvisit) >= "'.$conf_UAM['GHOSTRACKER_DAYLIMIT'].'")
+AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
 ORDER BY lv.lastvisit ASC;';
 
@@ -2827 +2831 @@
     ON u.'.$conf['user_fields']['id'].' = ug.user_id
 WHERE u.'.$conf['user_fields']['id'].' >= 3
+  AND u.'.$conf['user_fields']['id'].' <> '.$conf['default_user_id'].'
   AND u.username NOT LIKE "16"
   AND u.username NOT LIKE "18"