Fixed missing action if provided module is invalid (e.g. module=http://foo-server)

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

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 95e0082d82f2b6ed3770d6ba8becb9c571e66bba..1ac3596bd77dc5a92b2c03d82cc3c802e50ba6c5 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -101,7 +101,7 @@ function outputAdvancedOverview (&$result_main) {
        } // END - if
 
        // Unconfirmed accounts
-       $value = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true);
+       $value = getTotalUnconfirmedUser();
 
        if ($value > 0) {
                $content['unconfirmed_members'] = '<a href="{%url=modules.php?module=admin&amp;what=chk_regs%}">' . $value . '</a>';
@@ -109,7 +109,7 @@ function outputAdvancedOverview (&$result_main) {
 
 
        // And locked accounts
-       $value = countSumTotalData('LOCKED', 'user_data', 'userid', 'status', true);
+       $value = getTotalLockedUser();
        if ($value > 0) {
                $content['locked_members'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;status=locked%}">' . $value . '</a>';
        } // END - if
@@ -336,7 +336,7 @@ ORDER BY
 
                // Autopurge installed?
                $lastOnline = '';
-               if ((isExtensionActive('autopurge')) && (getConfig('autopurge_inactive') == 'Y') && (getConfig('ap_inactive_since') > 0)) {
+               if ((isExtensionActive('autopurge')) && (getConfig('autopurge_inactive') == 'Y') && (getApInactiveSince() > 0)) {
                        // Use last online timestamp to keep inactive members away from here
                        $lastOnline   = ' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})';
                } // END - if
@@ -360,7 +360,7 @@ ORDER BY
 
                // Autopurge installed?
                $lastOnline = '';
-               if ((isExtensionActive('autopurge')) && (getConfig('autopurge_inactive') == 'Y') && (getConfig('ap_inactive_since') > 0)) {
+               if ((isExtensionActive('autopurge')) && (getConfig('autopurge_inactive') == 'Y') && (getApInactiveSince() > 0)) {
                        // Use last online timestamp to keep inactive members away from here
                        $lastOnline   = ' AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})';
                } // END - if
@@ -549,7 +549,7 @@ ORDER BY
 //
 function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
        // Init variables
-       $OUT = ''; $SW = 2;
+       $OUT = '';
 
        // Sadly this cannot be rewritten to a filter... :(
        foreach (getSqls() as $sqls) {
@@ -567,7 +567,6 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
                        // Prepare array for output
                        $content = array(
                                'row_descr' => $DESCRs[$key],
-                               'row_sw'    => $SW,
                                'bottom'    => '',
                        );
 
@@ -583,9 +582,6 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
 
                        // And insert the final string into extras template
                        $OUT .= loadTemplate('admin_overview_task_rows', true, $content);
-
-                       // Switch color
-                       $SW = 3 - $SW;
                } // END- foreach
        } // END - foreach