Fix for broken SQL queries, resolves #116.
[mailer.git] / inc / libs / task_functions.php
index eacd1507a6a54122ec7ca141fbf2d2263b8ea882..fb0366a84e7548a2b018b017406cdcd0d73c470f 100644 (file)
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Spezielle task-Funktionen                        *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,7 +38,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
@@ -46,22 +51,21 @@ if (!defined('__SECURITY')) {
 //  - ...
 //
 // @TODO Move all extension-dependent queries into filters
-function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
-{
-       global $_CONFIG;
-
+function OUTPUT_ADVANCED_OVERVIEW (&$result_main) {
        // Init variables/arrays
-       $EXTRAS = "";
-       $OUT = "";
-       $SQLs = array();
+       $EXTRAS = '';
+       $OUT = '';
        $WHATs = array();
        $DESCRs = array();
        $TITLEs = array();
 
        // Chheck for new extensions and updates
-       $JOBS_DONE = OUTPUT_STANDARD_OVERVIEW($result_main);
+       $jobsDone = OUTPUT_STANDARD_OVERVIEW($result_main);
+
+       // Init SQLs
+       INIT_SQLS();
 
-       if (!$JOBS_DONE) {
+       if (!$jobsDone) {
                // 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'");
 
@@ -78,7 +82,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        // First check for all account status seperately
        //
        // Confirmed accounts
-       $value = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true);
+       $value = GET_TOTAL_DATA("CONFIRMED", "user_data", 'userid', "status", true);
 
        if ($value > 0) {
                define('__CONFIRMED_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_user&amp;status=confirmed\">".$value."</a>");
@@ -87,7 +91,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        }
 
        // Unconfirmed accounts
-       $value = GET_TOTAL_DATA("UNCONFIRMED", "user_data", "userid", "status", true);
+       $value = GET_TOTAL_DATA("UNCONFIRMED", "user_data", 'userid', "status", true);
 
        if ($value > 0) {
                define('__UNCONFIRMED_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=chk_regs\">".$value."</a>");
@@ -96,7 +100,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        }
 
        // And locked accounts
-       $value = GET_TOTAL_DATA("LOCKED", "user_data", "userid", "status", true);
+       $value = GET_TOTAL_DATA("LOCKED", "user_data", 'userid', "status", true);
 
        if ($value > 0) {
                define('__LOCKED_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_user&amp;status=locked\">".$value."</a>");
@@ -195,7 +199,7 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
        //
        // Autopurged mails
        //
-       if (EXT_IS_ACTIVE("autopurge")) {
+       if (EXT_IS_ACTIVE('autopurge')) {
                // Get auto-purged mails
                $value = GET_TOTAL_DATA("DELETED", "pool", "id", "data_type", true);
 
@@ -208,130 +212,131 @@ function OUTPUT_ADVANCED_OVERVIEW (&$result_main)
                //
                // Autopurged bonus mails
                //
-               if (GET_EXT_VERSION("bonus") >= "0.1.8") {
+               if (GET_EXT_VERSION('bonus') >= '0.1.8') {
                        // Get auto-purged bonus mails
-                       $value = GET_TOTAL_DATA("DELETED", "bonus", "id", "data_type", true);
+                       $value = GET_TOTAL_DATA("DELETED", 'bonus', "id", "data_type", true);
 
                        if ($value > 0) {
                                define('__MAIL_BONUS_AP_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=email_details\">".$value."</a>");
                        } else {
                                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);
+               } elseif (EXT_IS_ACTIVE('bonus')) {
+                       define('__MAIL_BONUS_AP_VALUE', sprintf(getMessage('ADMIN_EXT_BONUS_OUTDATED', '0.1.8')));
                } else {
-                       define('__MAIL_BONUS_AP_VALUE', "<div class=\"admin_note\">{--ADMIN_EXT_BONUS_404--}</div>");
+                       define('__MAIL_BONUS_AP_VALUE', "<span class=\"admin_note\">{--ADMIN_EXT_BONUS_404--}</span>");
                }
        } else {
-               define('__MAIL_BONUS_AP_VALUE', "<div class=\"admin_note\">{--ADMIN_EXT_AUTOPURGE_404--}</div>");
-               define('__MAIL_DELETED_VALUE', "<div class=\"admin_note\">{--ADMIN_EXT_AUTOPURGE_404--}</div>");
+               define('__MAIL_BONUS_AP_VALUE', "<span class=\"admin_note\">{--ADMIN_EXT_AUTOPURGE_404--}</span>");
+               define('__MAIL_DELETED_VALUE', "<span class=\"admin_note\">{--ADMIN_EXT_AUTOPURGE_404--}</span>");
        }
 
        //
        // Sent bonus mails
        //
-       if (GET_EXT_VERSION("bonus") >= "0.1.8") {
+       if (GET_EXT_VERSION('bonus') >= '0.1.8') {
                // Get sent bonus mails (but not notifications)
-               $value = GET_TOTAL_DATA("SEND", "bonus", "id", "data_type", true, " AND is_notify='N'");
+               $value = GET_TOTAL_DATA("SEND", 'bonus', "id", "data_type", true, " AND is_notify='N'");
 
                if ($value > 0) {
                        define('__MAIL_BONUS_SEND_VALUE', "<a href=\"{!URL!}/modules.php?module=admin&amp;what=email_details\">".$value."</a>");
                } else {
                        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);
+       } elseif (EXT_IS_ACTIVE('bonus')) {
+               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'));
        }
 
-       if (EXT_IS_ACTIVE("autopurge")) {
+       if (EXT_IS_ACTIVE('autopurge')) {
                // Start finding them...
                $since = getConfig('ap_inactive_since');
-               $EXCLUDE_LIST = "";
+               $EXCLUDE_LIST = '';
                if (getConfig('def_refid') > 0) {
                        $EXCLUDE_LIST = " AND d.userid != ".getConfig('def_refid')."";
                } // END - if
 
                // Check for more extensions
-               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'";
+               // @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('TASK_ADMIN_INACTIVE_AUTOPURGE');
-               $TITLEs[] = getMessage('TASK_ADMIN_INACTIVE_AUTOPURGE_TITLE');
+               $DESCRs[] = getMessage('ADMIN_TASK_INACTIVE_AUTOPURGE');
+               $TITLEs[] = getMessage('ADMIN_TASK_INACTIVE_AUTOPURGE_TITLE');
        }
 
-       if (GET_EXT_VERSION("sql_patches") >= "0.3.4") {
+       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";
-               $DESCRs[] = getMessage('TASK_ADMIN_LIST_ACCOUNT_NOREF');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_ACCOUNT_NOREF_TITLE');
+               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&amp;mode=norefs";
        }
 
-       if (EXT_IS_ACTIVE("payout")) {
+       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('TASK_ADMIN_LIST_PAYOUTS_WAITING');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_PAYOUTS_WAITING_TITLE');
-               $SQLs[]   = "SELECT userid FROM `{!_MYSQL_PREFIX!}_user_payouts` ORDER BY userid";
+               $DESCRs[] = getMessage('ADMIN_TASK_LIST_PAYOUTS_WAITING');
+               $TITLEs[] = getMessage('ADMIN_TASK_LIST_PAYOUTS_WAITING_TITLE');
+               ADD_SQL("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_payouts` ORDER BY userid");
                $WHATs[]  = "list_payouts";
-               $DESCRs[] = getMessage('TASK_ADMIN_LIST_PAYOUTS_ALL');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_PAYOUTS_ALL_TITLE');
+               $DESCRs[] = getMessage('ADMIN_TASK_LIST_PAYOUTS_ALL');
+               $TITLEs[] = getMessage('ADMIN_TASK_LIST_PAYOUTS_ALL_TITLE');
        }
 
-       if (EXT_IS_ACTIVE("wernis")) {
+       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('TASK_ADMIN_LIST_WERNIS_ALL');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_WERNIS_ALL_TITLE');
+               $DESCRs[] = getMessage('ADMIN_TASK_LIST_WERNIS_ALL');
+               $TITLEs[] = getMessage('ADMIN_TASK_LIST_WERNIS_ALL_TITLE');
        }
 
-       if (EXT_IS_ACTIVE("primera")) {
+       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('TASK_ADMIN_LIST_PRIMERA_ALL');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_PRIMERA_ALL_TITLE');
+               $DESCRs[] = getMessage('ADMIN_TASK_LIST_PRIMERA_ALL');
+               $TITLEs[] = getMessage('ADMIN_TASK_LIST_PRIMERA_ALL_TITLE');
        }
 
-       if (EXT_IS_ACTIVE("holiday")) {
+       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('TASK_ADMIN_LIST_HOLIDAYS');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_HOLIDAYS_TITLE');
+               $DESCRs[] = getMessage('ADMIN_TASK_LIST_HOLIDAYS');
+               $TITLEs[] = getMessage('ADMIN_TASK_LIST_HOLIDAYS_TITLE');
        }
 
-       if (GET_EXT_VERSION("bonus") >= "0.8.7") {
+       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('TASK_ADMIN_LIST_NOTIFICATIONS');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_NOTIFICATIONS_TITLE');
+               $DESCRs[] = getMessage('ADMIN_TASK_LIST_NOTIFICATIONS');
+               $TITLEs[] = getMessage('ADMIN_TASK_LIST_NOTIFICATIONS_TITLE');
        } // END - if
 
-       if (GET_EXT_VERSION("bonus") >= "0.2.3") {
+       if (GET_EXT_VERSION('bonus') >= '0.2.3') {
                // Active rallye
-               if (GET_EXT_VERSION("bonus") >= "0.6.9") {
+               if (GET_EXT_VERSION('bonus') >= '0.6.9') {
                        // Add more bonus points here
                        $USE = "(0";
-                       if (getConfig('bonus_click_yn') == "Y") $USE .= " + turbo_bonus";
-                       if (getConfig('bonus_login_yn') == "Y") $USE .= " + login_bonus";
-                       if (getConfig('bonus_order_yn') == "Y") $USE .= " + bonus_order";
-                       if (getConfig('bonus_stats_yn') == "Y") $USE .= " + bonus_stats";
-                       if (getConfig('bonus_ref_yn')   == "Y") $USE .= " + bonus_ref";
+                       if (getConfig('bonus_click_yn') == 'Y') $USE .= " + turbo_bonus";
+                       if (getConfig('bonus_login_yn') == 'Y') $USE .= " + login_bonus";
+                       if (getConfig('bonus_order_yn') == 'Y') $USE .= " + bonus_order";
+                       if (getConfig('bonus_stats_yn') == 'Y') $USE .= " + bonus_stats";
+                       if (getConfig('bonus_ref_yn')   == 'Y') $USE .= " + bonus_ref";
                        $USE .= ")";
                } else {
                        // Old version ???
@@ -339,193 +344,193 @@ ORDER BY d.userid";
                }
 
                // Autopurge installed?
-               $LAST = "";
-               if ((EXT_IS_ACTIVE("autopurge")) && (getConfig('autopurge_inactive') == "Y") && (getConfig('ap_inactive_since') > 0)) {
+               $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('TASK_ADMIN_LIST_BONUS');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_BONUS_TITLE');
+               $DESCRs[] = getMessage('ADMIN_TASK_LIST_BONUS');
+               $TITLEs[] = getMessage('ADMIN_TASK_LIST_BONUS_TITLE');
        }
 
-       if (GET_EXT_VERSION("beg") >= "0.1.2") {
+       if (GET_EXT_VERSION('beg') >= '0.1.2') {
                // Begging rallye
 
                // Autopurge installed?
-               $LAST = "";
-               if ((EXT_IS_ACTIVE("autopurge")) && (getConfig('autopurge_inactive') == "Y") && (getConfig('ap_inactive_since') > 0)) {
+               $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('TASK_ADMIN_LIST_BEG');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_BEG_TITLE');
+               $DESCRs[] = getMessage('ADMIN_TASK_LIST_BEG');
+               $TITLEs[] = getMessage('ADMIN_TASK_LIST_BEG_TITLE');
        }
 
-       if (EXT_IS_ACTIVE("doubler")) {
+       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&amp;mode=waiting&amp;select=all";
-               $DESCRs[] = getMessage('TASK_ADMIN_LIST_DOUBLER_WAITING');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_DOUBLER_WAITING_TITLE');
-               $SQLs[]   = "SELECT id FROM `{!_MYSQL_PREFIX!}_doubler` ORDER BY `id`";
+               $DESCRs[] = getMessage('ADMIN_TASK_LIST_DOUBLER_WAITING');
+               $TITLEs[] = getMessage('ADMIN_TASK_LIST_DOUBLER_WAITING_TITLE');
+               ADD_SQL("SELECT id FROM `{!_MYSQL_PREFIX!}_doubler` ORDER BY `id`");
                $WHATs[]  = "list_doubler";
-               $DESCRs[] = getMessage('TASK_ADMIN_LIST_DOUBLER_ALL');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_DOUBLER_ALL_TITLE');
+               $DESCRs[] = getMessage('ADMIN_TASK_LIST_DOUBLER_ALL');
+               $TITLEs[] = getMessage('ADMIN_TASK_LIST_DOUBLER_ALL_TITLE');
        }
 
        //
        // 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('TASK_ADMIN_LIST_REFBANNER_ALL');
-       $TITLEs[] = getMessage('TASK_ADMIN_LIST_REFBANNER_ALL_TITLE');
+       $DESCRs[] = getMessage('ADMIN_TASK_LIST_REFBANNER_ALL');
+       $TITLEs[] = getMessage('ADMIN_TASK_LIST_REFBANNER_ALL_TITLE');
 
        //
        // 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('TASK_ADMIN_LIST_REFBANNER_ACTIVE');
-       $TITLEs[] = getMessage('TASK_ADMIN_LIST_REFBANNER_ACTIVE_TITLE');
+       $DESCRs[] = getMessage('ADMIN_TASK_LIST_REFBANNER_ACTIVE');
+       $TITLEs[] = getMessage('ADMIN_TASK_LIST_REFBANNER_ACTIVE_TITLE');
 
        //
        // 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('TASK_ADMIN_LIST_EXTENSIONS_ALL');
-       $TITLEs[] = getMessage('TASK_ADMIN_LIST_EXTENSIONS_ALL_TITLE');
+       $DESCRs[] = getMessage('ADMIN_TASK_LIST_EXTENSIONS_ALL');
+       $TITLEs[] = getMessage('ADMIN_TASK_LIST_EXTENSIONS_ALL_TITLE');
 
        //
        // 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&amp;active=Y";
-       $DESCRs[] = getMessage('TASK_ADMIN_LIST_EXTENSIONS_ACTIVE');
-       $TITLEs[] = getMessage('TASK_ADMIN_LIST_EXTENSIONS_ACTIVE_TITLE');
+       $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('TASK_ADMIN_LIST_ENGINE');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_ENGINE_TITLE');
+               $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('TASK_ADMIN_UNLOCK_ENGINE');
-               $TITLEs[] = getMessage('TASK_ADMIN_UNLOCK_ENGINE_TITLE');
+               $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&amp;mode=safe";
-               $DESCRs[] = getMessage('TASK_ADMIN_LIST_ENGINE_SAFES');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_ENGINE_SAFES_TITLE');
+               $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('TASK_ADMIN_LIST_ENGINE_URLS');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_ENGINE_URLS_TITLE');
+               $DESCRs[] = getMessage('ADMIN_TASK_LIST_ENGINE_URLS');
+               $TITLEs[] = getMessage('ADMIN_TASK_LIST_ENGINE_URLS_TITLE');
        }
 
-       if (EXT_IS_ACTIVE("sponsor")) {
+       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('TASK_ADMIN_LIST_SPONSOR');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_SPONSOR_TITLE');
+               $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('TASK_ADMIN_LIST_SPONSOR_CONFIRMED');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_SPONSOR_CONFIRMED_TITLE');
+               $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('TASK_ADMIN_LIST_SPONSOR_UNCONFIRMED');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_SPONSOR_UNCONFIRMED_TITLE');
+               $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('TASK_ADMIN_LIST_SPONSOR_LOCKED');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_SPONSOR_LOCKED_TITLE');
+               $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('TASK_ADMIN_LIST_SPONSOR_PENDING');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_SPONSOR_PENDING_TITLE');
+               $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('TASK_ADMIN_LIST_SPONSOR_ORDERS');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_SPONSOR_ORDERS_TITLE');
+               $DESCRs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_ORDERS');
+               $TITLEs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_ORDERS_TITLE');
        }
 
-       if (EXT_IS_ACTIVE("country")) {
+       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('TASK_ADMIN_LIST_COUNTRY');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_COUNTRY_TITLE');
+               $DESCRs[] = getMessage('ADMIN_TASK_LIST_COUNTRY');
+               $TITLEs[] = getMessage('ADMIN_TASK_LIST_COUNTRY_TITLE');
        }
 
-       if (EXT_IS_ACTIVE("theme")) {
+       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('TASK_ADMIN_LIST_THEME_ALL');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_THEME_ALL_TITLE');
+               $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('TASK_ADMIN_LIST_THEME_ACTIVE');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_THEME_ACTIVE_TITLE');
+               $DESCRs[] = getMessage('ADMIN_TASK_LIST_THEME_ACTIVE');
+               $TITLEs[] = getMessage('ADMIN_TASK_LIST_THEME_ACTIVE_TITLE');
        }
 
-       if (EXT_IS_ACTIVE("admins")) {
+       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('TASK_ADMIN_LIST_ADMINS_ALL');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_ADMINS_ALL_TITLE');
+               $DESCRs[] = getMessage('ADMIN_TASK_LIST_ADMINS_ALL');
+               $TITLEs[] = getMessage('ADMIN_TASK_LIST_ADMINS_ALL_TITLE');
        }
 
-       if (EXT_IS_ACTIVE("surfbar")) {
+       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('TASK_ADMIN_LIST_SURFBAR_URLS_ALL');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_SURFBAR_URLS_ALL_TITLE');
+               $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('TASK_ADMIN_LIST_SURFBAR_URLS_PENDING');
-               $TITLEs[] = getMessage('TASK_ADMIN_LIST_SURFBAR_URLS_PENDING_TITLE');
+               $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 = "&nbsp;";
@@ -538,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);
@@ -551,29 +558,33 @@ 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('TASK_ADMIN_UNKNOWN_LIST_TITLE');
+                       if (empty($TITLEs[$key])) $TITLEs[$key] = getMessage('ADMIN_TASK_UNKNOWN_LIST_TITLE');
                        $content['row_link'] = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$WHATs[$key]."\" title=\"".$TITLEs[$key]."\">".$value."</a>";
                } else {
                        $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);
 }
+
 //
 ?>