Extension ext-network continued:

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

diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index b8258a4d0d13dca5cb7d4d0ac73a926cea83efee..1357218f1b842da5131f58087a42ffd5e4d72dfc 100644 (file)
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -82,7 +82,7 @@ function outputAdvancedOverview (&$result_main) {
        } // END - foreach
 
        // Extension updates found
-       $value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, " AND `status`='NEW' AND `task_type`='EXTENSION_UPDATE'");
+       $value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', TRUE, " AND `status`='NEW' AND `task_type`='EXTENSION_UPDATE'");
 
        if ($value > 0) {
                $content['update_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=updates%}">' . $value . '</a>';
@@ -100,7 +100,7 @@ function outputAdvancedOverview (&$result_main) {
        // Unconfirmed accounts
        $value = getTotalUnconfirmedUser();
        if ($value > 0) {
-               $content['unconfirmed_members'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;status=UNCONFIRMED%}">' . $value . '</a>';
+               $content['unconfirmed_members'] = '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;status=unconfirmed%}">' . $value . '</a>';
        } // END - if
 
        // Locked accounts
@@ -128,7 +128,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        // Unassigned tasks
        //
-       $value = countSumTotalData(0, 'task_system', 'id', 'assigned_admin', true, " AND `status` != 'DELETED'");
+       $value = countSumTotalData(NULL, 'task_system', 'id', 'assigned_admin', TRUE, " AND `status` != 'DELETED'");
 
        if ($value > 0) {
                $content['new_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=unassigned%}">' . $value . '</a>';
@@ -137,7 +137,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        // Closed tasks
        //
-       $value = countSumTotalData('CLOSED', 'task_system', 'id', 'status', true);
+       $value = countSumTotalData('CLOSED', 'task_system', 'id', 'status', TRUE);
 
        if ($value > 0) {
                $content['closed_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=closed%}">' . $value . '</a>';
@@ -146,7 +146,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        // Deleted tasks
        //
-       $value = countSumTotalData('DELETED', 'task_system', 'id', 'status', true);
+       $value = countSumTotalData('DELETED', 'task_system', 'id', 'status', TRUE);
 
        if ($value > 0) {
                $content['deleted_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=deleted%}">' . $value . '</a>';
@@ -155,7 +155,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        // Solved tasks
        //
-       $value = countSumTotalData('SOLVED', 'task_system', 'id', 'status', true, sprintf(" AND `assigned_admin`=%s", getCurrentAdminId()));
+       $value = countSumTotalData('SOLVED', 'task_system', 'id', 'status', TRUE, sprintf(" AND `assigned_admin`=%s", getCurrentAdminId()));
 
        if ($value > 0) {
                $content['solved_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task&amp;type=solved%}">' . $value . '</a>';
@@ -164,7 +164,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        // Your tasks
        //
-       $value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', true, " AND `status`='NEW' AND task_type != 'EXTENSION_UPDATE'");
+       $value = countSumTotalData(getCurrentAdminId(), 'task_system', 'id', 'assigned_admin', TRUE, " AND `status`='NEW' AND task_type != 'EXTENSION_UPDATE'");
 
        if ($value > 0) {
                $content['your_tasks'] = '<a href="{%url=modules.php?module=admin&amp;what=list_task%}">' . $value . '</a>';
@@ -173,7 +173,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        // Mails waiting to be approved
        //
-       $value = countSumTotalData('ADMIN', 'pool', 'id', 'data_type', true);
+       $value = countSumTotalData('ADMIN', 'pool', 'id', 'data_type', TRUE);
 
        if ($value > 0) {
                $content['pending_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=unlock_emails%}">' . $value . '</a>';
@@ -182,7 +182,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        // Unfinished mail orders
        //
-       $value = countSumTotalData('TEMP', 'pool', 'id', 'data_type', true);
+       $value = countSumTotalData('TEMP', 'pool', 'id', 'data_type', TRUE);
 
        if ($value > 0) {
                $content['canceled_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
@@ -191,7 +191,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        // Sent mail orders
        //
-       $value = countSumTotalData('SEND', 'pool', 'id', 'data_type', true);
+       $value = countSumTotalData('SEND', 'pool', 'id', 'data_type', TRUE);
 
        if ($value > 0) {
                $content['send_emails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_archiv%}">' . $value . '</a>';
@@ -202,7 +202,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        if (isExtensionActive('autopurge')) {
                // Get auto-purged mails
-               $value = countSumTotalData('DELETED', 'pool', 'id', 'data_type', true);
+               $value = countSumTotalData('DELETED', 'pool', 'id', 'data_type', TRUE);
 
                if ($value > 0) {
                        $content['purged_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
@@ -213,7 +213,7 @@ function outputAdvancedOverview (&$result_main) {
                //
                if (isExtensionInstalledAndNewer('bonus', '0.1.8')) {
                        // Get auto-purged bonus mails
-                       $value = countSumTotalData('DELETED', 'bonus', 'id', 'data_type', true);
+                       $value = countSumTotalData('DELETED', 'bonus', 'id', 'data_type', TRUE);
 
                        if ($value > 0) {
                                $content['purged_bonus_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
@@ -233,7 +233,7 @@ function outputAdvancedOverview (&$result_main) {
        //
        if (isExtensionInstalledAndNewer('bonus', '0.1.8')) {
                // Get sent bonus mails (but not notifications)
-               $value = countSumTotalData('SEND', 'bonus', 'id', 'data_type', true, " AND `is_notify`='N'");
+               $value = countSumTotalData('SEND', 'bonus', 'id', 'data_type', TRUE, " AND `is_notify`='N'");
 
                if ($value > 0) {
                        $content['send_bonus_mails'] = '<a href="{%url=modules.php?module=admin&amp;what=email_details%}">' . $value . '</a>';
@@ -247,21 +247,20 @@ function outputAdvancedOverview (&$result_main) {
        // Both extensions must be there
        if ((isExtensionActive('autopurge')) && (isExtensionActive('user'))) {
                // Start finding them...
-               $EXCLUDE_LIST = ' ';
+               $userExclusionSql = ' ';
+
+               // Exclude test accounts
+               $userExclusionSql = runFilterChain('user_exclusion_sql', ' ');
 
                // Check for more extensions
                // @TODO These can be rewritten to filter
-               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 (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?}';
                if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
                        // Recent ext-holiday found
-                       $EXCLUDE_LIST .= " AND d.`holiday_active`='N'";
-               } // END - if
-               if (isExtensionInstalledAndNewer('user', '0.5.0')) {
-                       // Exclude test accounts
-                       $EXCLUDE_LIST = runFilterChain('user_exclusion_sql', $EXCLUDE_LIST);
+                       $userExclusionSql .= " AND d.`holiday_active`='N'";
                } // END - if
 
                // Check for all accounts
@@ -270,14 +269,13 @@ function outputAdvancedOverview (&$result_main) {
        d.`email`,
        d.`last_online`
 FROM
-       `{?_MYSQL_PREFIX?}_user_data` AS d
+       `{?_MYSQL_PREFIX?}_user_data` AS `d`
 WHERE
-       d.`status`='CONFIRMED'
-       " . runFilterChain('user_exclusion_sql', ' ') . " AND
+       d.`status`='CONFIRMED' AND
        (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?}
-".$EXCLUDE_LIST."
+" . $userExclusionSql . "
 ORDER BY
        d.`userid` ASC");
                $WHATs[]  = 'list_autopurge';
@@ -335,7 +333,7 @@ ORDER BY
                $add = runFilterChain('add_bonus_points_user_columns', '');
 
                // Active rallye, so add more point columns, if not empty
-               $pointsColumns = '`turbo_bonus`';
+               $pointsColumns = '';
                if (!empty($add)) {
                        $pointsColumns = '(0' . $add . ')';
                } // END - if
@@ -520,6 +518,22 @@ ORDER BY
                $TITLEs[] = '{--ADMIN_TASK_LIST_SURFBAR_URLS_PENDING_TITLE--}';
        } // END - if
 
+       if (isExtensionInstalledAndNewer('sql_patches', '0.9.2')) {
+               // Check for wrong "SERVER_NAME" entries
+               addSql('SELECT `server_name_id` FROM `{?_MYSQL_PREFIX?}_server_name_log`');
+               $DESCRs[] = '{--ADMIN_TASK_LIST_SERVER_NAME_LOG--}';
+               $TITLEs[] = '{--ADMIN_TASK_LIST_SERVER_NAME_LOG_TITLE--}';
+               $WHATs[]  = 'list_server_name';
+       } // END - if
+
+       if (isExtensionInstalled('network')) {
+               // Check for HTTP logging entries
+               addSql('SELECT `network_header_id` FROM `{?_MYSQL_PREFIX?}_network_header_logging`');
+               $DESCRs[] = '{--ADMIN_TASK_LIST_NETWORK_HEADER_LOG--}';
+               $TITLEs[] = '{--ADMIN_TASK_LIST_NETWORK_HEADER_LOG_TITLE--}';
+               $WHATs[]  = 'list_network_http_header';
+       } // END - if
+
        // Generate extra overview rows
        $EXTRAS .= createExtraTaskRows($WHATs, $DESCRs, $TITLEs);
 
@@ -532,7 +546,7 @@ ORDER BY
        $content['extra_table'] = $EXTRAS;
 
        // Simply load the template... :-)
-       loadTemplate('admin_overview_task', false, $content);
+       loadTemplate('admin_overview_task', FALSE, $content);
 }
 
 //
@@ -571,12 +585,12 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
                        SQL_FREERESULT($result);
 
                        // And insert the final string into extras template
-                       $OUT .= loadTemplate('admin_overview_task_rows', true, $content);
+                       $OUT .= loadTemplate('admin_overview_task_rows', TRUE, $content);
                } // END- foreach
        } // END - foreach
 
        // Return output in the template
-       return loadTemplate('admin_overview_task_extras', true, $OUT);
+       return loadTemplate('admin_overview_task_extras', TRUE, $OUT);
 }
 
 // [EOF]