Extension ext-network cleaned up

[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 a3126637473e7780cc0e2e0e669c611d9b61c617..eb76f798e2012836c340c4b0c33ffe878ab02346 100644 (file)
--- a/inc/modules/admin/what-list_autopurge.php
+++ b/inc/modules/admin/what-list_autopurge.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -45,26 +45,33 @@ addYouAreHereLink('admin', __FILE__);
 
 // 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 (isValidId(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
+       `{?_MYSQL_PREFIX?}_user_data` AS `d`
 WHERE
-       d.`status`='CONFIRMED' AND
-       (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."
+       `d`.`status`='CONFIRMED' AND
+       (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__);
+       `d`.`userid` ASC", __FILE__, __LINE__);
 
 if (!SQL_HASZERONUMS($result)) {
        // Ok, we have found some inactive accounts
@@ -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,7 +98,7 @@ 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
        displayMessage('{--ADMIN_AUTOPURGE_ALL_ACTIVE--}');