X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=4b85d3da37d46554f8ee81278a61b72668b6fde8;hb=e1a62db0c2a7a8b56e066aa3a2a032cfabf08267;hp=ed919e1267f09e60d2dc90baa317955e97baf1cb;hpb=0f0e365a0e710b750d74ef8587dde8b37881dbeb;p=mailer.git

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index ed919e1267..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'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;status=confirmed%}">' . $value . '</a>';
@@ -208,13 +208,13 @@ function outputAdvancedOverview (&$result_main) {
 				$content['purged_bonus_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
 			} // 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'] = '<span class="admin_note">{--ADMIN_EXT_BONUS_404--}</span>';
+			$content['purged_bonus_mails'] = '<span class="admin_note">{--ADMIN_EXTENSION_BONUS_404--}</span>';
 		}
 	} else {
-		$content['purged_bonus_mails'] = '<span class="admin_note">{--ADMIN_EXT_AUTOPURGE_404--}</span>';
-		$content['purged_mails'] = '<span class="admin_note">{--ADMIN_EXT_AUTOPURGE_404--}</span>';
+		$content['purged_bonus_mails'] = '<span class="admin_note">{--ADMIN_EXTENSION_AUTOPURGE_404--}</span>';
+		$content['purged_mails'] = '<span class="admin_note">{--ADMIN_EXTENSION_AUTOPURGE_404--}</span>';
 	}
 
 	//
@@ -228,9 +228,9 @@ function outputAdvancedOverview (&$result_main) {
 			$content['send_bonus_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
 		} // 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,14 +238,14 @@ 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('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'";