Large code cleanups:

[mailer.git] / inc / modules / admin / what-list_autopurge.php

diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php
index dc5666f265b6a1e1c8410044a6920dc4944566a0..a3126637473e7780cc0e2e0e669c611d9b61c617 100644 (file)
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-// Exclude default referal id if set
+// Exclude default referral id if set
 // @TODO Rewrite those lines to filter
 $EXCLUDE_LIST = '';
 if (isValidUserId(getDefRefid()))              $EXCLUDE_LIST .= ' AND d.userid != {?def_refid?}';
@@ -59,9 +59,9 @@ FROM
        `{?_MYSQL_PREFIX?}_user_data` AS d
 WHERE
        d.`status`='CONFIRMED' AND
-       d.`joined` < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
-       d.`last_online` < (UNIX_TIMESTAMP() - {?ap_inactive_since?}) AND
-       d.`ap_notified` < (UNIX_TIMESTAMP() - {?ap_inactive_since?})
+       (UNIX_TIMESTAMP() - d.`joined`) >= {?ap_inactive_since?} AND
+       (UNIX_TIMESTAMP() - d.`last_online`) >= {?ap_inactive_since?} AND
+       (UNIX_TIMESTAMP() - d.`ap_notified`) >= {?ap_inactive_since?}
        ".$EXCLUDE_LIST."
 ORDER BY
        d.`userid` ASC", __FILE__, __LINE__);
@@ -94,7 +94,7 @@ if (!SQL_HASZERONUMS($result)) {
        loadTemplate('admin_list_autopurge', false, $content);
 } else {
        // All members are active or you don't have any registered
-       loadTemplate('admin_settings_saved', false, '{--ADMIN_AUTOPURGE_ALL_ACTIVE--}');
+       displayMessage('{--ADMIN_AUTOPURGE_ALL_ACTIVE--}');
 }
 
 // [EOF]