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

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index b9a66f3e4b..13c5d17a14 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(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "task");
 	return;
 }
 
@@ -44,20 +44,20 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 $whereStatement = "";
-if (empty($_GET['type'])) $_GET['type'] = "your";
+if (!REQUEST_ISSET_GET(('type'))) REQUEST_SET_GET('type', "your");
 
-switch ($_GET['type'])
+switch (REQUEST_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,48 +65,48 @@ 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
-	DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", $_GET['type']));
-	LOAD_TEMPLATE("admin_settings_saved", false, TASK_ADMIN_UNKNOWN_MODE_1.$_GET['type'].TASK_ADMIN_UNKNOWN_MODE_2);
+	DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown task type %s detected.", REQUEST_GET('type')));
+	LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_TASK_UNKNOWN_MODE'), REQUEST_GET('type')));
 	break;
 }
 
-if (!empty($whereStatement))
-{
+if (!empty($whereStatement)) {
 	$SEL = 0;
-	if (isset($_POST['task'])) $SEL = SELECTION_COUNT($_POST['task']);
-	if ((isset($_POST['assign'])) && ($SEL > 0)) {
+	if (REQUEST_ISSET_POST(('task'))) $SEL = SELECTION_COUNT(REQUEST_POST('task'));
+
+	if ((REQUEST_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);
+		OUTPUT_SELECTED_TASKS(REQUEST_POST_ARRAY(), $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())) {
 			// Only unassign / delete tasks when there are selected tasks posted
-			if (isset($_POST['unassign'])) {
+			if (REQUEST_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",
+				foreach (REQUEST_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",
 						array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
 				}
-			} elseif (isset($_POST['del'])) {
+			} elseif (REQUEST_ISSET_POST('del')) {
 				// Delete tasks
-				foreach ($_POST['task'] as $id => $sel) {
-					if ($_GET['type'] == "deleted") {
+				foreach (REQUEST_POST('task') as $id => $sel) {
+					if (REQUEST_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,79 +116,63 @@ 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!
-		$type = constant('ADMIN_OVERVIEW_TASK_'.strtoupper($_GET['type']).'_TYPE');
+		$type = getMessage('ADMIN_OVERVIEW_TASK_'.strtoupper(REQUEST_GET('type')).'_TYPE');
+		// @TODO Rewrite these templates to one and add $OUT
 		LOAD_TEMPLATE("admin_overview_header_task", false, array(
 			'message' => $type,
-			'type'    => $_GET['type']
+			'type'    => REQUEST_GET('type')
 		));
-		$SW = 2;
-		while (list($id, $admin, $uid, $type, $subj, $text, $created) = SQL_FETCHROW($result_tasks))
-		{
-			$infos = "---";
-			if ($admin == "0")
-			{
-				// No admin currently is assigned
-				$admin = "<FONT class=\"admin_note\">".ADMIN_NO_ADMIN_ASSIGNED."</FONT>";
-			}
-			 else
-			{
-				// Load admin's data
-				$login = GET_ADMIN_LOGIN($admin);
-				if ($login != "***")
-				{
-					// Admin found
-					$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>";
-				}
-			}
+		$OUT = ""; $SW = 2;
+		while ($content = SQL_FETCHARRAY($result_tasks)) {
+			// Init infos
+			$content['infos'] = "---";
+
+			// Generate link
+			$content['assigned_admin'] = GENERATE_AID_LINK($content['assigned_admin']);
 
 			// Get admin task
-			$type_out = constant('ADMIN_TASK_IS_'.strtoupper($type).'');
+			$content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).'');
 
-			$type2 = substr($text, 0, strpos($text, ":"));
 			// Generate infos
-			switch ($type)
+			switch ($content['task_type'])
 			{
 			case "EXTENSION":
 			case "EXTENSION_UPDATE":
-				$infos = substr($subj, 1, strpos($subj, ":") - 1);
+				$content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ":") - 1);
 				break;
 			}
 
 			// Member assigned with task?
-			if ($uid > 0) {
+			if ($content['userid'] > 0) {
 				// Member found otherwise it's a system task
-				$uid = ADMIN_USER_PROFILE_LINK($uid);
+				$content['userid'] = ADMIN_USER_PROFILE_LINK($content['userid']);
 			} else {
 				// Is a system task!
-				$uid = "<I>".ADMIN_IS_SYSTEM_TASK."</I>";
+				$content['userid'] = "<em>{--ADMIN_IS_SYSTEM_TASK--}</em>";
 			}
 
 			// Prepare content
-			$content = array(
+			// @TODO Rewritings: admin->assigned_admin,uid->userid,type->task_type_msg in template
+			$content = merge_array($content, array(
 				'sw'      => $SW,
-				'id'      => $id,
-				'admin'   => $admin,
-				'infos'   => $infos,
-				'uid'     => $uid,
-				'type'    => $type_out,
-				'created' => MAKE_DATETIME($created, "2")
-			);
+				'admin'   => $content['assigned_admin'],
+				'uid'     => $content['userid'],
+				'type'    => $content['task_type_msg'],
+				'created' => MAKE_DATETIME($content['task_created'], "2")
+			));
 
 			// Do we have an extension task?
-			if (($type == "EXTENSION") && (GET_EXT_VERSION($infos) == "")) {
+			if (($content['task_type'] == "EXTENSION") && (GET_EXT_VERSION($content['infos']) == "")) {
 				// Load extension row template
+				// @TODO Rewrite this to $OUT .= ..., true, ...
 				LOAD_TEMPLATE("admin_list_task_ext_rows", false, $content);
 			} else {
 				// Load default row template
+				// @TODO Rewrite this to $OUT .= ..., true, ...
 				LOAD_TEMPLATE("admin_list_task_rows", false, $content);
 			}
 
@@ -200,13 +184,10 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
 		SQL_FREERESULT($result_tasks);
 
 		// Load footer template
-		if ($_GET['type'] == "deleted")
-		{
+		if (REQUEST_GET('type') == "deleted") {
 			// Delete now button
 			LOAD_TEMPLATE("admin_overview_footer_task");
-		}
-		 else
-		{
+		} else {
 			// Normal footer
 			LOAD_TEMPLATE("admin_overview_footer");
 		}