X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=f64a73744678991afb2998559b4b6b71c008abab;hp=01f3a7be8d22bb72a4b5715f3fe1fe880f5140bb;hb=2b388c21a07e07317ccb065d42ef7304cfca7718;hpb=e72031bcfdcd8e91f62bec6cc88f36b7a11d9221

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 01f3a7be8d..f64a737446 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Standart-Aufgaben-Management ausgeben            *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -244,7 +249,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 						// Close task but not already closes or deleted or update tasks
 						if (($status != "CLOSED") && ($status != "DELETED") && ($type != "EXTENSION_UPDATE")) {
 							// Solve the task
-							RUN_FILTER('solve_task', $tid);
+							runFilterChain('solve_task', $tid);
 						} // END - if
 					}
 					break;
@@ -256,7 +261,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 					// Close task
 					if (($status != "CLOSED") && ($status != "DELETED")) {
 						// Solve the task
-						RUN_FILTER('solve_task', $tid);
+						runFilterChain('solve_task', $tid);
 					} // END - if
 					break;
 
@@ -360,7 +365,7 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 		// Load final template
 		LOAD_TEMPLATE("admin_overview_list");
 	} else {
-		if ((isset($POST['task'])) && ((sizeof($POST['task']) > 0) || ($POST['task'][0] == "1"))) {
+		if ((isset($POST['task'])) && ((count($POST['task']) > 0) || ($POST['task'][0] == "1"))) {
 			// Only unassign / delete tasks when there are selected tasks posted
 			if (!empty($POST['unassign'])) {
 				// Unassign from tasks
@@ -378,62 +383,64 @@ function OUTPUT_SELECTED_TASKS ($POST, $result_tasks) {
 
 			// 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",
-			 array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
+				array(GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
 		} // END - if
 
 		// There are uncompleted jobs!
+		// @TODO Rewrite this to one template and use $OUT = ...
 		LOAD_TEMPLATE("admin_overview_header");
-		$SW = 2;
-		while (list($id, $admin, $uid, $type, $subj, $text, $created) = SQL_FETCHROW($result_tasks)) {
+		$OUT = ""; $SW = 2;
+		while ($content = SQL_FETCHARRAY($result_tasks)) {
 			// Init infos
-			$infos = "---";
+			$content['infos'] = "---";
 
 			// Generate assign link
-			$admin = GENERATE_AID_LINK($admin);
-
-			// Get task type
-			$type_out = constant('ADMIN_TASK_IS_'.strtoupper($type).'');
+			$content['assigned_admin'] = GENERATE_AID_LINK($content['assigned_admin']);
 
-			$type2 = substr($text, 0, strpos($text, ":"));
 			// Generate infos
-			switch ($type)
+			switch ($content['task_type'])
 			{
 			case "EXTENSION":
 			case "EXTENSION_UPDATE":
-				$infos = substr($subj, 1, strpos($subj, ":") - 1);
+				$content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ":") - 1);
 				break;
 			}
 
-			if ($uid > 0) {
+			// Get task type
+			$content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).'');
+
+			if ($content['userid'] > 0) {
 				// Member found otherwise it's a system task
-				$uid = ADMIN_USER_PROFILE_LINK($uid);
+				$content['userid'] = ADMIN_USER_PROFILE_LINK($content['userid']);
 			} else {
-				$uid = "<em>{--ADMIN_IS_SYSTEM_TASK--}</em>";
+				$content['userid'] = "<em>{--ADMIN_IS_SYSTEM_TASK--}</em>";
 			}
 
 			// Prepare content
-			$content = array(
+			// @TODO Rewritings: admin->assigned_admin,uid->userid,type->task_type_msg in template
+			$content = merge_array($content, array(
 				'sw'      => $SW,
-				'id'      => $id,
-				'admin'   => $admin,
-				'infos'   => $infos,
-				'uid'     => $uid,
-				'type'    => $type_out,
-				'created' => MAKE_DATETIME($created, "2")
-			);
+				'admin'   => $content['assigned_admin'],
+				'uid'     => $content['userid'],
+				'type'    => $content['task_type_msg'],
+				'created' => MAKE_DATETIME($content['task_created'], "2")
+			));
 
 			// Do we have extension task?
-			if (($type == "EXTENSION") && (GET_EXT_VERSION($infos) == "")) {
+			if (($content['task_type'] == "EXTENSION") && (GET_EXT_VERSION($content['infos']) == "")) {
 				// Load extension row template
+				// @TODO Rewrite this to $OUT .= ..., true, ...
 				LOAD_TEMPLATE("admin_overview_list_ext_rows", false, $content);
 			} else {
 				// Load default row template
+				// @TODO Rewrite this to $OUT .= ..., true, ...
 				LOAD_TEMPLATE("admin_overview_list_rows", false, $content);
 			}
 
 			// Switch color
 			$SW = 3 - $SW;
 		}
+
 		// Free memory
 		SQL_FREERESULT($result_tasks);