X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_task.php;h=0862a618d457b0e58b5bb9530f2c6d33afbf05ff;hb=2df9f7a53f8b1dd5164f87824a324ccb3b6634cb;hp=bdf63aeac40fe0b8b87c012e85301a1c1b51dcfc;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index bdf63aeac4..0862a618d4 100644
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
  * Mailer v0.2.1-FINAL                                Start: 08/03/2004 *
- * ================                             Last change: 08/07/2004 *
+ * ===================                          Last change: 08/07/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_task.php                               *
@@ -14,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -42,19 +41,16 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
-
-if (!isExtensionActive('task')) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('task'));
-	return;
-} // END - if
+addYouAreHereLink('admin', __FILE__);
 
 $whereStatement = '';
-if (!isGetRequestElementSet(('type'))) setRequestGetElement('type', 'your');
+if (!isGetRequestElementSet('type')) {
+	setGetRequestElement('type', 'your');
+} // END - if
 
 switch (getRequestElement('type')) {
 	case 'your': // List only your own open (new) tasks
-		$whereStatement = "`assigned_admin`='".getCurrentAdminId()."' AND `status`='NEW' AND `task_type` != 'EXTENSION_UPDATE'";
+		$whereStatement = "`assigned_admin`=".getCurrentAdminId()." AND `status`='NEW' AND `task_type` != 'EXTENSION_UPDATE'";
 		break;
 
 	case 'updates': // List only updates assigned to you
@@ -66,7 +62,7 @@ switch (getRequestElement('type')) {
 		break;
 
 	case 'unassigned': // List unassigned (but not deleted) tasks
-		$whereStatement = "`assigned_admin`=0 AND `status` != 'DELETED'";
+		$whereStatement = "(`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status` != 'DELETED'";
 		break;
 
 	case 'deleted': // List all deleted
@@ -79,14 +75,14 @@ switch (getRequestElement('type')) {
 
 	default: // Unknown type
 		logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", getRequestElement('type')));
-		loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_TASK_UNKNOWN_MODE'), getRequestElement('type')));
+		displayMessage('{%message,ADMIN_TASK_UNKNOWN_MODE' . getRequestElement('type') . '%}');
 		break;
-}
+} // END - switch
 
 if (!empty($whereStatement)) {
-	if ((isPostRequestElementSet('assign')) && (countPostSelection() > 0)) {
+	if ((isPostRequestElementSet('assign')) && (ifPostContainsSelections())) {
 		// Assign / do tasks
-		loadIncludeOnce("inc/modules/admin/overview-inc.php");
+		loadIncludeOnce('inc/modules/admin/overview-inc.php');
 		if (empty($dmy)) $dmy = '';
 		outputSeletectedTasks(postRequestArray(), $dmy);
 	} else {
@@ -103,15 +99,15 @@ ORDER BY
 	`subject` ASC,
 	`task_created` DESC',
 			__FILE__, __LINE__);
-		if ((countPostSelection() > 0) && (!isDemoModeActive())) {
+		if ((ifPostContainsSelections()) && (!isDemoModeActive())) {
 			// Only unassign / delete tasks when there are selected tasks posted
-			if (isPostRequestElementSet('unassign')) {
+			if (isFormSent('unassign')) {
 				// Unassign from tasks
 				foreach (postRequestElement('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",
+					SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=NULL WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
 						array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
-				}
-			} elseif (isPostRequestElementSet('del')) {
+				} // END - foreach
+			} elseif (isFormSent('delete')) {
 				// Delete tasks
 				foreach (postRequestElement('sel') as $id => $sel) {
 					if (getRequestElement('type') == 'deleted') {
@@ -122,10 +118,10 @@ ORDER BY
 						// Mark task as to be deleted (purged by autopurge extension)
 						adminDeleteTask($id);
 					}
-				}
+				} // END - foreach
 			} else {
 				// Unknown action performed
-				debug_report_bug(sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r(postRequestArray(), true)));
+				reportBug(__FILE__, __LINE__, sprintf("Unknown task action performed. data=<pre>%s</pre>", print_r(postRequestArray(), true)));
 			}
 
 			// Update query
@@ -141,22 +137,10 @@ ORDER BY
 		}
 
 		// There are uncompleted jobs!
-		$type = getMessage('ADMIN_OVERVIEW_TASK_'.strtoupper(getRequestElement('type')).'_TYPE');
-		// @TODO Rewrite these templates to one and add $OUT
-		loadTemplate('admin_overview_header_task', false, array(
-			'message' => $type,
-			'type'    => getRequestElement('type')
-		));
-		$OUT = ''; $SW = 2;
+		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result_tasks)) {
 			// Init infos
-			$content['infos'] = '---';
-
-			// Generate link
-			$content['assigned_admin'] = generateAdminLink($content['assigned_admin']);
-
-			// Get admin task
-			$content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).'');
+			$content['infos'] = '';
 
 			// Generate infos
 			switch ($content['task_type']) {
@@ -167,52 +151,49 @@ ORDER BY
 			} // END - switch
 
 			// Member assigned with task?
-			if ($content['userid'] > 0) {
+			if (isValidUserId($content['userid'])) {
 				// Member found otherwise it's a system task
 				$content['userid'] = generateUserProfileLink($content['userid']);
 			} else {
 				// Is a system task!
-				$content['userid'] = '<em>{--ADMIN_IS_SYSTEM_TASK--}</em>';
+				$content['userid'] = '{--ADMIN_IS_SYSTEM_TASK--}';
 			}
 
 			// Prepare content
-			// @TODO Rewritings: admin->assigned_admin,userid->userid,type->task_type_msg in template
 			$content = merge_array($content, array(
-				'sw'      => $SW,
-				'admin'   => $content['assigned_admin'],
-				'userid'  => $content['userid'],
-				'type'    => $content['task_type_msg'],
-				'created' => generateDateTime($content['task_created'], 2)
+				'task_created'  => generateDateTime($content['task_created'], 2)
 			));
 
-			// Do we have an extension task?
-			if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) {
+			// Is there an extension task?
+			if (isExtensionTask($content)) {
 				// Load extension row template
-				// @TODO Rewrite this to $OUT .= ..., true, ...
-				loadTemplate('admin_list_task_ext_rows', false, $content);
+				$OUT .= loadTemplate('admin_list_task_ext_rows', true, $content);
 			} else {
 				// Load default row template
-				// @TODO Rewrite this to $OUT .= ..., true, ...
-				loadTemplate('admin_list_task_rows', false, $content);
+				$OUT .= loadTemplate('admin_list_task_rows', true, $content);
 			}
-
-			// Switch colors
-			$SW = 3 - $SW;
-		}
+		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result_tasks);
 
+		// Prepare content
+		$content = array(
+			'message' => '{--ADMIN_OVERVIEW_TASK_' . strtoupper(getRequestElement('type')) . '_TYPE--}',
+			'type'    => getRequestElement('type'),
+			'rows'    => $OUT
+		);
+
 		// Load footer template
 		if (getRequestElement('type') == 'deleted') {
 			// Delete now button
-			loadTemplate('admin_overview_footer_task');
+			loadTemplate('admin_list_task_delete', false, $content);
 		} else {
 			// Normal footer
-			loadTemplate('admin_overview_footer');
+			loadTemplate('admin_list_task', false, $content);
 		}
 	}
-}
+} // END - if
 
 // [EOF]
 ?>