A3H added, handling fixed:

[mailer.git] / inc / modules / admin / what-list_task.php

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index 32469cadf7009c8958ed780c8b0bc9896666c738..23b861328989e8a92d74ac82141388b2d4c9f315 100644 (file)
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -55,7 +55,7 @@ if (!isGetRequestParameterSet('type')) setGetRequestParameter('type', 'your');
 
 switch (getRequestParameter('type')) {
        case 'your': // List only your own open (new) tasks
-               $whereStatement = "`assigned_admin`='".getCurrentAdminId()."' AND `status`='NEW' AND `task_type` != 'EXTENSION_UPDATE'";
+               $whereStatement = "`assigned_admin`=".getCurrentAdminId()." AND `status`='NEW' AND `task_type` != 'EXTENSION_UPDATE'";
                break;
 
        case 'updates': // List only updates assigned to you
@@ -85,7 +85,7 @@ switch (getRequestParameter('type')) {
 } // END - switch
 
 if (!empty($whereStatement)) {
-       if ((isPostRequestParameterSet('assign')) && (countPostSelection() > 0)) {
+       if ((isPostRequestParameterSet('assign')) && (ifPostContainsSelections())) {
                // Assign / do tasks
                loadIncludeOnce('inc/modules/admin/overview-inc.php');
                if (empty($dmy)) $dmy = '';
@@ -104,7 +104,7 @@ ORDER BY
        `subject` ASC,
        `task_created` DESC',
                        __FILE__, __LINE__);
-               if ((countPostSelection() > 0) && (!isDemoModeActive())) {
+               if ((ifPostContainsSelections()) && (!isDemoModeActive())) {
                        // Only unassign / delete tasks when there are selected tasks posted
                        if (isPostRequestParameterSet('unassign')) {
                                // Unassign from tasks
@@ -176,7 +176,7 @@ ORDER BY
                        ));
 
                        // Do we have an extension task?
-                       if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) {
+                       if (isExtensionTask($content)) {
                                // Load extension row template
                                $OUT .= loadTemplate('admin_list_task_ext_rows', true, $content);
                        } else {