X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_task.php;h=652fb048f002164beb67d7277bbdbff7361f14af;hb=ab92fb7241d00636b0eb940f147449758820cba1;hp=22dd312f094242c0876578ad0cf94349dba66392;hpb=2b15deea5b6e4ffcf14a3f9859e8a73e25b42aff;p=mailer.git

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index 22dd312f09..652fb048f0 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_ADMIN_ID(get_session('admin_login'))."' 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_ADMIN_ID(get_session('admin_login'))."' 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_ADMIN_ID(get_session('admin_login'))."' 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_ADMIN_ID(get_session('admin_login'))."' 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,16 +98,16 @@ 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) {
-					$result = 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_ADMIN_ID(get_session('admin_login'))), __FILE__, __LINE__);
+					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'])) {
 				// Delete tasks
 				foreach ($_POST['task'] as $id => $sel) {
 					if ($_GET['type'] == "deleted") {
 						// Delete task immediately
-						$result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_task_system WHERE id=%s LIMIT 1",
-						 array(bigintval($id)),__FILE__, __LINE__);
+						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)
 						ADMIN_DELETE_TASK($id);
@@ -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!
@@ -126,27 +126,20 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
 			'type'    => $_GET['type']
 		));
 		$SW = 2;
-		while (list($id, $admin, $uid, $type, $subj, $text, $created) = SQL_FETCHROW($result_tasks))
-		{
+		while (list($id, $admin, $uid, $type, $subj, $text, $created) = SQL_FETCHROW($result_tasks)) {
 			$infos = "---";
-			if ($admin == "0")
-			{
+			if ($admin == "0") {
 				// No admin currently is assigned
-				$admin = "<FONT class=\"admin_note\">".ADMIN_NO_ADMIN_ASSIGNED."</FONT>";
-			}
-			 else
-			{
+				$admin = "<div class=\"admin_note\">{--ADMIN_NO_ADMIN_ASSIGNED--}</div>";
+			} else {
 				// Load admin's data
 				$login = GET_ADMIN_LOGIN($admin);
-				if ($login != "***")
-				{
+				if ($login != "***") {
 					// Admin found
-					$admin = "<A href=\"".URL."/modules.php?module=admin&amp;what=admins_contct&amp;admin=".$admin."\">".$login."</A>";
-				}
-				 else
-				{
+					$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 +162,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
@@ -184,7 +177,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
 			);
 
 			// Do we have an extension task?
-			if ($type == "EXTENSION") {
+			if (($type == "EXTENSION") && (GET_EXT_VERSION($infos) == "")) {
 				// Load extension row template
 				LOAD_TEMPLATE("admin_list_task_ext_rows", false, $content);
 			} else {