X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=2a02b281d66bd00b8fa1df77085b2fb63ebdaf8a;hp=022b93b7f1045ea8f10e04114c89703047d1de22;hb=cf3765c38cf0a76f396aca291f71858936e92956;hpb=6b9595ec5034045297bb3461e715a28a4edbde60

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 022b93b7f1..2a02b281d6 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -132,7 +132,7 @@ ORDER BY
 function outputSeletectedTasks ($postData, $result_tasks) {
 	if ((isset($postData['assign'])) && (count($postData['sel']) > 0)) {
 		// Assign / do tasks
-		$OUT = ''; $SW = 2;
+		$OUT = '';
 		foreach ($postData['sel'] as $id => $sel) {
 			$result_task = SQL_QUERY_ESC("SELECT
 	`id`, `userid`, `task_type`, `subject`, `text`, `task_created`, `status`, `assigned_admin`
@@ -263,12 +263,11 @@ LIMIT 1",
 
 				// Prepare array for the template
 				$content = array(
-					'sw'        => $SW,
-					'subject'   => $taskData['subject'],
-					'add'       => $add,
-					'text'      => $taskData['text'],
-					'created'   => generateDateTime($taskData['task_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
@@ -394,9 +393,6 @@ LIMIT 1",
 
 			// Free result
 			SQL_FREERESULT($result_task);
-
-			// Switch colors
-			$SW = 3 - $SW;
 		} // END - foreach
 
 		// Load final template
@@ -427,13 +423,10 @@ LIMIT 1",
 		} // 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
@@ -454,14 +447,8 @@ LIMIT 1",
 				$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']))) {
@@ -471,9 +458,6 @@ LIMIT 1",
 				// Load default row template
 				$OUT .= loadTemplate('admin_overview_list_rows', true, $content);
 			}
-
-			// Switch color
-			$SW = 3 - $SW;
 		} // END - while
 
 		// Free memory