X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=aa2f8e7103a4af865071b84c869b4130680c60aa;hp=6fdcafcf5676fbf3118d78782da0a6f2acfdf847;hb=49654afc3fc819c4a9e65be2d870782f5e33e60d;hpb=1e270e9cf3b8f9b8bb6bbcc648e541a6f04be423

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 6fdcafcf56..aa2f8e7103 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -290,10 +290,8 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
 						$OUT .= "<FONT class=\"admin_failed\">".ADMIN_EXT_ALREADY_REGISTERED."</FONT>\n";
 
 						// Close task but not already closes or deleted or update tasks
-						if (($status != "CLOSED") && ($status != "DELETED") && ($type != "EXTENSION_UPDATE"))
-						{
-							$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET status='SOLVED' WHERE id=%s LIMIT 1",
-							 array(bigintval($tid)), __FILE__, __LINE__);
+						if (($status != "CLOSED") && ($status != "DELETED") && ($type != "EXTENSION_UPDATE")) {
+							ADMIN_SOLVE_TASK($tid);
 						}
 					}
 					break;
@@ -304,8 +302,8 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
 
 					// Close task
 					if (($status != "CLOSED") && ($status != "DELETED")) {
-						$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET status='SOLVED' WHERE id=%s LIMIT 1",
-						 array(bigintval($tid)), __FILE__, __LINE__);
+						// Solve the task
+						ADMIN_SOLVE_TASK($tid);
 					}
 					break;
 
@@ -431,7 +429,7 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
 				// Unassign from tasks
 				foreach ($_POST['task'] as $id=>$sel)
 				{
-					$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin='0' WHERE id=%s AND assigned_admin='%s' LIMIT 1",
+					$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin=0 WHERE id=%s AND assigned_admin=%s LIMIT 1",
 					 array(bigintval($id), GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);
 				}
 			}
@@ -440,13 +438,13 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
 				// Delete tasks
 				foreach ($_POST['task'] as $id=>$sel)
 				{
-					$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_task_system WHERE id=%s AND (assigned_admin='%s' OR assigned_admin='0') LIMIT 1",
+					$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_task_system WHERE id=%s AND assigned_admin IN (%s,0) LIMIT 1",
 					 array(bigintval($id), GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);
 				}
 			}
 
 			// Update query
-			$result_tasks = SQL_QUERY_ESC("SELECT id, assigned_admin, userid, task_type, subject, text, task_created FROM "._MYSQL_PREFIX."_task_system WHERE assigned_admin='%s' OR (assigned_admin='0' AND status='NEW') ORDER BY task_created DESC",
+			$result_tasks = SQL_QUERY_ESC("SELECT id, assigned_admin, userid, task_type, subject, text, task_created FROM "._MYSQL_PREFIX."_task_system WHERE assigned_admin=%s OR (assigned_admin=0 AND status='NEW') ORDER BY task_created DESC",
 			 array(GET_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);
 		}