X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=4b85d3da37d46554f8ee81278a61b72668b6fde8;hb=e1a62db0c2a7a8b56e066aa3a2a032cfabf08267;hp=c6c61aafd10cacce9df151b4b7f768d17c67ebb2;hpb=5396c39e1c20c8720b474d58a93db948824665be;p=mailer.git
diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index c6c61aafd1..4b85d3da37 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -94,7 +94,7 @@ function outputAdvancedOverview (&$result_main) {
// First check for all account status seperately
//
// Confirmed accounts
- $value = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true);
+ $value = getTotalConfirmedUser();
if ($value > 0) {
$content['confirmed_members'] = '' . $value . '';
@@ -208,13 +208,13 @@ function outputAdvancedOverview (&$result_main) {
$content['purged_bonus_mails'] = '' . $value . '';
} // END - if
} elseif (isExtensionActive('bonus')) {
- $content['purged_bonus_mails'] = getMaskedMessage('ADMIN_EXT_BONUS_OUTDATED', '0.1.8');
+ $content['purged_bonus_mails'] = getMaskedMessage('ADMIN_EXTENSION_BONUS_OUTDATED', '0.1.8');
} else {
- $content['purged_bonus_mails'] = '{--ADMIN_EXT_BONUS_404--}';
+ $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_BONUS_404--}';
}
} else {
- $content['purged_bonus_mails'] = '{--ADMIN_EXT_AUTOPURGE_404--}';
- $content['purged_mails'] = '{--ADMIN_EXT_AUTOPURGE_404--}';
+ $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}';
+ $content['purged_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}';
}
//
@@ -228,9 +228,9 @@ function outputAdvancedOverview (&$result_main) {
$content['send_bonus_mails'] = '' . $value . '';
} // END - if
} elseif (isExtensionActive('bonus')) {
- $content['send_bonus_mails'] = getMaskedMessage('ADMIN_EXT_BONUS_OUTDATED', '0.1.8');
+ $content['send_bonus_mails'] = getMaskedMessage('ADMIN_EXTENSION_BONUS_OUTDATED', '0.1.8');
} else {
- $content['send_bonus_mails'] = getMessage('ADMIN_EXT_BONUS_404');
+ $content['send_bonus_mails'] = getMessage('ADMIN_EXTENSION_BONUS_404');
}
if (isExtensionActive('autopurge')) {
@@ -238,15 +238,15 @@ function outputAdvancedOverview (&$result_main) {
$since = getConfig('ap_inactive_since');
$EXCLUDE_LIST = '';
if (getConfig('def_refid') > 0) {
- $EXCLUDE_LIST = " AND d.userid != ".getConfig('def_refid')."";
+ $EXCLUDE_LIST = ' AND d.userid != {?def_refid?}';
} // END - if
// Check for more extensions
// @TODO These can be rewritten to filter
- if (isExtensionActive('beg')) $EXCLUDE_LIST .= " AND d.userid != ".getConfig('beg_userid')."";
- if (isExtensionActive('bonus')) $EXCLUDE_LIST .= " AND d.userid != ".getConfig('bonus_userid')."";
- if (isExtensionActive('doubler')) $EXCLUDE_LIST .= " AND d.userid != ".getConfig('doubler_userid')."";
- if ((isExtensionActive('holiday')) && (getExtensionVersion('holiday') >= '0.1.3')) {
+ 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')) {
// Recent ext-holiday found
$EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
} // END - if
@@ -323,7 +323,7 @@ ORDER BY
if (isExtensionInstalledAndNewer('bonus', '0.2.3')) {
// Active rallye
- if (getExtensionVersion('bonus') >= '0.6.9') {
+ if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {
// Add more bonus points here
$USE = '(0';
if (getConfig('bonus_click_yn') == 'Y') $USE .= ' + `turbo_bonus`';
@@ -358,7 +358,7 @@ ORDER BY
$TITLEs[] = getMessage('ADMIN_TASK_LIST_BONUS_TITLE');
}
- if ((isExtensionActive('beg')) && (getExtensionVersion('beg') >= '0.1.2')) {
+ if (isExtensionInstalledAndNewer('beg', '0.1.2')) {
// Begging rallye
// Autopurge installed?