X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=9084025f2f84bdb3a57f8e2e1699382eb3a47ab6;hb=6fb7e6d43cd1abb525ab3ac32c40dab995e709b2;hp=f330994e938f64af9423e6ca82844a0c7563b5a8;hpb=aebafd5a0fceb05860bb74582387db183193e0b8;p=mailer.git

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index f330994e93..9084025f2f 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // @TODO This function does also check for uncompleted tasks
 function outputStandardOverview (&$result_tasks) {
 	// First check for solved and not assigned tasks and assign them to current admin
-	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE assigned_admin < 1 AND status != 'NEW'",
+	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `assigned_admin` IS NULL AND status != 'NEW'",
 		array(getCurrentAdminId()), __FILE__, __LINE__);
 
 	// We currently don't want to install an extension so let's find out if we need...
@@ -75,7 +75,7 @@ function outputStandardOverview (&$result_tasks) {
 					createNewExtensionTask($ext_name);
 				} // END - if
 			} else {
-				// Test-drive extension in update mode
+				// Test-drive extension
 				loadExtension($ext_name, 'test');
 
 				// Get extension version
@@ -151,7 +151,7 @@ LIMIT 1",
 
 				if ($taskData['assigned_admin'] == '0') {
 					// Assgin current admin to unassgigned task
-					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s AND `assigned_admin`=NULL LIMIT 1",
+					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s AND `assigned_admin` IS NULL LIMIT 1",
 						array(
 							getCurrentAdminId(),
 							bigintval($taskData['id'])
@@ -264,7 +264,7 @@ LIMIT 1",
 					'subject'      => $taskData['subject'],
 					'add'          => $add,
 					'text'         => $taskData['text'],
-					'task_created' => generateDateTime($taskData['task_created'], 1),
+					'task_created' => generateDateTime($taskData['task_created'], '1'),
 					'extension'    => $ext_name
 				);
 
@@ -287,7 +287,7 @@ LIMIT 1",
 							$OUT .= '<div class="notice">{--ADMIN_EXTENSION_ALREADY_REGISTERED--}</div>';
 
 							// Close task but not already closed, solved, deleted or update tasks
-							if ((!in_array($taskData['status'], array('CLOSED','DELETED','SOLVED'))) && ($taskData['task_type'] != 'EXTENSION_UPDATE')) {
+							if ((!in_array($taskData['status'], array('CLOSED', 'DELETED', 'SOLVED'))) && ($taskData['task_type'] != 'EXTENSION_UPDATE')) {
 								// Solve the task
 								runFilterChain('solve_task', $taskData['id']);
 							} // END - if
@@ -298,7 +298,7 @@ LIMIT 1",
 						// Extension updates are installed automatically
 						$OUT .= '<div class="notice medium">{--ADMIN_EXTENSION_UPDATED--}</div>';
 
-						// Close task
+						// Close task if not closed or deleted
 						if (!in_array($taskData['status'], array('CLOSED', 'DELETED'))) {
 							// Solve the task
 							runFilterChain('solve_task', $taskData['id']);
@@ -403,7 +403,7 @@ LIMIT 1",
 			} elseif (isset($postData['delete'])) {
 				// Delete tasks
 				foreach ($postData['sel'] as $taskId => $sel) {
-					SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s AND `assigned_admin` IN (%s,0) LIMIT 1",
+					SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s AND `assigned_admin` IN (%s,0,NULL) LIMIT 1",
 						array(bigintval($taskId), getCurrentAdminId()), __FILE__, __LINE__);
 				} // END - foreach
 			} else {
@@ -435,7 +435,7 @@ LIMIT 1",
 				// Member found otherwise it's a system task
 				$content['userid'] = generateUserProfileLink($content['userid']);
 			} else {
-				$content['userid'] = '<em>{--ADMIN_IS_SYSTEM_TASK--}</em>';
+				$content['userid'] = '{--ADMIN_IS_SYSTEM_TASK--}';
 			}
 
 			// Add/translate some content