X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=f330994e938f64af9423e6ca82844a0c7563b5a8;hb=7c6a5b9e1e07dd360286130fe7e39000bfc68d4a;hp=1fe4ddca42a233e55e6b446c5f66dcd5a0dc7a17;hpb=e4bb9dcc763483e7cc6a11d57cad79cf2425cc6d;p=mailer.git

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 1fe4ddca42..f330994e93 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -8,7 +8,7 @@
  * -------------------------------------------------------------------- *
  * Short description : Output standard task management                  *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Standart-Aufgaben-Management ausgeben            *
+ * Kurzbeschreibung  : Standard-Aufgaben-Management ausgeben            *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -70,7 +70,7 @@ function outputStandardOverview (&$result_tasks) {
 			// Is the extension not yet installed?
 			if ($extInstalled === false) {
 				// We maybe want to install an extension so let's test-drive it...
-				if (loadExtension($ext_name, getExtensionMode(), '0.0', true)) {
+				if (loadExtension($ext_name, getExtensionMode(), '0.0.0', true)) {
 					// Create a task for newly installed extension (we ignore the task id here)
 					createNewExtensionTask($ext_name);
 				} // END - if
@@ -102,7 +102,7 @@ function outputStandardOverview (&$result_tasks) {
 
 	// At last - but not least - check for own and new unassigned tasks...
 	$result_tasks = SQL_QUERY_ESC("SELECT
-	`id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created`
+	`id`,`assigned_admin`,`userid`,`task_type`,`subject`,`text`,`task_created`
 FROM
 	`{?_MYSQL_PREFIX?}_task_system`
 WHERE
@@ -133,7 +133,7 @@ function outputSeletectedTasks ($postData, $result_tasks) {
 		$OUT = '';
 		foreach ($postData['sel'] as $taskId => $sel) {
 			$result_task = SQL_QUERY_ESC("SELECT
-	`id`, `userid`, `task_type`, `subject`, `text`, `task_created`, `status`, `assigned_admin`
+	`id`,`userid`,`task_type`,`subject`,`text`,`task_created`,`status`,`assigned_admin`
 FROM
 	`{?_MYSQL_PREFIX?}_task_system`
 WHERE
@@ -174,7 +174,7 @@ LIMIT 1",
 						$content = getUserDataArray();
 
 						// Generate HTML list entry
-						$add = '<li>{--ADMIN_MEMBER_UID--}: <strong>' . generateUserProfileLink($taskData['userid'], 'user_data') . ' (<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>)</strong></li>';
+						$add = '<li>{--ADMIN_MEMBER_USERID--}: <strong>' . generateUserProfileLink($taskData['userid'], 'user_data') . ' (<a href="' . generateEmailLink($content['email'], 'user_data') . '">{%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . '</a>)</strong></li>';
 					} else {
 						// Invalid userid, so log and zero it
 						logDebugMessage(__FUNCTION__, __LINE__, 'fetchUserData() failed: userid=' . $taskData['userid'] . ' not found.');
@@ -205,7 +205,7 @@ LIMIT 1",
 						// Is this non-productive?
 						if (isExtensionProductive() === false) {
 							// Issue warning
-							$taskData['text'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('ADMIN_EXTENSION_IS_NON_PRODUCTIVE', $ext_name)) . $taskData['text'];
+							$taskData['text'] = displayMessage('{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE=' . $ext_name . '%}', true) . $taskData['text'];
 						} // END - if
 
 						// Set current extension name
@@ -243,7 +243,7 @@ LIMIT 1",
 					// Add SQLs to a table
 					if ((!empty($ext_name)) && (isVerboseSqlEnabled())) {
 						// Add verbose SQL table
-						$taskData['text'] .= addExtensionVerboseSqlTable($title, ' class="table top left right"', true, '100%');
+						$taskData['text'] .= addExtensionVerboseSqlTable($title);
 					} // END - if
 				} elseif ((!empty($ext_name)) && (!empty($ext_ver))) {
 					// Run SQL commands in dry mode but only return the notes
@@ -310,7 +310,7 @@ LIMIT 1",
 						switch ($mode) {
 							default: // @TODO Unknown support mode
 							logDebugMessage(__FILE__, __LINE__, sprintf("Unknown support mode %s detected. This part is under construction!", $mode));
-							$OUT .= '<div class="notice medium">' . getMaskedMessage('ADMIN_UNKNOWN_SUPPORT_MODE', $mode) . '</div>';
+							$OUT .= '<div class="notice medium">{%message,ADMIN_UNKNOWN_SUPPORT_MODE=' . $mode . '%}</div>';
 							break;
 						} // END - switch
 						break;
@@ -412,7 +412,7 @@ LIMIT 1",
 			}
 
 			// Update query
-			$result_tasks = SQL_QUERY_ESC("SELECT `id`, `assigned_admin`, `userid`, `task_type`, `subject`, `text`, `task_created` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `assigned_admin`=%s OR ((`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status`='NEW') ORDER BY `task_created` DESC",
+			$result_tasks = SQL_QUERY_ESC("SELECT `id`,`assigned_admin`,`userid`,`task_type`,`subject`,`text`,`task_created` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `assigned_admin`=%s OR ((`assigned_admin`=0 OR `assigned_admin` IS NULL) AND `status`='NEW') ORDER BY `task_created` DESC",
 				array(getCurrentAdminId()), __FILE__, __LINE__);
 		} // END - if
 
@@ -431,9 +431,6 @@ LIMIT 1",
 					break;
 			} // END - switch
 
-			// Get task type
-			$content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}';
-
 			if (isValidUserId($content['userid'])) {
 				// Member found otherwise it's a system task
 				$content['userid'] = generateUserProfileLink($content['userid']);