X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_task.php;h=abdf5274d0553165c9fe3ebf75a632f4e878f646;hp=b9a66f3e4b853c7f63ba90329b3ddd1acf2197b0;hb=c47144dd555bbab4acdf9085e4623900dedb0e7c;hpb=89c00e43d2ce1dd1afe11c2c8485307342805f97

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index b9a66f3e4b..abdf5274d0 100644
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -36,7 +36,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 } elseif (!EXT_IS_ACTIVE("task")) {
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "task");
+	addFatalMessage(EXTENSION_PROBLEM_EXT_INACTIVE, "task");
 	return;
 }
 
@@ -49,15 +49,15 @@ if (empty($_GET['type'])) $_GET['type'] = "your";
 switch ($_GET['type'])
 {
 case "your": // List only your own open (new) tasks
-	$whereStatement = "assigned_admin='".GET_CURRENT_ADMIN_ID()."' AND status='NEW' AND task_type != 'EXTENSION_UPDATE'";
+	$whereStatement = "assigned_admin='".GET_CURRENT_ADMIN_ID()."' AND `status`='NEW' AND task_type != 'EXTENSION_UPDATE'";
 	break;
 
 case "updates": // List only updates assigned to you
-	$whereStatement = "assigned_admin=".GET_CURRENT_ADMIN_ID()." AND status='NEW' AND task_type = 'EXTENSION_UPDATE'";
+	$whereStatement = "assigned_admin=".GET_CURRENT_ADMIN_ID()." AND `status`='NEW' AND task_type = 'EXTENSION_UPDATE'";
 	break;
 
 case "solved": // List only solved tasks assigned to you
-	$whereStatement = "assigned_admin=".GET_CURRENT_ADMIN_ID()." AND status='SOLVED'";
+	$whereStatement = "assigned_admin=".GET_CURRENT_ADMIN_ID()." AND `status`='SOLVED'";
 	break;
 
 case "unassigned": // List unassigned (but not deleted) tasks
@@ -65,11 +65,11 @@ case "unassigned": // List unassigned (but not deleted) tasks
 	break;
 
 case "deleted": // List all deleted
-	$whereStatement = "status='DELETED'";
+	$whereStatement = "`status`='DELETED'";
 	break;
 
 case "closed": // List all closed
-	$whereStatement = "assigned_admin=".GET_CURRENT_ADMIN_ID()." AND status='CLOSED'";
+	$whereStatement = "assigned_admin=".GET_CURRENT_ADMIN_ID()." AND `status`='CLOSED'";
 	break;
 
 default: // Unknown type
@@ -84,13 +84,13 @@ if (!empty($whereStatement))
 	if (isset($_POST['task'])) $SEL = SELECTION_COUNT($_POST['task']);
 	if ((isset($_POST['assign'])) && ($SEL > 0)) {
 		// Assign / do tasks
-		require_once(PATH."inc/modules/admin/overview-inc.php");
+		LOAD_INC_ONCE("inc/modules/admin/overview-inc.php");
 		if (empty($dmy)) $dmy = "";
 		OUTPUT_SELECTED_TASKS($_POST, $dmy);
 	} else {
 		// Start listing tasks matching selected filter
 		$result_tasks = SQL_QUERY("SELECT id, assigned_admin, userid, task_type, subject, text, task_created
-FROM "._MYSQL_PREFIX."_task_system
+FROM `{!_MYSQL_PREFIX!}_task_system`
 WHERE ".$whereStatement."
 ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __LINE__);
 		if (($SEL > 0) && (!IS_DEMO())) {
@@ -98,7 +98,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
 			if (isset($_POST['unassign'])) {
 				// Unassign from tasks
 				foreach ($_POST['task'] 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=0 WHERE id=%s AND assigned_admin=%s LIMIT 1",
 						array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
 				}
 			} elseif (isset($_POST['del'])) {
@@ -106,7 +106,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
 				foreach ($_POST['task'] as $id => $sel) {
 					if ($_GET['type'] == "deleted") {
 						// Delete task immediately
-						SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_task_system WHERE id=%s LIMIT 1",
+						SQL_QUERY_ESC("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 autppurge extension)
@@ -116,7 +116,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
 			}
 
 			// Update query
-			$result_tasks = SQL_QUERY("SELECT id, assigned_admin, userid, task_type, subject, text, task_created FROM "._MYSQL_PREFIX."_task_system WHERE ".$whereStatement." ORDER BY subject, task_created DESC", __FILE__, __LINE__);
+			$result_tasks = SQL_QUERY("SELECT id, assigned_admin, userid, task_type, subject, text, task_created FROM `{!_MYSQL_PREFIX!}_task_system` WHERE ".$whereStatement." ORDER BY subject, task_created DESC", __FILE__, __LINE__);
 		}
 
 		// There are uncompleted jobs!
@@ -132,7 +132,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
 			if ($admin == "0")
 			{
 				// No admin currently is assigned
-				$admin = "<FONT class=\"admin_note\">".ADMIN_NO_ADMIN_ASSIGNED."</FONT>";
+				$admin = "<div class=\"admin_note\">{!ADMIN_NO_ADMIN_ASSIGNED!}</div>";
 			}
 			 else
 			{
@@ -141,12 +141,12 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
 				if ($login != "***")
 				{
 					// Admin found
-					$admin = "<A href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</A>";
+					$admin = "<a href=\"{!URL!}/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</a>";
 				}
 				 else
 				{
 					// Maybe deleted?
-					$admin = "<FONT class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</FONT>";
+					$admin = "<div class=\"admin_note\">".ADMIN_ID_404_1.$admin.ADMIN_ID_404_2."</div>";
 				}
 			}
 
@@ -169,7 +169,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
 				$uid = ADMIN_USER_PROFILE_LINK($uid);
 			} else {
 				// Is a system task!
-				$uid = "<I>".ADMIN_IS_SYSTEM_TASK."</I>";
+				$uid = "<em>".ADMIN_IS_SYSTEM_TASK."</em>";
 			}
 
 			// Prepare content