X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fmodules%2Fadmin%2Fwhat-list_task.php;h=23b861328989e8a92d74ac82141388b2d4c9f315;hb=c74f67033674ad06c4577c9b8743a461f90f468e;hp=f487a432a2bb08bee05c4afdcf36a62f112dbd0e;hpb=7f5ffcc103a856b8867ac5739dcf0a3b6710413a;p=mailer.git

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index f487a432a2..23b8613289 100644
--- 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
@@ -142,7 +142,7 @@ ORDER BY
 		}
 
 		// There are uncompleted jobs!
-		$OUT = ''; $SW = 2;
+		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result_tasks)) {
 			// Init infos
 			$content['infos'] = '';
@@ -169,7 +169,6 @@ ORDER BY
 
 			// Prepare content
 			$content = merge_array($content, array(
-				'sw'            => $SW,
 				'assign_admin'  => $content['assigned_admin'],
 				'userid'        => $content['userid'],
 				'task_type_msg' => $content['task_type_msg'],
@@ -177,16 +176,13 @@ 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 {
 				// Load default row template
 				$OUT .= loadTemplate('admin_list_task_rows', true, $content);
 			}
-
-			// Switch colors
-			$SW = 3 - $SW;
 		} // END - while
 
 		// Free memory