X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=4b85d3da37d46554f8ee81278a61b72668b6fde8;hb=e1a62db0c2a7a8b56e066aa3a2a032cfabf08267;hp=5656d7523cd110ff1d7de3dd224c23667d1ab30c;hpb=1ebf518b9552f71ee95de6f4b80e6de3a27716d1;p=mailer.git
diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 5656d7523c..4b85d3da37 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -1,7 +1,7 @@
0) {
- $content['update_tasks'] = "".$value."";
+ $content['update_tasks'] = '' . $value . '';
} // END - if
//
// 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."";
+ $content['confirmed_members'] = '' . $value . '';
} // END - if
// Unconfirmed accounts
$value = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true);
if ($value > 0) {
- $content['unconfirmed_members'] = "".$value."";
+ $content['unconfirmed_members'] = '' . $value . '';
} // END - if
// And locked accounts
$value = countSumTotalData('LOCKED', 'user_data', 'userid', 'status', true);
if ($value > 0) {
- $content['locked_members'] = "".$value."";
+ $content['locked_members'] = '' . $value . '';
} // END - if
//
// Unassigned tasks
//
- $value = countSumTotalData('0', 'task_system', 'id', 'assigned_admin', true, " AND `status` != 'DELETED'");
+ $value = countSumTotalData(0, 'task_system', 'id', 'assigned_admin', true, " AND `status` != 'DELETED'");
if ($value > 0) {
- $content['new_tasks'] = "".$value."";
+ $content['new_tasks'] = '' . $value . '';
} // END - if
//
@@ -128,7 +129,7 @@ function outputAdvancedOverview (&$result_main) {
$value = countSumTotalData('CLOSED', 'task_system', 'id', 'status', true);
if ($value > 0) {
- $content['closed_tasks'] = "".$value."";
+ $content['closed_tasks'] = '' . $value . '';
} // END - if
//
@@ -137,7 +138,7 @@ function outputAdvancedOverview (&$result_main) {
$value = countSumTotalData('DELETED', 'task_system', 'id', 'status', true);
if ($value > 0) {
- $content['deleted_tasks'] = "".$value."";
+ $content['deleted_tasks'] = '' . $value . '';
} // END - if
//
@@ -146,7 +147,7 @@ function outputAdvancedOverview (&$result_main) {
$value = countSumTotalData('SOLVED', 'task_system', 'id', 'status', true, sprintf(" AND `assigned_admin`=%s", getCurrentAdminId()));
if ($value > 0) {
- $content['solved_tasks'] = "".$value."";
+ $content['solved_tasks'] = '' . $value . '';
} // END - if
//
@@ -155,7 +156,7 @@ function outputAdvancedOverview (&$result_main) {
$value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, " AND `status`='NEW' AND task_type != 'EXTENSION_UPDATE'");
if ($value > 0) {
- $content['your_tasks'] = "".$value."";
+ $content['your_tasks'] = '' . $value . '';
} // END - if
//
@@ -164,7 +165,7 @@ function outputAdvancedOverview (&$result_main) {
$value = countSumTotalData('ADMIN', 'pool', 'id', 'data_type', true);
if ($value > 0) {
- $content['pending_mails'] = "".$value."";
+ $content['pending_mails'] = '' . $value . '';
} // END - if
//
@@ -173,7 +174,7 @@ function outputAdvancedOverview (&$result_main) {
$value = countSumTotalData('TEMP', 'pool', 'id', 'data_type', true);
if ($value > 0) {
- $content['canceled_mails'] = "".$value."";
+ $content['canceled_mails'] = '' . $value . '';
} // END - if
//
@@ -182,7 +183,7 @@ function outputAdvancedOverview (&$result_main) {
$value = countSumTotalData('SEND', 'pool', 'id', 'data_type', true);
if ($value > 0) {
- $content['send_emails'] = "".$value."";
+ $content['send_emails'] = '' . $value . '';
} // END - if
//
@@ -193,7 +194,7 @@ function outputAdvancedOverview (&$result_main) {
$value = countSumTotalData('DELETED', 'pool', 'id', 'data_type', true);
if ($value > 0) {
- $content['purged_mails'] = "".$value."";
+ $content['purged_mails'] = '' . $value . '';
} // END - if
//
@@ -204,16 +205,16 @@ function outputAdvancedOverview (&$result_main) {
$value = countSumTotalData('DELETED', 'bonus', 'id', 'data_type', true);
if ($value > 0) {
- $content['purged_bonus_mails'] = "".$value."";
+ $content['purged_bonus_mails'] = '' . $value . '';
} // END - if
} elseif (isExtensionActive('bonus')) {
- $content['purged_bonus_mails'] = sprintf(getMessage('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--}';
}
//
@@ -224,12 +225,12 @@ function outputAdvancedOverview (&$result_main) {
$value = countSumTotalData('SEND', 'bonus', 'id', 'data_type', true, " AND `is_notify`='N'");
if ($value > 0) {
- $content['send_bonus_mails'] = "".$value."";
+ $content['send_bonus_mails'] = '' . $value . '';
} // END - if
} elseif (isExtensionActive('bonus')) {
- $content['send_bonus_mails'] = sprintf(getMessage('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')) {
@@ -237,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
@@ -268,7 +269,7 @@ ORDER BY
$TITLEs[] = getMessage('ADMIN_TASK_INACTIVE_AUTOPURGE_TITLE');
}
- if (getExtensionVersion('sql_patches') >= '0.3.4') {
+ if (isExtensionInstalledAndNewer('sql_patches', '0.3.4')) {
// Check for accounts without referal
addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `refid`=0 ORDER BY `userid` ASC");
$DESCRs[] = getMessage('ADMIN_TASK_LIST_ACCOUNT_NOREF');
@@ -322,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`';
@@ -357,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?
@@ -523,13 +524,13 @@ ORDER BY
if (isExtensionActive('surfbar')) {
// List all URLs in surfbar
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_surfbar_urls` ORDER BY `id` ASC");
+ addSql("SELECT `url_id` FROM `{?_MYSQL_PREFIX?}_surfbar_urls` ORDER BY `url_id` ASC");
$WHATs[] = 'list_surfbar_urls';
$DESCRs[] = getMessage('ADMIN_TASK_LIST_SURFBAR_URLS_ALL');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_SURFBAR_URLS_ALL_TITLE');
// List all pending URLs in surfbar
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_surfbar_urls` WHERE `status`='PENDING' ORDER BY `id` ASC");
+ addSql("SELECT `url_id` FROM `{?_MYSQL_PREFIX?}_surfbar_urls` WHERE `url_status`='PENDING' ORDER BY `url_id` ASC");
$WHATs[] = 'unlock_surfbar_urls';
$DESCRs[] = getMessage('ADMIN_TASK_LIST_SURFBAR_URLS_PENDING');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_SURFBAR_URLS_PENDING_TITLE');
@@ -574,13 +575,13 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
);
// Rewrite CSS class if not last entry is reached
- if ($key < (count($sqls) - 1)) $content['bottom'] = 'bottom2';
+ if ($key < (count($sqls) - 1)) $content['bottom'] = 'bottom';
if (($value > 0) && (!empty($WHATs[$key]))) {
if (empty($TITLEs[$key])) $TITLEs[$key] = getMessage('ADMIN_TASK_UNKNOWN_LIST_TITLE');
- $content['row_link'] = "".$value."";
+ $content['row_link'] = '' . $value . '';
} else {
- $content['row_link'] = 0;
+ $content['row_link'] = '0';
}
// And insert the final string into extras template