X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_task.php;h=b2c97da3607e55794f2fdc54913f089427c38020;hb=cc59ea1cce3e0fafc2cc6c9e36142698cf2b58ef;hp=9acf12533250745284b733f5f766e5d6e7f3c2b0;hpb=2e715eb7f3f8ca8d259aacb4cbbddde7d9d18e01;p=mailer.git

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index 9acf125332..b2c97da360 100644
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -43,13 +43,10 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (!isExtensionActive('task')) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('task'));
-	return;
-} // END - if
-
 $whereStatement = '';
-if (!isGetRequestParameterSet('type')) setGetRequestParameter('type', 'your');
+if (!isGetRequestParameterSet('type')) {
+	setGetRequestParameter('type', 'your');
+} // END - if
 
 switch (getRequestParameter('type')) {
 	case 'your': // List only your own open (new) tasks
@@ -65,7 +62,7 @@ switch (getRequestParameter('type')) {
 		break;
 
 	case 'unassigned': // List unassigned (but not deleted) tasks
-		$whereStatement = "`assigned_admin`=0 AND `status` != 'DELETED'";
+		$whereStatement = "(`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status` != 'DELETED'";
 		break;
 
 	case 'deleted': // List all deleted
@@ -78,7 +75,7 @@ switch (getRequestParameter('type')) {
 
 	default: // Unknown type
 		logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", getRequestParameter('type')));
-		loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_TASK_UNKNOWN_MODE', getRequestParameter('type')));
+		displayMessage('{%message,ADMIN_TASK_UNKNOWN_MODE' . getRequestParameter('type') . '%}');
 		break;
 } // END - switch
 
@@ -107,7 +104,7 @@ ORDER BY
 			if (isPostRequestParameterSet('unassign')) {
 				// Unassign from tasks
 				foreach (postRequestParameter('sel') as $id => $sel) {
-					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=0 WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
+					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=NULL WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
 						array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
 				} // END - foreach
 			} elseif (isFormSent('delete')) {
@@ -145,9 +142,6 @@ ORDER BY
 			// Init infos
 			$content['infos'] = '';
 
-			// Get admin task
-			$content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}';
-
 			// Generate infos
 			switch ($content['task_type']) {
 				case 'EXTENSION':
@@ -167,9 +161,6 @@ ORDER BY
 
 			// Prepare content
 			$content = merge_array($content, array(
-				'assign_admin'  => $content['assigned_admin'],
-				'userid'        => $content['userid'],
-				'task_type_msg' => $content['task_type_msg'],
 				'task_created'  => generateDateTime($content['task_created'], 2)
 			));