Renamed all SQL-related functions to camel-case notation

[mailer.git] / inc / libs / task_functions.php

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 34462b98a32ec641ee1c34d3841a7892c6c4a1c2..d01582467be2939738018496214062c640b5e080 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -248,16 +248,14 @@ function outputAdvancedOverview (&$result_main) {
        if ((isExtensionActive('autopurge')) && (isExtensionActive('user'))) {
                // Start finding them...
                $userExclusionSql = ' ';
-
-               // Exclude test accounts
-               $userExclusionSql = runFilterChain('user_exclusion_sql', ' ');
+               $excludedUserids = runFilterChain('config_userid_exclusion_sql', array());
+               if (count($excludedUserids) > 0) {
+                       // Exclude all
+                       $userExclusionSql .= ' AND `d`.`userid` NOT IN (' . implode(', ', $excludedUserids) . ')';
+               } // END - if
 
                // Check for more extensions
-               // @TODO These can be rewritten to filter
-               if (isValidId(getDefRefid()))              $userExclusionSql .= ' AND `d`.`userid` != {?def_refid?}';
-               if (isExtensionActive('beg'))                  $userExclusionSql .= ' AND `d`.`userid` != {?beg_userid?}';
-               if (isExtensionActive('bonus'))                $userExclusionSql .= ' AND `d`.`userid` != {?bonus_userid?}';
-               if (isExtensionActive('doubler'))              $userExclusionSql .= ' AND `d`.`userid` != {?doubler_userid?}';
+               // @TODO This can be rewritten to filter
                if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                        // Recent ext-holiday found
                        $userExclusionSql .= " AND `d`.`holiday_active`='N'";
@@ -275,7 +273,7 @@ WHERE
        (UNIX_TIMESTAMP() - `d`.`joined`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - `d`.`last_online`) >= {?ap_inactive_since?} AND
        (UNIX_TIMESTAMP() - `d`.`ap_notified`) >= {?ap_inactive_since?}
-" . $userExclusionSql . "
+       " . runFilterChain('user_exclusion_sql', $userExclusionSql) . "
 ORDER BY
        `d`.`userid` ASC");
                $WHATs[]  = 'list_autopurge';
@@ -559,7 +557,7 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
                // New format...
                foreach ($sqls as $key => $sql) {
                        // Run SQL command, get line numbers and free memory
-                       $result = SQL_QUERY($sql, __FUNCTION__, __LINE__);
+                       $result = sqlQuery($sql, __FUNCTION__, __LINE__);
 
                        // Prepare array for output
                        $content = array(
@@ -572,17 +570,17 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
                                $content['bottom'] = 'bottom';
                        } // END - if
 
-                       if ((!SQL_HASZERONUMS($result)) && (!empty($WHATs[$key]))) {
+                       if ((!ifSqlHasZeroNums($result)) && (!empty($WHATs[$key]))) {
                                if (empty($TITLEs[$key])) {
                                        $TITLEs[$key] = '{--ADMIN_TASK_UNKNOWN_LIST_TITLE--}';
                                } // END - if
-                               $content['row_link'] = '<a href="{%url=modules.php?module=admin&amp;what=' . $WHATs[$key] . '%}" title="' . $TITLEs[$key] . '">' . SQL_NUMROWS($result) . '</a>';
+                               $content['row_link'] = '<a href="{%url=modules.php?module=admin&amp;what=' . $WHATs[$key] . '%}" title="' . $TITLEs[$key] . '">' . sqlNumRows($result) . '</a>';
                        } else {
                                $content['row_link'] = '0';
                        }
 
                        // Free result
-                       SQL_FREERESULT($result);
+                       sqlFreeResult($result);
 
                        // And insert the final string into extras template
                        $OUT .= loadTemplate('admin_overview_task_rows', TRUE, $content);