Mailer project continued (heavy refactoring):

[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 b6b1952ccb2c488472aa4396debec40e14f7b14c..ed1611572c51a5217c1f22e31c0d195ec3beca44 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 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 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,26 +43,33 @@ 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?}';
-if (isExtensionActive('beg'))                  $EXCLUDE_LIST .= ' AND d.userid != {?beg_userid?}';
-if (isExtensionActive('bonus'))                $EXCLUDE_LIST .= ' AND d.userid != {?bonus_userid?}';
-if (isExtensionActive('doubler'))              $EXCLUDE_LIST .= ' AND d.userid != {?doubler_userid?}';
-if (isExtensionInstalledAndNewer('holiday', '0.1.3')) $EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
+$userExclusionSql = runFilterChain('user_exclusion_sql', ' ');
+if (isValidUserId(getDefRefid()))              $userExclusionSql .= ' AND d.userid != {?def_refid?}';
+if (isExtensionActive('beg'))                  $userExclusionSql .= ' AND d.userid != {?beg_userid?}';
+if (isExtensionActive('bonus'))                $userExclusionSql .= ' AND d.userid != {?bonus_userid?}';
+if (isExtensionActive('doubler'))              $userExclusionSql .= ' AND d.userid != {?doubler_userid?}';
+if (isExtensionInstalledAndNewer('holiday', '0.1.3')) $userExclusionSql .= " AND d.`holiday_active`='N'";
 
 // Check for all accounts
 $result = SQL_QUERY("SELECT
-       d.`userid`, d.`gender`, d.`surname`, d.`family`, d.`email`, d.`joined`, d.`last_online`, d.`ap_notified`
+       d.`userid`,
+       d.`gender`,
+       d.`surname`,
+       d.`family`,
+       d.`email`,
+       d.`joined`,
+       d.`last_online`,
+       d.`ap_notified`
 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?})
-       ".$EXCLUDE_LIST."
+       (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?}
+       " . $userExclusionSql . "
 ORDER BY
        d.`userid` ASC", __FILE__, __LINE__);
 
@@ -83,7 +90,7 @@ if (!SQL_HASZERONUMS($result)) {
                );
 
                // Load row template
-               $OUT .= loadTemplate('admin_list_autopurge_row', true, $content);
+               $OUT .= loadTemplate('admin_list_autopurge_row', TRUE, $content);
        } // END - while
 
        // Free memory
@@ -91,10 +98,10 @@ if (!SQL_HASZERONUMS($result)) {
        $content['rows'] = $OUT;
 
        // Load main template
-       loadTemplate('admin_list_autopurge', false, $content);
+       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]