Extension ext-coupon continued, a lot improvements applied:

[mailer.git] / inc / autopurge / purge-unconfirmed.php

diff --git a/inc/autopurge/purge-unconfirmed.php b/inc/autopurge/purge-unconfirmed.php
index 5742c3ed52492611c81418ed9dff6bad7fff8090..c4eed02a77ac7fc0c926ad38d295ff08bde9d71d 100644 (file)
--- a/inc/autopurge/purge-unconfirmed.php
+++ b/inc/autopurge/purge-unconfirmed.php
@@ -14,10 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -42,7 +41,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Abort if autopurge is not active or disabled by admin
-if ((!isExtensionActive('autopurge')) || (getConfig('auto_purge_active') != 'Y')) {
+if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive())) {
        // Abort here
        return false;
 } // END - if
@@ -55,18 +54,22 @@ if (getConfig('autopurge_unconfirmed') == 'Y') {
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       `status`='UNCONFIRMED' AND `joined` < (UNIX_TIMESTAMP() - {?ap_unconfirmed_time?})
+       `status`='UNCONFIRMED' AND
+       (UNIX_TIMESTAMP() - `joined`) >= {?ap_unconfirmed_time?}
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
-       if (SQL_NUMROWS($result_uncon) > 0) {
+       if (!SQL_HASZERONUMS($result_uncon)) {
                // Prepare variable...
-               $UIDs = '';
-               $content['time'] = (getConfig('ap_unconfirmed_time')  / 60 / 60);
+               $userids = '';
+               $content['time'] = (getApUnconfirmedTime()  / 60 / 60);
 
                // Delete inactive accounts
-               while ($content = SQL_FETCHARRAY($result_uncon)) {
+               while ($row = SQL_FETCHARRAY($result_uncon)) {
+                       // Merge both arrays
+                       $content = merge_array($content, $row);
+
                        // Remember userids for the admin
-                       $UIDs .= $content['userid'] . ', ';
+                       $userids .= $content['userid'] . ', ';
 
                        // Get date/time from timestamp
                        $content['joined'] = generateDateTime($content['joined'], 0);
@@ -76,11 +79,11 @@ ORDER BY
                } // END - while
 
                // Remove last comma
-               $UIDs = str_replace(', ', "\n", substr($UIDs, 0, -2));
+               $userids = str_replace(', ', "\n", substr($userids, 0, -2));
 
                // Send mail notification to admin
                if (getConfig('ap_un_notify') == 'Y') {
-                       sendAdminNotification(getMessage('AUTOPURGE_ADMIN_UNCONFIRMED_SUBJECT'), 'admin_autopurge_unconfirmed', $UIDs, '');
+                       sendAdminNotification('{--ADMIN_AUTOPURGE_UNCONFIRMED_SUBJECT--}', 'admin_autopurge_unconfirmed', $userids);
                } // END - if
        } // END - if