X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-list_task.php;h=0647775f9e0044a7b665b4ddc68108100244beae;hb=e9da1508b2a3ccbf63adc999981674740a47e074;hp=5d6c226cb7c985d83d5affeafd7bd81d3240b58e;hpb=63f159414369b5ea19a8ca75d8cd8033c45d8341;p=mailer.git

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index 5d6c226cb7..0647775f9e 100644
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -74,7 +74,7 @@ switch (getRequestElement('type')) {
 		break;
 
 	default: // Unknown type
-		logDebugMessage(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", getRequestElement('type')));
+		logDebugMessage(__FILE__, __LINE__, sprintf('Unknown task type %s detected.', getRequestElement('type')));
 		displayMessage('{%message,ADMIN_TASK_UNKNOWN_MODE' . getRequestElement('type') . '%}');
 		break;
 } // END - switch
@@ -87,8 +87,8 @@ if (!empty($whereStatement)) {
 		outputSeletectedTasks(postRequestArray(), $dmy);
 	} else {
 		// Start listing tasks matching selected filter
-		$result_tasks = SQL_QUERY('SELECT
-	`id`,`assigned_admin`,`userid`,`task_type`,`subject`,`text`,`task_created`
+		$result_tasks = sqlQuery('SELECT
+	`id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created`
 FROM
 	`{?_MYSQL_PREFIX?}_task_system`
 WHERE
@@ -104,7 +104,7 @@ ORDER BY
 			if (isFormSent('unassign')) {
 				// Unassign from tasks
 				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",
+					sqlQueryEscaped("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')) {
@@ -112,7 +112,7 @@ ORDER BY
 				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",
+						sqlQueryEscaped("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `id`=%s LIMIT 1",
 							array(bigintval($id)),__FILE__, __LINE__);
 					} else {
 						// Mark task as to be deleted (purged by autopurge extension)
@@ -121,12 +121,12 @@ ORDER BY
 				} // END - foreach
 			} else {
 				// Unknown action performed
-				reportBug(__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
-			$result_tasks = SQL_QUERY('SELECT
-	`id`,`assigned_admin`,`userid`,`task_type`,`subject`,`text`,`task_created`
+			$result_tasks = sqlQuery('SELECT
+	`id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created`
 FROM
 	`{?_MYSQL_PREFIX?}_task_system`
 WHERE
@@ -138,7 +138,7 @@ ORDER BY
 
 		// There are uncompleted jobs!
 		$OUT = '';
-		while ($content = SQL_FETCHARRAY($result_tasks)) {
+		while ($content = sqlFetchArray($result_tasks)) {
 			// Init infos
 			$content['infos'] = '';
 
@@ -151,7 +151,7 @@ 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 {
@@ -164,22 +164,22 @@ ORDER BY
 				'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
 
 		// Free memory
-		SQL_FREERESULT($result_tasks);
+		sqlFreeResult($result_tasks);
 
 		// Prepare content
 		$content = array(
-			'message' => '{--ADMIN_OVERVIEW_TASK_' . strtoupper(getRequestElement('type')) . '_TYPE--}',
+			'message' => '{--ADMIN_OVERVIEW_TASK_' . strtoupper(getRequestElement('type')) . '_TYPE_TITLE--}',
 			'type'    => getRequestElement('type'),
 			'rows'    => $OUT
 		);
@@ -187,10 +187,10 @@ ORDER BY
 		// Load footer template
 		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