X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=426309f2218c912cc890be037842be19cae3dac8;hb=dbeb4ef1dc2e59d0c6bfab9d9666cdfa515f58e7;hp=20e653b4bd823b4d8d3907b80ce783afdeed0433;hpb=4240b5d40ef77c13d4e76dc75da545114f69f08f;p=mailer.git diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php index 20e653b4bd..426309f221 100644 --- a/inc/libs/task_functions.php +++ b/inc/libs/task_functions.php @@ -276,10 +276,10 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) $EXCLUDE_LIST = " AND d.userid != ".$_CONFIG['def_refid'].""; // Check for more extensions - if (EXT_IS_ACTIVE("beg")) $EXCLUDE_LIST .= " AND d.userid != c.beg_uid"; - if (EXT_IS_ACTIVE("bonus")) $EXCLUDE_LIST .= " AND d.userid != c.bonus_uid"; - if (EXT_IS_ACTIVE("doubler")) $EXCLUDE_LIST .= " AND d.userid != c.doubler_uid"; - if (GET_EXT_VERSION("holiday") >= "0.1.3") $EXCLUDE_LIST .= " AND d.holiday_active = 'N'"; + if (EXT_IS_ACTIVE("beg")) $EXCLUDE_LIST .= " AND d.userid != ".$_CONFIG['beg_uid'].""; + if (EXT_IS_ACTIVE("bonus")) $EXCLUDE_LIST .= " AND d.userid != ".$_CONFIG['bonus_uid'].""; + if (EXT_IS_ACTIVE("doubler")) $EXCLUDE_LIST .= " AND d.userid != ".$_CONFIG['doubler_uid'].""; + if (GET_EXT_VERSION("holiday") >= "0.1.3") $EXCLUDE_LIST .= " AND d.holiday_active='N'"; // Check for all accounts $SQLs[] = "SELECT DISTINCT d.userid, d.email, d.last_online @@ -354,7 +354,7 @@ ORDER BY d.userid"; // Autopurge installed? $LAST = ""; - if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) { + if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['autopurge_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) { // Use last online timestamp to keep inactive members away from here $LAST = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']); } @@ -372,7 +372,7 @@ ORDER BY active_bonus DESC, userid"; // Autopurge installed? $LAST = ""; - if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['ap_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) { + if ((EXT_IS_ACTIVE("autopurge")) && ($_CONFIG['autopurge_inactive'] == "Y") && ($_CONFIG['ap_inactive_since'] > 0)) { // Use last online timestamp to keep inactive members away from here $LAST = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", $_CONFIG['ap_inactive_since']); }