X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_task.php;h=d56d74d9b15dc237b8df04754fe95e14229ac248;hb=49248176a5638be80b148ef55d0dc8c334522bf3;hp=d920bba3f123cdf36c660676c1b3de2c7a8402eb;hpb=a090e351c49fe021fb3064325694da03402332e0;p=mailer.git

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index d920bba3f1..d56d74d9b1 100644
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -38,10 +38,10 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 } elseif (!EXT_IS_ACTIVE('task')) {
-	addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'task');
+	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('task'));
 	return;
 }
 
@@ -53,43 +53,43 @@ if (!REQUEST_ISSET_GET(('type'))) REQUEST_SET_GET('type', "your");
 
 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'";
-	break;
-
-case "updates": // List only updates assigned to you
-	$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'";
-	break;
-
-case "unassigned": // List unassigned (but not deleted) tasks
-	$whereStatement = "assigned_admin='0' AND status != 'DELETED'";
-	break;
-
-case "deleted": // List all deleted
-	$whereStatement = "`status`='DELETED'";
-	break;
-
-case "closed": // List all 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.", REQUEST_GET('type')));
-	LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_TASK_UNKNOWN_MODE'), REQUEST_GET('type')));
-	break;
+	case "your": // List only your own open (new) tasks
+		$whereStatement = "`assigned_admin`='".getCurrentAdminId()."' AND `status`='NEW' AND task_type != 'EXTENSION_UPDATE'";
+		break;
+
+	case "updates": // List only updates assigned to you
+		$whereStatement = "`assigned_admin`=".getCurrentAdminId()." AND `status`='NEW' AND task_type = 'EXTENSION_UPDATE'";
+		break;
+
+	case "solved": // List only solved tasks assigned to you
+		$whereStatement = "`assigned_admin`=".getCurrentAdminId()." AND `status`='SOLVED'";
+		break;
+
+	case "unassigned": // List unassigned (but not deleted) tasks
+		$whereStatement = "`assigned_admin`=0 AND `status` != 'DELETED'";
+		break;
+
+	case "deleted": // List all deleted
+		$whereStatement = "`status`='DELETED'";
+		break;
+
+	case "closed": // List all closed
+		$whereStatement = "`assigned_admin`=".getCurrentAdminId()." AND `status`='CLOSED'";
+		break;
+
+	default: // Unknown type
+		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)) {
 	$SEL = 0;
-	if (REQUEST_ISSET_POST(('task'))) $SEL = SELECTION_COUNT(REQUEST_POST('task'));
+	if (REQUEST_ISSET_POST(('task'))) $SEL = countSelection(REQUEST_POST('task'));
 
 	if ((REQUEST_ISSET_POST(('assign'))) && ($SEL > 0)) {
 		// Assign / do tasks
-		LOAD_INC_ONCE("inc/modules/admin/overview-inc.php");
+		loadIncludeOnce("inc/modules/admin/overview-inc.php");
 		if (empty($dmy)) $dmy = '';
 		OUTPUT_SELECTED_TASKS(REQUEST_POST_ARRAY(), $dmy);
 	} else {
@@ -103,16 +103,16 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
 			if (REQUEST_ISSET_POST(('unassign'))) {
 				// Unassign from tasks
 				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__);
+					SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET `assigned_admin`=0 WHERE `id`=%s AND `assigned_admin`=%s LIMIT 1",
+					array(bigintval($id), getCurrentAdminId()), __FILE__, __LINE__);
 				}
 			} elseif (REQUEST_ISSET_POST('del')) {
 				// Delete tasks
 				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",
-							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);
@@ -134,10 +134,10 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
 		$OUT = ''; $SW = 2;
 		while ($content = SQL_FETCHARRAY($result_tasks)) {
 			// Init infos
-			$content['infos'] = "---";
+			$content['infos'] = '---';
 
 			// Generate link
-			$content['assigned_admin'] = GENERATE_AID_LINK($content['assigned_admin']);
+			$content['assigned_admin'] = generateAdminLink($content['assigned_admin']);
 
 			// Get admin task
 			$content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).'');
@@ -145,16 +145,16 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
 			// Generate infos
 			switch ($content['task_type'])
 			{
-			case "EXTENSION":
-			case "EXTENSION_UPDATE":
-				$content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ":") - 1);
-				break;
+				case 'EXTENSION':
+				case 'EXTENSION_UPDATE':
+					$content['infos'] = substr($content['subject'], 1, strpos($content['subject'], ':') - 1);
+					break;
 			}
 
 			// Member assigned with task?
 			if ($content['userid'] > 0) {
 				// Member found otherwise it's a system task
-				$content['userid'] = ADMIN_USER_PROFILE_LINK($content['userid']);
+				$content['userid'] = generateUserProfileLink($content['userid']);
 			} else {
 				// Is a system task!
 				$content['userid'] = "<em>{--ADMIN_IS_SYSTEM_TASK--}</em>";
@@ -167,11 +167,11 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
 				'admin'   => $content['assigned_admin'],
 				'uid'     => $content['userid'],
 				'type'    => $content['task_type_msg'],
-				'created' => MAKE_DATETIME($content['task_created'], "2")
+				'created' => generateDateTime($content['task_created'], '2')
 			));
 
 			// Do we have an extension task?
-			if (($content['task_type'] == "EXTENSION") && (GET_EXT_VERSION($content['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);