Changeset 17974 for extensions/UserAdvManager/trunk/include/functions.inc.php

Timestamp:

Sep 17, 2012, 9:54:26 PM (12 years ago)

Author:

Eric

Message:

Fix bug on manual validation
changelog.txt.php updated for remind

File:

• extensions/UserAdvManager/trunk/include/functions.inc.php (modified) (1 diff)

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

@@ -2378 +2378 @@
 WHERE u.'.$conf['user_fields']['id'].' >= 3
   AND (TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) >= "'.$conf_UAM_ConfirmMail[1].'"
-  OR TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) < "'.$conf_UAM_ConfirmMail[1].'")';
-
-                if ($conf_UAM[2] <> '-1' and $conf_UAM[7] == '-1')
-  {
-    $query.= '
-  AND ug.group_id = '.$conf_UAM[2];
-  }
-  if ($conf_UAM[2] == '-1' and $conf_UAM[7] <> '-1')
-  {
-    $query.= '
-  AND ui.status = \''.$conf_UAM[7]."'";
-  }
-  if ($conf_UAM[2] <> '-1' and $conf_UAM[7] <> '-1')
-  {
-    $query.= '
-  AND ug.group_id = '.$conf_UAM[2];
-  }
-
-  $query.= '
+  OR TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) < "'.$conf_UAM_ConfirmMail[1].'")
+                AND u.UAM_validated = "false"
 ORDER BY ui.registration_date ASC
 ;';