X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=46dd7e1dd4406f5bd27a1c961f813f26fc739d43;hp=1ac3596bd77dc5a92b2c03d82cc3c802e50ba6c5;hb=391c98ab7233ff3e640d8b9fad8df92ce45e9b31;hpb=15d03825972c38fbd95abad41f304c7494c5a70e
diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 1ac3596bd7..46dd7e1dd4 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -14,11 +14,9 @@
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -65,7 +63,7 @@ function outputAdvancedOverview (&$result_main) {
// Init SQLs
initSqls();
- // Init contentn
+ // Init content
foreach (
array(
// Member accounts
@@ -210,11 +208,11 @@ function outputAdvancedOverview (&$result_main) {
} elseif (isExtensionActive('bonus')) {
$content['purged_bonus_mails'] = getMaskedMessage('ADMIN_EXTENSION_BONUS_OUTDATED', '0.1.8');
} else {
- $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_BONUS_404--}';
+ $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_BONUS_404--}';
}
} else {
- $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}';
- $content['purged_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}';
+ $content['purged_bonus_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}';
+ $content['purged_mails'] = '{--ADMIN_EXTENSION_AUTOPURGE_404--}';
}
//
@@ -239,10 +237,10 @@ function outputAdvancedOverview (&$result_main) {
// Check for more extensions
// @TODO These can be rewritten to filter
- if (getConfig('def_refid') > 0) $EXCLUDE_LIST .= ' AND d.userid != {?def_refid?}';
- 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 (isValidUserId(getDefRefid())) $EXCLUDE_LIST .= ' AND d.`userid` != {?def_refid?}';
+ 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'";
@@ -270,7 +268,7 @@ ORDER BY
// Check for accounts without referal
addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `refid`=0 ORDER BY `userid` ASC");
$DESCRs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREF--}';
- $TITLEs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREF_TITLE--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREFERAL_TITLE--}';
$WHATs[] = 'list_user&mode=norefs';
}
@@ -280,7 +278,7 @@ ORDER BY
$WHATs[] = 'list_payouts';
$DESCRs[] = '{--ADMIN_TASK_LIST_PAYOUTS_WAITING--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_PAYOUTS_WAITING_TITLE--}';
- addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_payouts` ORDER BY `userid` ASC");
+ addSql('SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_payouts` ORDER BY `userid` ASC');
$WHATs[] = 'list_payouts';
$DESCRs[] = '{--ADMIN_TASK_LIST_PAYOUTS_ALL--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_PAYOUTS_ALL_TITLE--}';
@@ -288,7 +286,7 @@ ORDER BY
if (isExtensionActive('wernis')) {
// List new wernis requests
- addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_wernis` ORDER BY `userid` ASC");
+ addSql('SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_wernis` ORDER BY `userid` ASC');
$WHATs[] = 'list_wernis';
$DESCRs[] = '{--ADMIN_TASK_LIST_WERNIS_ALL--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_WERNIS_ALL_TITLE--}';
@@ -296,7 +294,7 @@ ORDER BY
if (isExtensionActive('primera')) {
// List new primera requests
- addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_primera` ORDER BY `userid` ASC");
+ addSql('SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_primera` ORDER BY `userid` ASC');
$WHATs[] = 'list_primera';
$DESCRs[] = '{--ADMIN_TASK_LIST_PRIMERA_ALL--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_PRIMERA_ALL_TITLE--}';
@@ -304,7 +302,7 @@ ORDER BY
if (isExtensionActive('holiday')) {
// List holiday requests
- addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_holidays` ORDER BY `userid` ASC");
+ addSql('SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_holidays` ORDER BY `userid` ASC');
$WHATs[] = 'list_holiday';
$DESCRs[] = '{--ADMIN_TASK_LIST_HOLIDAYS--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_HOLIDAYS_TITLE--}';
@@ -342,11 +340,13 @@ ORDER BY
} // END - if
addSql("SELECT
- ".$USE." AS points
+ " . $USE . " AS `points`
FROM
`{?_MYSQL_PREFIX?}_user_data`
WHERE
- `status`='CONFIRMED' AND ".$USE." > 0".$lastOnline."
+ `status`='CONFIRMED' AND
+ " . $USE . " > 0
+ " . $lastOnline . "
ORDER BY
`points` DESC,
`userid` ASC");
@@ -379,7 +379,7 @@ ORDER BY
$WHATs[] = 'list_beg';
$DESCRs[] = '{--ADMIN_TASK_LIST_BEG--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_BEG_TITLE--}';
- }
+ } // END - if
if (isExtensionActive('doubler')) {
// List waiting payouts
@@ -387,16 +387,16 @@ ORDER BY
$WHATs[] = 'list_doubler&mode=waiting&select=all';
$DESCRs[] = '{--ADMIN_TASK_LIST_DOUBLER_WAITING--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_DOUBLER_WAITING_TITLE--}';
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_doubler` ORDER BY `id` ASC");
+ addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_doubler` ORDER BY `id` ASC');
$WHATs[] = 'list_doubler';
$DESCRs[] = '{--ADMIN_TASK_LIST_DOUBLER_ALL--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_DOUBLER_ALL_TITLE--}';
- }
+ } // END - if
//
// All referal banner
//
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` ORDER BY `id` ASC");
+ addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` ORDER BY `id` ASC');
$WHATs[] = 'refbanner';
$DESCRs[] = '{--ADMIN_TASK_LIST_REFBANNER_ALL--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_REFBANNER_ALL_TITLE--}';
@@ -412,7 +412,7 @@ ORDER BY
//
// All extensions
//
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_extensions` ORDER BY `id` ASC");
+ addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_extensions` ORDER BY `id` ASC');
$WHATs[] = 'extensions';
$DESCRs[] = '{--ADMIN_TASK_LIST_EXTENSIONS_ALL--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_EXTENSIONS_ALL_TITLE--}';
@@ -427,7 +427,7 @@ ORDER BY
if (isExtensionActive('engine')) {
// List all export accounts
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_engine_accounts` ORDER BY `id` ASC");
+ addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_engine_accounts` ORDER BY `id` ASC');
$WHATs[] = 'list_engine';
$DESCRs[] = '{--ADMIN_TASK_LIST_ENGINE--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_ENGINE_TITLE--}';
@@ -439,13 +439,13 @@ ORDER BY
$TITLEs[] = '{--ADMIN_TASK_UNLOCK_ENGINE_TITLE--}';
// List all safes
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_engine_safe` ORDER BY `id` ASC");
+ addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_engine_safe` ORDER BY `id` ASC');
$WHATs[] = 'list_engine&mode=safe';
$DESCRs[] = '{--ADMIN_TASK_LIST_ENGINE_SAFES--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_ENGINE_SAFES_TITLE--}';
// List all export URLs
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_engine_urls` ORDER BY `id` ASC");
+ addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_engine_urls` ORDER BY `id` ASC');
$WHATs[] = 'engine_urls';
$DESCRs[] = '{--ADMIN_TASK_LIST_ENGINE_URLS--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_ENGINE_URLS_TITLE--}';
@@ -453,7 +453,7 @@ ORDER BY
if (isExtensionActive('sponsor')) {
// List all sponsors
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` ORDER BY `id` ASC");
+ addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` ORDER BY `id` ASC');
$WHATs[] = 'list_sponsor';
$DESCRs[] = '{--ADMIN_TASK_LIST_SPONSOR--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_SPONSOR_TITLE--}';
@@ -491,7 +491,7 @@ ORDER BY
if (isExtensionActive('country')) {
// List country codes
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_countries` ORDER BY `id` ASC");
+ addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_countries` ORDER BY `id` ASC');
$WHATs[] = 'list_country';
$DESCRs[] = '{--ADMIN_TASK_LIST_COUNTRY--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_COUNTRY_TITLE--}';
@@ -499,7 +499,7 @@ ORDER BY
if (isExtensionActive('theme')) {
// List all themes
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id` ASC");
+ addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id` ASC');
$WHATs[] = 'theme_edit';
$DESCRs[] = '{--ADMIN_TASK_LIST_THEME_ALL--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_THEME_ALL_TITLE--}';
@@ -513,7 +513,7 @@ ORDER BY
if (isExtensionActive('admins')) {
// List all administrator logins
- addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC");
+ addSql('SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC');
$WHATs[] = 'admins_edit';
$DESCRs[] = '{--ADMIN_TASK_LIST_ADMINS_ALL--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_ADMINS_ALL_TITLE--}';
@@ -521,7 +521,7 @@ ORDER BY
if (isExtensionActive('surfbar')) {
// List all URLs in surfbar
- addSql("SELECT `url_id` FROM `{?_MYSQL_PREFIX?}_surfbar_urls` ORDER BY `url_id` ASC");
+ addSql('SELECT `url_id` FROM `{?_MYSQL_PREFIX?}_surfbar_urls` ORDER BY `url_id` ASC');
$WHATs[] = 'list_surfbar_urls';
$DESCRs[] = '{--ADMIN_TASK_LIST_SURFBAR_URLS_ALL--}';
$TITLEs[] = '{--ADMIN_TASK_LIST_SURFBAR_URLS_ALL_TITLE--}';
@@ -537,7 +537,9 @@ ORDER BY
$EXTRAS .= createExtraTaskRows($WHATs, $DESCRs, $TITLEs);
// If empty just keep a forced-space left for CSS issues
- if (empty($EXTRAS)) $EXTRAS = ' ';
+ if (empty($EXTRAS)) {
+ $EXTRAS = ' ';
+ } // END - if
// Add compiled string to constant for final template
$content['extra_table'] = $EXTRAS;
@@ -558,12 +560,6 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
// Run SQL command, get line numbers and free memory
$result = SQL_QUERY($sql, __FUNCTION__, __LINE__);
- // Get rows
- $value = SQL_NUMROWS($result);
-
- // Free result
- SQL_FREERESULT($result);
-
// Prepare array for output
$content = array(
'row_descr' => $DESCRs[$key],
@@ -571,15 +567,22 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
);
// Rewrite CSS class if not last entry is reached
- if ($key < (count($sqls) - 1)) $content['bottom'] = 'bottom';
+ if ($key < (count($sqls) - 1)) {
+ $content['bottom'] = 'bottom';
+ } // END - if
- if (($value > 0) && (!empty($WHATs[$key]))) {
- if (empty($TITLEs[$key])) $TITLEs[$key] = '{--ADMIN_TASK_UNKNOWN_LIST_TITLE--}';
- $content['row_link'] = '' . $value . '';
+ if ((!SQL_HASZERONUMS($result)) && (!empty($WHATs[$key]))) {
+ if (empty($TITLEs[$key])) {
+ $TITLEs[$key] = '{--ADMIN_TASK_UNKNOWN_LIST_TITLE--}';
+ } // END - if
+ $content['row_link'] = '' . SQL_NUMROWS($result) . '';
} else {
$content['row_link'] = '0';
}
+ // Free result
+ SQL_FREERESULT($result);
+
// And insert the final string into extras template
$OUT .= loadTemplate('admin_overview_task_rows', true, $content);
} // END- foreach
@@ -589,5 +592,5 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
return loadTemplate('admin_overview_task_extras', true, $OUT);
}
-//
+// [EOF]
?>