X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Ftask_functions.php;h=f33501540b4f66e4d0d5aeef0ce3c2b833f2212a;hp=4f79540237bd5b964571092111ebaea516f3a14b;hb=f3e4c2c048761589836fdbe6bd2e46599a1833a7;hpb=5416425ec8fa510a5addb246bdf7a6cd316a911f
diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 4f79540237..f33501540b 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Spezielle task-Funktionen *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: 856 $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009) $ *
+ * $Tag:: 0.2.1-FINAL $ *
+ * $Author:: stelzi $ *
+ * Needs to be in all Files and every File needs "svn propset *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
@@ -47,12 +52,9 @@ if (!defined('__SECURITY')) {
//
// @TODO Move all extension-dependent queries into filters
function OUTPUT_ADVANCED_OVERVIEW (&$result_main) {
- global $_CONFIG;
-
// Init variables/arrays
$EXTRAS = "";
$OUT = "";
- $SQLs = array();
$WHATs = array();
$DESCRs = array();
$TITLEs = array();
@@ -60,6 +62,9 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) {
// Chheck for new extensions and updates
$JOBS_DONE = OUTPUT_STANDARD_OVERVIEW($result_main);
+ // Init SQLs
+ INIT_SQLS();
+
if (!$JOBS_DONE) {
// New extensions or updates found
$value = GET_TOTAL_DATA(GET_CURRENT_ADMIN_ID(), "task_system", "id", "assigned_admin", true, " AND `status`='NEW' AND task_type='EXTENSION_UPDATE'");
@@ -217,13 +222,13 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) {
define('__MAIL_BONUS_AP_VALUE', "0");
}
} elseif (EXT_IS_ACTIVE("bonus")) {
- define('__MAIL_BONUS_AP_VALUE', ADMIN_EXT_BONUS_OUTDATED_1."0.1.8".ADMIN_EXT_BONUS_OUTDATED_2);
+ define('__MAIL_BONUS_AP_VALUE', sprintf(getMessage('ADMIN_EXT_BONUS_OUTDATED', "0.1.8")));
} else {
- define('__MAIL_BONUS_AP_VALUE', "{--ADMIN_EXT_BONUS_404--}
");
+ define('__MAIL_BONUS_AP_VALUE', "{--ADMIN_EXT_BONUS_404--}");
}
} else {
- define('__MAIL_BONUS_AP_VALUE', "{--ADMIN_EXT_AUTOPURGE_404--}
");
- define('__MAIL_DELETED_VALUE', "{--ADMIN_EXT_AUTOPURGE_404--}
");
+ define('__MAIL_BONUS_AP_VALUE', "{--ADMIN_EXT_AUTOPURGE_404--}");
+ define('__MAIL_DELETED_VALUE', "{--ADMIN_EXT_AUTOPURGE_404--}");
}
//
@@ -239,7 +244,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) {
define('__MAIL_BONUS_SEND_VALUE', "0");
}
} elseif (EXT_IS_ACTIVE("bonus")) {
- define('__MAIL_BONUS_SEND_VALUE', ADMIN_EXT_BONUS_OUTDATED_1."0.1.8".ADMIN_EXT_BONUS_OUTDATED_2);
+ define('__MAIL_BONUS_SEND_VALUE', sprintf(getMessage('ADMIN_EXT_BONUS_OUTDATED', "0.1.8")));
} else {
define('__MAIL_BONUS_SEND_VALUE', getMessage('ADMIN_EXT_BONUS_404'));
}
@@ -253,17 +258,18 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main) {
} // END - if
// Check for more extensions
+ // @TODO These can be rewritten to filter
if (EXT_IS_ACTIVE("beg")) $EXCLUDE_LIST .= " AND d.userid != ".getConfig('beg_uid')."";
if (EXT_IS_ACTIVE("bonus")) $EXCLUDE_LIST .= " AND d.userid != ".getConfig('bonus_uid')."";
if (EXT_IS_ACTIVE("doubler")) $EXCLUDE_LIST .= " AND d.userid != ".getConfig('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
+ ADD_SQL("SELECT DISTINCT d.userid, d.email, d.last_online
FROM `{!_MYSQL_PREFIX!}_user_data` AS d
WHERE d.`status`='CONFIRMED' AND d.joined < (UNIX_TIMESTAMP() - ".$since.") AND d.last_online < (UNIX_TIMESTAMP() - ".$since.") AND d.ap_notified < (UNIX_TIMESTAMP() - ".$since.")
".$EXCLUDE_LIST."
-ORDER BY d.userid";
+ORDER BY d.userid");
$WHATs[] = "list_autopurge";
$DESCRs[] = getMessage('ADMIN_TASK_INACTIVE_AUTOPURGE');
$TITLEs[] = getMessage('ADMIN_TASK_INACTIVE_AUTOPURGE_TITLE');
@@ -271,7 +277,7 @@ ORDER BY d.userid";
if (GET_EXT_VERSION("sql_patches") >= "0.3.4") {
// Check for accounts without referal
- $SQLs[] = "SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE refid='0' ORDER BY userid";
+ ADD_SQL("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE refid='0' ORDER BY userid");
$DESCRs[] = getMessage('ADMIN_TASK_LIST_ACCOUNT_NOREF');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_ACCOUNT_NOREF_TITLE');
$WHATs[] = "list_user&mode=norefs";
@@ -279,11 +285,11 @@ ORDER BY d.userid";
if (EXT_IS_ACTIVE("payout")) {
// List new payout requests
- $SQLs[] = "SELECT userid FROM `{!_MYSQL_PREFIX!}_user_payouts` WHERE `status`='NEW' ORDER BY userid";
+ ADD_SQL("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_payouts` WHERE `status`='NEW' ORDER BY userid");
$WHATs[] = "list_payouts";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_PAYOUTS_WAITING');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_PAYOUTS_WAITING_TITLE');
- $SQLs[] = "SELECT userid FROM `{!_MYSQL_PREFIX!}_user_payouts` ORDER BY userid";
+ ADD_SQL("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_payouts` ORDER BY userid");
$WHATs[] = "list_payouts";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_PAYOUTS_ALL');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_PAYOUTS_ALL_TITLE');
@@ -291,7 +297,7 @@ ORDER BY d.userid";
if (EXT_IS_ACTIVE("wernis")) {
// List new wernis requests
- $SQLs[] = "SELECT userid FROM `{!_MYSQL_PREFIX!}_user_wernis` ORDER BY userid";
+ ADD_SQL("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_wernis` ORDER BY userid");
$WHATs[] = "list_wernis";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_WERNIS_ALL');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_WERNIS_ALL_TITLE');
@@ -299,7 +305,7 @@ ORDER BY d.userid";
if (EXT_IS_ACTIVE("primera")) {
// List new primera requests
- $SQLs[] = "SELECT userid FROM `{!_MYSQL_PREFIX!}_user_primera` ORDER BY userid";
+ ADD_SQL("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_primera` ORDER BY userid");
$WHATs[] = "list_primera";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_PRIMERA_ALL');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_PRIMERA_ALL_TITLE');
@@ -307,7 +313,7 @@ ORDER BY d.userid";
if (EXT_IS_ACTIVE("holiday")) {
// List holiday requests
- $SQLs[] = "SELECT userid FROM `{!_MYSQL_PREFIX!}_user_holidays` ORDER BY userid";
+ ADD_SQL("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_holidays` ORDER BY userid");
$WHATs[] = "list_holiday";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_HOLIDAYS');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_HOLIDAYS_TITLE');
@@ -315,7 +321,7 @@ ORDER BY d.userid";
if (GET_EXT_VERSION("bonus") >= "0.8.7") {
// List all notifications
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_bonus` WHERE is_notify='Y' ORDER BY timestamp DESC";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_bonus` WHERE is_notify='Y' ORDER BY timestamp DESC");
$WHATs[] = "list_notifications";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_NOTIFICATIONS');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_NOTIFICATIONS_TITLE');
@@ -338,16 +344,16 @@ ORDER BY d.userid";
}
// Autopurge installed?
- $LAST = "";
+ $lastOnline = "";
if ((EXT_IS_ACTIVE("autopurge")) && (getConfig('autopurge_inactive') == "Y") && (getConfig('ap_inactive_since') > 0)) {
// Use last online timestamp to keep inactive members away from here
- $LAST = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", getConfig('ap_inactive_since'));
+ $lastOnline = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", getConfig('ap_inactive_since'));
}
- $SQLs[] = "SELECT ".$USE." AS points
+ ADD_SQL("SELECT ".$USE." AS points
FROM `{!_MYSQL_PREFIX!}_user_data`
-WHERE `status`='CONFIRMED' AND ".$USE.">0".$LAST."
-ORDER BY points DESC, userid";
+WHERE `status`='CONFIRMED' AND ".$USE.">0".$lastOnline."
+ORDER BY points DESC, userid");
$WHATs[] = "list_bonus";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_BONUS');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_BONUS_TITLE');
@@ -357,15 +363,15 @@ ORDER BY points DESC, userid";
// Begging rallye
// Autopurge installed?
- $LAST = "";
+ $lastOnline = "";
if ((EXT_IS_ACTIVE("autopurge")) && (getConfig('autopurge_inactive') == "Y") && (getConfig('ap_inactive_since') > 0)) {
// Use last online timestamp to keep inactive members away from here
- $LAST = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", getConfig('ap_inactive_since'));
+ $lastOnline = sprintf(" AND last_online >= (UNIX_TIMESTAMP() - %s)", getConfig('ap_inactive_since'));
}
- $SQLs[] = "SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data`
-WHERE `status`='CONFIRMED' AND beg_points>0".$LAST."
-ORDER BY beg_points DESC, userid";
+ ADD_SQL("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data`
+WHERE `status`='CONFIRMED' AND beg_points>0".$lastOnline."
+ORDER BY beg_points DESC, userid");
$WHATs[] = "list_beg";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_BEG');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_BEG_TITLE');
@@ -373,11 +379,11 @@ ORDER BY beg_points DESC, userid";
if (EXT_IS_ACTIVE("doubler")) {
// List waiting payouts
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_doubler` WHERE completed='N' ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_doubler` WHERE completed='N' ORDER BY `id`");
$WHATs[] = "list_doubler&mode=waiting&select=all";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_DOUBLER_WAITING');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_DOUBLER_WAITING_TITLE');
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_doubler` ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_doubler` ORDER BY `id`");
$WHATs[] = "list_doubler";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_DOUBLER_ALL');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_DOUBLER_ALL_TITLE');
@@ -386,7 +392,7 @@ ORDER BY beg_points DESC, userid";
//
// All referal banner
//
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_refbanner` ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_refbanner` ORDER BY `id`");
$WHATs[] = "refbanner";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_REFBANNER_ALL');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_REFBANNER_ALL_TITLE');
@@ -394,7 +400,7 @@ ORDER BY beg_points DESC, userid";
//
// All activated referal banner
//
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_refbanner` WHERE `visible`='Y' ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_refbanner` WHERE `visible`='Y' ORDER BY `id`");
$WHATs[] = "refbanner";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_REFBANNER_ACTIVE');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_REFBANNER_ACTIVE_TITLE');
@@ -402,7 +408,7 @@ ORDER BY beg_points DESC, userid";
//
// All extensions
//
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_extensions` ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_extensions` ORDER BY `id`");
$WHATs[] = "extensions";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_EXTENSIONS_ALL');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_EXTENSIONS_ALL_TITLE');
@@ -410,32 +416,32 @@ ORDER BY beg_points DESC, userid";
//
// All activated extensions
//
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_active='Y' ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_extensions` WHERE ext_active='Y' ORDER BY `id`");
$WHATs[] = "extensions&active=Y";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_EXTENSIONS_ACTIVE');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_EXTENSIONS_ACTIVE_TITLE');
if (EXT_IS_ACTIVE("engine")) {
// List all export accounts
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_engine_accounts` ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_engine_accounts` ORDER BY `id`");
$WHATs[] = "list_engine";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_ENGINE');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_ENGINE_TITLE');
// List all pending accounts
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_engine_accounts` WHERE `status`='UNCONFIRMED' ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_engine_accounts` WHERE `status`='UNCONFIRMED' ORDER BY `id`");
$WHATs[] = "unlock_engine";
$DESCRs[] = getMessage('ADMIN_TASK_UNLOCK_ENGINE');
$TITLEs[] = getMessage('ADMIN_TASK_UNLOCK_ENGINE_TITLE');
// List all safes
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_engine_safe` ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_engine_safe` ORDER BY `id`");
$WHATs[] = "list_engine&mode=safe";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_ENGINE_SAFES');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_ENGINE_SAFES_TITLE');
// List all export URLs
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_engine_urls` ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_engine_urls` ORDER BY `id`");
$WHATs[] = "engine_urls";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_ENGINE_URLS');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_ENGINE_URLS_TITLE');
@@ -443,37 +449,37 @@ ORDER BY beg_points DESC, userid";
if (EXT_IS_ACTIVE("sponsor")) {
// List all sponsors
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` ORDER BY `id`");
$WHATs[] = "list_sponsor";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_SPONSOR');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_TITLE');
// List confirmed sponsor accounts
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE `status`='CONFIRMED' ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE `status`='CONFIRMED' ORDER BY `id`");
$WHATs[] = "list_sponsor";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_CONFIRMED');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_CONFIRMED_TITLE');
// List unconfirmed sponsor accounts
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE `status`='UNCONFIRMED' ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE `status`='UNCONFIRMED' ORDER BY `id`");
$WHATs[] = "list_sponsor";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_UNCONFIRMED');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_UNCONFIRMED_TITLE');
// List locked sponsor accounts
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE `status`='LOCKED' ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE `status`='LOCKED' ORDER BY `id`");
$WHATs[] = "list_sponsor";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_LOCKED');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_LOCKED_TITLE');
// List waiting sponsor accounts to be approved
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE `status`='PENDING' ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_data` WHERE `status`='PENDING' ORDER BY `id`");
$WHATs[] = "unlock_sponsor";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_PENDING');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_PENDING_TITLE');
// Waiting payments
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_orders` WHERE pay_`status`='PENDING' ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_sponsor_orders` WHERE pay_`status`='PENDING' ORDER BY `id`");
$WHATs[] = "list_sponsor_pays";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_ORDERS');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_ORDERS_TITLE');
@@ -481,7 +487,7 @@ ORDER BY beg_points DESC, userid";
if (EXT_IS_ACTIVE("country")) {
// List country codes
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_countries` ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_countries` ORDER BY `id`");
$WHATs[] = "list_country";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_COUNTRY');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_COUNTRY_TITLE');
@@ -489,13 +495,13 @@ ORDER BY beg_points DESC, userid";
if (EXT_IS_ACTIVE("theme")) {
// List all themes
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_themes` ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_themes` ORDER BY `id`");
$WHATs[] = "theme_edit";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_THEME_ALL');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_THEME_ALL_TITLE');
// List active themes
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_active='Y' ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_themes` WHERE theme_active='Y' ORDER BY `id`");
$WHATs[] = "theme_edit";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_THEME_ACTIVE');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_THEME_ACTIVE_TITLE');
@@ -503,7 +509,7 @@ ORDER BY beg_points DESC, userid";
if (EXT_IS_ACTIVE("admins")) {
// List all administrator logins
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id`");
$WHATs[] = "admins_edit";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_ADMINS_ALL');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_ADMINS_ALL_TITLE');
@@ -511,20 +517,20 @@ ORDER BY beg_points DESC, userid";
if (EXT_IS_ACTIVE("surfbar")) {
// List all URLs in surfbar
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_surfbar_urls` ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_surfbar_urls` ORDER BY `id`");
$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
- $SQLs[] = "SELECT id FROM `{!_MYSQL_PREFIX!}_surfbar_urls` WHERE `status`='PENDING' ORDER BY `id`";
+ ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_surfbar_urls` WHERE `status`='PENDING' ORDER BY `id`");
$WHATs[] = "unlock_surfbar_urls";
$DESCRs[] = getMessage('ADMIN_TASK_LIST_SURFBAR_URLS_PENDING');
$TITLEs[] = getMessage('ADMIN_TASK_LIST_SURFBAR_URLS_PENDING_TITLE');
}
// Generate extra overview rows
- $EXTRAS .= TASK_CREATE_EXTRA_ROWS($SQLs, $WHATs, $DESCRs, $TITLEs);
+ $EXTRAS .= TASK_CREATE_EXTRA_ROWS($WHATs, $DESCRs, $TITLEs);
// If empty just keep a forced-space left for CSS issues
if (empty($EXTRAS)) $EXTRAS = " ";
@@ -537,12 +543,14 @@ ORDER BY beg_points DESC, userid";
}
//
-function TASK_CREATE_EXTRA_ROWS ($SQLs, $WHATs, $DESCRs, $TITLEs) {
- // Init
- $OUT = ""; $SW = 2; $MAX = sizeof($SQLs) - 1;
- foreach ($SQLs as $key => $sql) {
+function TASK_CREATE_EXTRA_ROWS ($WHATs, $DESCRs, $TITLEs) {
+ // Init variables
+ $OUT = ""; $SW = 2;
+
+ // Sadly this cannot be rewritten to a filter... :(
+ foreach (GET_SQLS() as $key => $sql) {
// Run SQL command, get line numbers and free memory
- $result = SQL_QUERY($sql, __FILE__, __LINE__);
+ $result = SQL_QUERY($sql, __FUNCTION__, __LINE__);
// Get rows
$value = SQL_NUMROWS($result);
@@ -550,13 +558,16 @@ function TASK_CREATE_EXTRA_ROWS ($SQLs, $WHATs, $DESCRs, $TITLEs) {
// Free result
SQL_FREERESULT($result);
+ // Prepare array for output
$content = array(
'row_descr' => $DESCRs[$key],
'row_sw' => $SW,
'bottom' => "",
);
- if ($key < $MAX) $content['bottom'] = "bottom2";
+ // Rewrite CSS class if not last entry is reached
+ if ($key < (COUNT_SQLS() - 1)) $content['bottom'] = "bottom2";
+
if (($value > 0) && (!empty($WHATs[$key]))) {
if (empty($TITLEs[$key])) $TITLEs[$key] = getMessage('ADMIN_TASK_UNKNOWN_LIST_TITLE');
$content['row_link'] = "".$value."";
@@ -564,15 +575,16 @@ function TASK_CREATE_EXTRA_ROWS ($SQLs, $WHATs, $DESCRs, $TITLEs) {
$content['row_link'] = 0;
}
- // Switch color
- $SW = 3 - $SW;
-
// And insert the final string into extras template
$OUT .= LOAD_TEMPLATE("admin_overview_task_rows", true, $content);
+
+ // Switch color
+ $SW = 3 - $SW;
} // END - if
- // Return output
+ // Return output in the template
return LOAD_TEMPLATE("admin_overview_task_extras", true, $OUT);
}
+
//
?>