X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=6665a4ab1bdfcf667fec47a4386cee8a56d8b119;hp=a58ac8611f270bb6f4fc06c7af0a4376f981006e;hb=330dbb3e2b34450cd1665497506455e195a0a166;hpb=3c0c6ad28a250c08b3fe8b166c589d0d49441ad3

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index a58ac8611f..6665a4ab1b 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -8,16 +8,15 @@
  * -------------------------------------------------------------------- *
  * Short description : Output standard task management                  *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Standart-Aufgaben-Management ausgeben            *
+ * Kurzbeschreibung  : Standard-Aufgaben-Management ausgeben            *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,7 +38,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // @TODO This function does also check for uncompleted tasks
 function outputStandardOverview (&$result_tasks) {
@@ -70,13 +69,10 @@ function outputStandardOverview (&$result_tasks) {
 
 			// Is the extension not yet installed?
 			if ($extInstalled === false) {
-				// Generate subject line
-				$ext_subj = sprintf("[%s:]", $ext_name);
-
 				// We maybe want to install an extension so let's test-drive it...
-				if (loadExtension($ext_name, getExtensionMode(), '', true)) {
-					// Create a task for newly installed extension
-					createNewExtensionTask(getCurrentAdminId(), $ext_subj, $ext_name);
+				if (loadExtension($ext_name, getExtensionMode(), '0.0.0', true)) {
+					// Create a task for newly installed extension (we ignore the task id here)
+					createNewExtensionTask($ext_name);
 				} // END - if
 			} else {
 				// Test-drive extension in update mode
@@ -84,18 +80,18 @@ function outputStandardOverview (&$result_tasks) {
 
 				// Get extension version
 				$ext_ver = getExtensionVersion($ext_name);
-				//* DEBUG: */ outputHtml($ext_name."=".$ext_ver."<br />");
+				//* DEBUG: */ debugOutput($ext_name.'='.$ext_ver);
 
 				// Update extension if extension is installed and outdated
-				//* DEBUG: */ outputHtml('ext=' . $ext_name . ',ver=' . getThisExtensionVersion() . '/' . getExtensionVersion($ext_name)."<br />");
+				//* DEBUG: */ debugOutput('ext=' . $ext_name . ',ver=' . getThisExtensionVersion() . '/' . getExtensionVersion($ext_name));
 				if (getThisExtensionVersion() > $ext_ver) {
 					// Update the extension
 					updateExtension($ext_name, $ext_ver);
 				} // END - if
 
-				if (isset($GLOBALS['cache_array']['active_extensions'][$ext_name])) {
+				if (isset($GLOBALS['cache_array']['always_active'][$ext_name])) {
 					// Maybe we want to keept the current extension active?
-					if (($GLOBALS['cache_array']['active_extensions'][$ext_name] == 'Y') && (!isExtensionActive($ext_name))) {
+					if (($GLOBALS['cache_array']['always_active'][$ext_name] == 'Y') && (!isExtensionActive($ext_name))) {
 						// Reactivate this extension!
 						doActivateExtension($ext_name);
 					} // END - if
@@ -110,7 +106,7 @@ function outputStandardOverview (&$result_tasks) {
 FROM
 	`{?_MYSQL_PREFIX?}_task_system`
 WHERE
-	`assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW')
+	`assigned_admin`=%s OR ((`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status`='NEW')
 ORDER BY
 	`userid` DESC,
 	`task_type` DESC,
@@ -118,8 +114,8 @@ ORDER BY
 	`task_created` DESC",
 		array(getCurrentAdminId()), __FILE__, __LINE__);
 
-	if (SQL_NUMROWS($result_tasks) > 0) {
-		// New jobs found!
+	if (!SQL_HASZERONUMS($result_tasks)) {
+		// New jobs found
 		$jobsDone = false;
 	} // END - if
 
@@ -134,92 +130,98 @@ ORDER BY
 function outputSeletectedTasks ($postData, $result_tasks) {
 	if ((isset($postData['assign'])) && (count($postData['sel']) > 0)) {
 		// Assign / do tasks
-		$OUT = ''; $SW = 2;
-		foreach ($postData['sel'] as $id => $sel) {
+		$OUT = '';
+		foreach ($postData['sel'] as $taskId => $sel) {
 			$result_task = SQL_QUERY_ESC("SELECT
 	`id`, `userid`, `task_type`, `subject`, `text`, `task_created`, `status`, `assigned_admin`
 FROM
 	`{?_MYSQL_PREFIX?}_task_system`
 WHERE
-	`id`=%s AND (`assigned_admin`=%s OR (`assigned_admin`=0 AND `status`='NEW'))
+	`id`=%s AND (`assigned_admin`=%s OR ((`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status`='NEW'))
 LIMIT 1",
-				array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
+				array(
+					bigintval($taskId),
+					getCurrentAdminId()
+				), __FILE__, __LINE__);
 
 			// Task is found?
 			if (SQL_NUMROWS($result_task) == 1) {
-				// Task is valid...
-				list($tid, $userid, $type, $subj, $text, $created, $status, $adminId) = SQL_FETCHROW($result_task);
+				// Task is valid so load it's data
+				$taskData = SQL_FETCHARRAY($result_task);
 
-				if ($adminId == '0') {
+				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 LIMIT 1",
-					array(getCurrentAdminId(), bigintval($tid)), __FILE__, __LINE__);
+					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=%s WHERE `id`=%s AND `assigned_admin`=NULL LIMIT 1",
+						array(
+							getCurrentAdminId(),
+							bigintval($taskData['id'])
+						), __FILE__, __LINE__);
 				} // END - if
 
 				$add = '';
 				// @TODO Rewrite this to a filter
-				if ($type == 'SUPPORT_MEMBER') {
-					$mode = substr($text, 0, strpos($text, ':'));
-					$text = substr($text, strpos($text, ':') + 1);
-					$add = "<li>{--ADMIN_TASK_SUPPORT_MODE--}: <strong>".$mode."</strong></li>";
+				if ($taskData['task_type'] == 'MEMBER_SUPPORT') {
+					$mode = substr($taskData['text'], 0, strpos($taskData['text'], ':'));
+					$taskData['text'] = substr($taskData['text'], strpos($taskData['text'], ':') + 1);
+					$add = '<li>{--ADMIN_TASK_SUPPORT_MODE--}: <strong>' . $mode . '</strong></li>';
 				} // END - if
 
 				// Is a userid assign?
-				if ($userid > 0) {
+				if ($taskData['userid'] > 0) {
 					// Then load his data!
-					if (fetchUserData($userid)) {
+					if (fetchUserData($taskData['userid'])) {
 						// Fetch row
 						$content = getUserDataArray();
 
 						// Generate HTML list entry
-						$add = "<li>{--ADMIN_MEMBER_UID--}: <strong>".generateUserProfileLink($userid, 'user_data')." (<a href=\"".generateEmailLink($content['email'], 'user_data')."\">".translateGender($content['gender'])." ".$content['surname']." ".$content['family']."</a>)</strong></li>";
+						$add = '<li>{--ADMIN_MEMBER_USERID--}: <strong>' . generateUserProfileLink($taskData['userid'], 'user_data') . ' (<a href="' . generateEmailLink($content['email'], 'user_data') . '">{%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . '</a>)</strong></li>';
 					} else {
 						// Invalid userid, so log and zero it
-						logDebugMessage(__FUNCTION__, __LINE__, 'Invalid userid=' . $userid . ' -> not found!');
-						$userid = '0';
+						logDebugMessage(__FUNCTION__, __LINE__, 'fetchUserData() failed: userid=' . $taskData['userid'] . ' not found.');
+						$taskData['userid'] = '0';
 					}
 				} // END - if
 
 				// Decode entities of the text
-				$text = decodeEntities($text);
+				$taskData['text'] = decodeEntities($taskData['text']);
 
 				// Compile and insert text from task into table template
-				$text = loadTemplate('admin_extensions_text', true, $text);
+				$taskData['text'] = loadTemplate('admin_extensions_text', true, $taskData['text']);
 
 				// Initialize variables (no title for SQL commands by default)
 				$ext_name = ''; $ext_ver = '';
-				$title = getMessage('TASK_NO_TITLE');
+				$title = '{--ADMIN_TASK_NO_SQL_TITLE--}';
 
 				// Shall I list SQL commands assigned to an extension installation or update task?
-				if ((getConfig('verbose_sql') == 'Y')) {
+				if ((isVerboseSqlEnabled()) || (!isExtensionInstalled('sql_patches'))) {
 					// Extract extension name from subject
-					$ext_name = substr($subj, 1, strpos($subj, ':') - 1);
+					$ext_name = substr($taskData['subject'], 1, strpos($taskData['subject'], ':') - 1);
 
 					// Update task or extension task?
-					if (($type == 'EXTENSION') && (!isExtensionInstalled($ext_name))) {
+					if (($taskData['task_type'] == 'EXTENSION') && (!isExtensionInstalled($ext_name))) {
 						// Load SQL commands for registering in dry-run
-						registerExtension($ext_name, $id, true);
+						registerExtension($ext_name, $taskId, true);
 
 						// Is this non-productive?
 						if (isExtensionProductive() === false) {
 							// Issue warning
-							$text .= loadTemplate('admin_settings_saved', true, sprintf(getMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE'), $ext_name));
+							$taskData['text'] = displayMessage('{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE=', $ext_name . '%}', true) . $taskData['text'];
 						} // END - if
 
 						// Set current extension name
 						setCurrentExtensionName($ext_name);
 
 						// Add notes to text
-						$text .= getExtensionNotes();
+						$taskData['text'] .= getExtensionNotes();
 
 						// Set title
-						$title = getMessage('ADMIN_SQLS_EXECUTED_ON_REGISTER');
-					} elseif ($type == 'EXTENSION_UPDATE') {
+						$title = '{--ADMIN_SQLS_EXECUTED_ON_REGISTER--}';
+					} elseif ($taskData['task_type'] == 'EXTENSION_UPDATE') {
 						// Prepare extension name and version
 						$ext_name = substr($ext_name, 7);
 						$ext_name = substr($ext_name, 0, strpos($ext_name, '-'));
 						$test = '[UPDATE-' . $ext_name . '-';
-						$ext_ver = substr($subj, strlen($test));
+						$ext_ver = substr($taskData['subject'], strlen($test));
 						$ext_ver = substr($ext_ver, 0, strpos($ext_ver, ':'));
 
 						// Load SQLs from file
@@ -229,19 +231,19 @@ LIMIT 1",
 						setCurrentExtensionName($ext_name);
 
 						// Add notes to text
-						$text .= getExtensionNotes();
+						$taskData['text'] .= getExtensionNotes();
 
 						// Set title
-						$title = getMessage('ADMIN_SQLS_EXECUTED_ON_UPDATE');
+						$title = '{--ADMIN_SQLS_EXECUTED_ON_UPDATE--}';
 					} else {
 						// Remove extension's name
 						$ext_name = '';
 					}
 
 					// Add SQLs to a table
-					if ((!empty($ext_name)) && (getExtensionVersion('sql_patches')) && (getConfig('verbose_sql') == 'Y')) {
+					if ((!empty($ext_name)) && (isVerboseSqlEnabled())) {
 						// Add verbose SQL table
-						$text .= addExtensionVerboseSqlTable($title, " class=\"admin_table top2 left2 right2\"", true, '100%') . "<br />\n";
+						$taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="table top left right"', true, '100%');
 					} // END - if
 				} elseif ((!empty($ext_name)) && (!empty($ext_ver))) {
 					// Run SQL commands in dry mode but only return the notes
@@ -251,20 +253,19 @@ LIMIT 1",
 					setCurrentExtensionName($ext_name);
 
 					// Get notes
-					$text .= getExtensionNotes();
+					$taskData['text'] .= getExtensionNotes();
 				} else {
 					// This should not normally happen!
-					debug_report_bug('ext_name(' . $ext_name . ') or ext_ver(' . $ext_ver . ') is empty! sql_patches=' . getExtensionVersion('sql_patches') . '/verbose_sql=' . getConfig('verbose_sql'));
+					debug_report_bug(__FILE__, __LINE__, 'ext_name(' . $ext_name . ') or ext_ver(' . $ext_ver . ') is empty! isVerboseSqlEnabled=' . intval(isVerboseSqlEnabled()));
 				}
 
 				// Prepare array for the template
 				$content = array(
-					'sw'        => $SW,
-					'subject'   => $subj,
-					'add'       => $add,
-					'text'      => $text,
-					'created'   => generateDateTime($created, 1),
-					'extension' => $ext_name
+					'subject'      => $taskData['subject'],
+					'add'          => $add,
+					'text'         => $taskData['text'],
+					'task_created' => generateDateTime($taskData['task_created'], 1),
+					'extension'    => $ext_name
 				);
 
 				// Load template
@@ -272,57 +273,53 @@ LIMIT 1",
 
 				// Which task do we actually have here?
 				// @TODO Rewrite this to something with include files and/or filter
-				switch ($type) {
+				switch ($taskData['task_type']) {
 					case 'EXTENSION': // Install new extensions
-						$ext_name = substr($subj, 1, strpos($subj, ':') - 1);
-						$result_lines = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_name`='%s' LIMIT 1",
-							array($ext_name), __FILE__, __LINE__);
-						$lines = SQL_NUMROWS($result_lines);
-						SQL_FREERESULT($result_lines);
-						if ($lines == '0') {
-							// New extension found
-							$OUT .= loadTemplate('admin_ext_reg_form', true, array(
-								'id'       => bigintval($id),
+						$ext_name = substr($taskData['subject'], 1, strpos($taskData['subject'], ':') - 1);
+						if (!isExtensionInstalled($ext_name)) {
+							// New (not yet installed) extension found
+							$OUT .= loadTemplate('admin_extension_reg_form', true, array(
+								'id'       => bigintval($taskId),
 								'ext_name' => $ext_name
 							));
 						} else {
-							// Task is closed so nothing is todo
-							$OUT .= "<div class=\"admin_failed\">{--ADMIN_EXT_ALREADY_REGISTERED--}</div>\n";
+							// Extension is already installed
+							$OUT .= '<div class="notice">{--ADMIN_EXTENSION_ALREADY_REGISTERED--}</div>';
 
 							// Close task but not already closed, solved, deleted or update tasks
-							if ((!in_array($status, array('CLOSED','DELETED','SOLVED'))) && ($type != 'EXTENSION_UPDATE')) {
+							if ((!in_array($taskData['status'], array('CLOSED','DELETED','SOLVED'))) && ($taskData['task_type'] != 'EXTENSION_UPDATE')) {
 								// Solve the task
-								runFilterChain('solve_task', $tid);
+								runFilterChain('solve_task', $taskData['id']);
 							} // END - if
 						}
 						break;
 
 					case 'EXTENSION_UPDATE': // Extension update
 						// Extension updates are installed automatically
-						$OUT .= "<div class=\"admin_failed medium\">{--ADMIN_EXTENSION_UPDATED--}</div>\n";
+						$OUT .= '<div class="notice medium">{--ADMIN_EXTENSION_UPDATED--}</div>';
 
 						// Close task
-						if (($status != 'CLOSED') && ($status != 'DELETED')) {
+						if (!in_array($taskData['status'], array('CLOSED', 'DELETED'))) {
 							// Solve the task
-							runFilterChain('solve_task', $tid);
+							runFilterChain('solve_task', $taskData['id']);
 						} // END - if
 						break;
 
-					case 'SUPPORT_MEMBER': // Assign on member's support request
+					case 'MEMBER_SUPPORT': // Assign on member's support request
 						// @TODO This may also be rewritten to include files
 						switch ($mode) {
 							default: // @TODO Unknown support mode
 							logDebugMessage(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode));
-							$OUT .= "<div class=\"admin_failed medium\">".sprintf(getMessage('ADMIN_UNKNOWN_SUPPORT_MODE'), $mode)."</div>\n";
+							$OUT .= '<div class="notice medium">{%message,ADMIN_UNKNOWN_SUPPORT_MODE=' . $mode . '%}</div>';
 							break;
-						}
+						} // END - switch
 						break;
 
 					case 'PAYOUT_REQUEST': // Payout requests
 						if (isExtensionActive('payout')) {
 							// Extension is installed so let him send a notification to the user
-							$result_pay = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `userid`=%s AND payout_timestamp=%s LIMIT 1",
-								array(bigintval($userid), bigintval($created)), __FILE__, __LINE__);
+							$result_pay = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `userid`=%s AND `payout_timestamp`=%s LIMIT 1",
+								array(bigintval($taskData['userid']), bigintval($taskData['task_created'])), __FILE__, __LINE__);
 							list($pid) = SQL_FETCHROW($result_pay);
 							SQL_FREERESULT($result_pay);
 
@@ -330,18 +327,18 @@ LIMIT 1",
 								// Payout id can be obtained
 								$content = array(
 									'pid' => $pid,
-									'tid' => $tid,
+									'tid' => $taskData['id'],
 								);
 
 								// Load template
 								$OUT .= loadTemplate('admin_payout_overview_form', true, $content);
 							} else {
 								// Problem obtaining payout id
-								$OUT .= "<div class=\"admin_failed medium\">{--PAYOUT_OBTAIN_ID_FAILED--}</div>\n";
+								$OUT .= '<div class="notice medium">{--ADMIN_PAYOUT_OBTAIN_ID_FAILED--}</div>';
 							}
 						} else {
 							// Extension is not installed
-							$OUT .= "<div class=\"admin_failed medium\">{--ADMIN_PAYOUT_NOT_INSTALLED--}</div>\n";
+							$OUT .= '<div class="notice medium">{--ADMIN_PAYOUT_NOT_INSTALLED--}</div>';
 						}
 						break;
 
@@ -349,7 +346,7 @@ LIMIT 1",
 						if (isExtensionActive('wernis')) {
 							// Extension is installed so let him send a notification to the user
 							$result_pay = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_wernis` WHERE `userid`=%s AND wernis_timestamp=%s LIMIT 1",
-								array(bigintval($userid), bigintval($created)), __FILE__, __LINE__);
+								array(bigintval($taskData['userid']), bigintval($taskData['task_created'])), __FILE__, __LINE__);
 							list($pid) = SQL_FETCHROW($result_pay);
 							SQL_FREERESULT($result_pay);
 
@@ -357,42 +354,39 @@ LIMIT 1",
 								// Payout id can be obtained
 								$content = array(
 									'pid' => $pid,
-									'tid' => $tid,
+									'tid' => $taskData['id'],
 								);
 								$OUT .= loadTemplate('admin_wernis_overview_form', true, $content);
 							} else {
 								// Problem obtaining wernis id
-								$OUT .= "<div class=\"admin_failed medium\">{--WERNIS_OBTAIN_ID_FAILED--}</div>\n";
+								$OUT .= '<div class="notice medium">{--WERNIS_OBTAIN_ID_FAILED--}</div>';
 							}
 						} else {
 							// Extension is not installed
-							$OUT .= "<div class=\"admin_failed medium\">{--ADMIN_WERNIS_NOT_INSTALLED--}</div>\n";
+							$OUT .= '<div class="notice medium">{--ADMIN_WERNIS_NOT_INSTALLED--}</div>';
 						}
 						break;
 
 					case 'HOLIDAY_REQUEST': // Holiday requests
-						$OUT .= loadTemplate('admin_task_holiday', true, $userid);
+						$OUT .= loadTemplate('admin_task_holiday', true, $taskData['userid']);
 						break;
 
 					case 'MEMBER_ORDER': // Member mail orders
-						$OUT .= loadTemplate('admin_task_order', true, $id);
+						$OUT .= loadTemplate('admin_task_order', true, $taskId);
 						break;
 
 					default: // Unknown task type
-						logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $type));
-						$OUT .= "<div class=\"admin_failed medium\">".sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $type, $id)."</div>\n";
+						logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $taskData['task_type']));
+						$OUT .= '<div class="notice medium">' . sprintf(getMessage('ADMIN_UNKNOWN_TASK_TYPE'), $taskData['task_type'], $taskId) . '</div>';
 						break;
 				}
-				$OUT .= "  </td>
-  <td width=\"1%\" class=\"switch_sw".$SW." bottom2 right2\">&nbsp;</td>
-</tr>\n";
+				$OUT .= '
+  </td>
+</tr>';
 			} // END - if
 
 			// Free result
 			SQL_FREERESULT($result_task);
-
-			// Switch colors
-			$SW = 3 - $SW;
 		} // END - foreach
 
 		// Load final template
@@ -402,34 +396,31 @@ LIMIT 1",
 			// Only unassign / delete tasks when there are selected tasks posted
 			if (!empty($postData['unassign'])) {
 				// Unassign from tasks
-				foreach ($postData['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",
-						array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
-				}
-			} elseif (isset($postData['del'])) {
+				foreach ($postData['sel'] as $taskId => $sel) {
+					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=NULL WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
+						array(bigintval($taskId), getCurrentAdminId()), __FILE__, __LINE__);
+				} // END - foreach
+			} elseif (isset($postData['delete'])) {
 				// Delete tasks
-				foreach ($postData['sel'] as $id => $sel) {
-					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), getCurrentAdminId()), __FILE__, __LINE__);
-				}
+				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",
+						array(bigintval($taskId), getCurrentAdminId()), __FILE__, __LINE__);
+				} // END - foreach
 			} else {
 				// Unknown action
-				debug_report_bug(sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r($postData, true)));
+				debug_report_bug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r($postData, true)));
 			}
 
 			// 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 OR `assigned_admin` IS NULL) AND `status`='NEW') ORDER BY `task_created` DESC",
 				array(getCurrentAdminId()), __FILE__, __LINE__);
 		} // END - if
 
 		// There are uncompleted jobs!
-		$OUT = ''; $SW = 2;
+		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result_tasks)) {
 			// Init infos
-			$content['infos'] = '---';
-
-			// Generate assign link
-			$content['assigned_admin'] = generateAdminLink($content['assigned_admin']);
+			$content['infos'] = '';
 
 			// Generate infos
 			// @TODO Try to move this in includes
@@ -438,38 +429,26 @@ LIMIT 1",
 				case 'EXTENSION_UPDATE':
 					$content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ':') - 1);
 					break;
-			}
+			} // END - switch
 
-			// Get task type
-			$content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).'');
-
-			if ($content['userid'] > 0) {
+			if (isValidUserId($content['userid'])) {
 				// Member found otherwise it's a system task
 				$content['userid'] = generateUserProfileLink($content['userid']);
 			} else {
-				$content['userid'] = "<em>{--ADMIN_IS_SYSTEM_TASK--}</em>";
+				$content['userid'] = '<em>{--ADMIN_IS_SYSTEM_TASK--}</em>';
 			}
 
-			// Prepare content
-			$content = merge_array($content, array(
-				'sw'             => $SW,
-				'assigned_admin' => $content['assigned_admin'],
-				'userid'         => $content['userid'],
-				'task_type_msg'  => $content['task_type_msg'],
-				'created'        => generateDateTime($content['task_created'], 2)
-			));
+			// Add/translate some content
+			$content['task_created'] = generateDateTime($content['task_created'], 2);
 
 			// Do we have extension task?
-			if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) {
+			if (isExtensionTask($content)) {
 				// Load extension row template
 				$OUT .= loadTemplate('admin_overview_list_ext_rows', true, $content);
 			} else {
 				// Load default row template
 				$OUT .= loadTemplate('admin_overview_list_rows', true, $content);
 			}
-
-			// Switch color
-			$SW = 3 - $SW;
 		} // END - while
 
 		// Free memory