projects
/
mailer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed ifSqlHasZeroNums() to ifSqlHasZeroNumRows() and improved some queries.
[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 defadc828e8436c14709bb26a8a9e8e8c4563079..0ff99f1899b2d754dd59b26ce6650c51a1645a27 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 *
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 201
3
by Mailer Developer Team *
+ * Copyright (c) 2009 - 201
5
by Mailer Developer Team *
* For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-44,18
+44,13
@@
if ((!defined('__SECURITY')) || (!isAdmin())) {
addYouAreHereLink('admin', __FILE__);
// Exclude default referral id if set
addYouAreHereLink('admin', __FILE__);
// Exclude default referral id if set
-$userExclu
sion
Sql = ' ';
+$userExclu
de
Sql = ' ';
$excludedUserids = runFilterChain('config_userid_exclusion_sql', array());
$excludedUserids = runFilterChain('config_userid_exclusion_sql', array());
-if (
count($excludedUserids) > 0
) {
+if (
isFilledArray($excludedUserids)
) {
// Exclude all
$userExcludeSql = ' AND `d`.`userid` NOT IN (' . implode(', ', $excludedUserids) . ')';
} // END - if
// Exclude all
$userExcludeSql = ' AND `d`.`userid` NOT IN (' . implode(', ', $excludedUserids) . ')';
} // END - if
-// @TODO Rewrite this as a filter
-if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
- $userExclusionSql .= " AND `d`.`holiday_active`='N'";
-} // END - if
-
// Check for all accounts
$result = sqlQuery("SELECT
`d`.`userid`,
// Check for all accounts
$result = sqlQuery("SELECT
`d`.`userid`,
@@
-73,11
+68,11
@@
WHERE
(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?}
(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?}
- " . runFilterChain('user_exclusion_sql', $userExcludeSql) . "
+ " . runFilterChain('user_exclusion_sql',
' ' .
$userExcludeSql) . "
ORDER BY
`d`.`userid` ASC", __FILE__, __LINE__);
ORDER BY
`d`.`userid` ASC", __FILE__, __LINE__);
-if (!ifSqlHasZeroNums($result)) {
+if (!ifSqlHasZeroNum
Row
s($result)) {
// Ok, we have found some inactive accounts
$OUT = '';
while ($content = sqlFetchArray($result)) {
// Ok, we have found some inactive accounts
$OUT = '';
while ($content = sqlFetchArray($result)) {