X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_task.php;h=7298f63cc2066347da2b9fd563190777b62b1c29;hp=9acf12533250745284b733f5f766e5d6e7f3c2b0;hb=ca256746fe0757a23df4064824c8fe2087ad5634;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index 9acf125332..7298f63cc2 100644
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * 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 *
@@ -43,15 +43,12 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (!isExtensionActive('task')) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('task'));
-	return;
-} // END - if
-
 $whereStatement = '';
-if (!isGetRequestParameterSet('type')) setGetRequestParameter('type', 'your');
+if (!isGetRequestElementSet('type')) {
+	setGetRequestElement('type', 'your');
+} // END - if
 
-switch (getRequestParameter('type')) {
+switch (getRequestElement('type')) {
 	case 'your': // List only your own open (new) tasks
 		$whereStatement = "`assigned_admin`=".getCurrentAdminId()." AND `status`='NEW' AND `task_type` != 'EXTENSION_UPDATE'";
 		break;
@@ -65,7 +62,7 @@ switch (getRequestParameter('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
@@ -77,13 +74,13 @@ switch (getRequestParameter('type')) {
 		break;
 
 	default: // Unknown type
-		logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", getRequestParameter('type')));
-		loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_TASK_UNKNOWN_MODE', getRequestParameter('type')));
+		logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", getRequestElement('type')));
+		displayMessage('{%message,ADMIN_TASK_UNKNOWN_MODE' . getRequestElement('type') . '%}');
 		break;
 } // END - switch
 
 if (!empty($whereStatement)) {
-	if ((isPostRequestParameterSet('assign')) && (ifPostContainsSelections())) {
+	if ((isPostRequestElementSet('assign')) && (ifPostContainsSelections())) {
 		// Assign / do tasks
 		loadIncludeOnce('inc/modules/admin/overview-inc.php');
 		if (empty($dmy)) $dmy = '';
@@ -104,16 +101,16 @@ ORDER BY
 			__FILE__, __LINE__);
 		if ((ifPostContainsSelections()) && (!isDemoModeActive())) {
 			// Only unassign / delete tasks when there are selected tasks posted
-			if (isPostRequestParameterSet('unassign')) {
+			if (isFormSent('unassign')) {
 				// Unassign from tasks
-				foreach (postRequestParameter('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",
+				foreach (postRequestElement('sel') as $id => $sel) {
+					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__);
 				} // END - foreach
 			} elseif (isFormSent('delete')) {
 				// Delete tasks
-				foreach (postRequestParameter('sel') as $id => $sel) {
-					if (getRequestParameter('type') == 'deleted') {
+				foreach (postRequestElement('sel') as $id => $sel) {
+					if (getRequestElement('type') == 'deleted') {
 						// Delete task immediately
 						SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s LIMIT 1",
 							array(bigintval($id)),__FILE__, __LINE__);
@@ -124,7 +121,7 @@ ORDER BY
 				} // END - foreach
 			} else {
 				// Unknown action performed
-				debug_report_bug(__FILE__, __LINE__, 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
@@ -145,9 +142,6 @@ ORDER BY
 			// Init infos
 			$content['infos'] = '';
 
-			// Get admin task
-			$content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}';
-
 			// Generate infos
 			switch ($content['task_type']) {
 				case 'EXTENSION':
@@ -157,29 +151,26 @@ ORDER BY
 			} // END - switch
 
 			// Member assigned with task?
-			if (isValidUserId($content['userid'])) {
+			if (isValidId($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
 			$content = merge_array($content, array(
-				'assign_admin'  => $content['assigned_admin'],
-				'userid'        => $content['userid'],
-				'task_type_msg' => $content['task_type_msg'],
 				'task_created'  => generateDateTime($content['task_created'], 2)
 			));
 
-			// Do we have an extension task?
+			// Is there an extension task?
 			if (isExtensionTask($content)) {
 				// Load extension row template
-				$OUT .= loadTemplate('admin_list_task_ext_rows', true, $content);
+				$OUT .= loadTemplate('admin_list_task_ext_rows', TRUE, $content);
 			} else {
 				// Load default row template
-				$OUT .= loadTemplate('admin_list_task_rows', true, $content);
+				$OUT .= loadTemplate('admin_list_task_rows', TRUE, $content);
 			}
 		} // END - while
 
@@ -188,18 +179,18 @@ ORDER BY
 
 		// Prepare content
 		$content = array(
-			'message' => '{--ADMIN_OVERVIEW_TASK_' . strtoupper(getRequestParameter('type')) . '_TYPE--}',
-			'type'    => getRequestParameter('type'),
+			'message' => '{--ADMIN_OVERVIEW_TASK_' . strtoupper(getRequestElement('type')) . '_TYPE--}',
+			'type'    => getRequestElement('type'),
 			'rows'    => $OUT
 		);
 
 		// Load footer template
-		if (getRequestParameter('type') == 'deleted') {
+		if (getRequestElement('type') == 'deleted') {
 			// Delete now button
-			loadTemplate('admin_list_task_delete', false, $content);
+			loadTemplate('admin_list_task_delete', FALSE, $content);
 		} else {
 			// Normal footer
-			loadTemplate('admin_list_task', false, $content);
+			loadTemplate('admin_list_task', FALSE, $content);
 		}
 	}
 } // END - if