X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Foverview-inc.php;h=abeab6b2fefc66983718a5fde4e7c69f8cfc27ff;hb=e5dde615db05fb62ebe91bd1c030f40c9b91fe17;hp=b9f2da4b2866b864976a2a06f31deac814b13a08;hpb=76fd13e5938a334f08e43893eb9a4ff49f72bf07;p=mailer.git

diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index b9f2da4b28..abeab6b2fe 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -71,13 +71,10 @@ function outputStandardOverview (&$result_tasks) {
 
 			// Is the extension not yet installed?
 			if ($extInstalled === false) {
-				// Generate subject line
-				$ext_subj = sprintf("[%s:]", $ext_name);
-
 				// We maybe want to install an extension so let's test-drive it...
 				if (loadExtension($ext_name, getExtensionMode(), '', true)) {
-					// Create a task for newly installed extension
-					createNewExtensionTask(getCurrentAdminId(), $ext_subj, $ext_name);
+					// Create a task for newly installed extension (we ignore the task id here)
+					createNewExtensionTask($ext_name);
 				} // END - if
 			} else {
 				// Test-drive extension in update mode
@@ -85,10 +82,10 @@ function outputStandardOverview (&$result_tasks) {
 
 				// Get extension version
 				$ext_ver = getExtensionVersion($ext_name);
-				//* DEBUG: */ outputHtml($ext_name."=".$ext_ver."<br />");
+				//* DEBUG: */ debugOutput($ext_name.'='.$ext_ver);
 
 				// Update extension if extension is installed and outdated
-				//* DEBUG: */ outputHtml('ext=' . $ext_name . ',ver=' . getThisExtensionVersion() . '/' . getExtensionVersion($ext_name)."<br />");
+				//* DEBUG: */ debugOutput('ext=' . $ext_name . ',ver=' . getThisExtensionVersion() . '/' . getExtensionVersion($ext_name));
 				if (getThisExtensionVersion() > $ext_ver) {
 					// Update the extension
 					updateExtension($ext_name, $ext_ver);
@@ -119,7 +116,7 @@ ORDER BY
 	`task_created` DESC",
 		array(getCurrentAdminId()), __FILE__, __LINE__);
 
-	if (SQL_NUMROWS($result_tasks) > 0) {
+	if (!SQL_HASZERONUMS($result_tasks)) {
 		// New jobs found!
 		$jobsDone = false;
 	} // END - if
@@ -135,7 +132,7 @@ ORDER BY
 function outputSeletectedTasks ($postData, $result_tasks) {
 	if ((isset($postData['assign'])) && (count($postData['sel']) > 0)) {
 		// Assign / do tasks
-		$OUT = ''; $SW = 2;
+		$OUT = '';
 		foreach ($postData['sel'] as $id => $sel) {
 			$result_task = SQL_QUERY_ESC("SELECT
 	`id`, `userid`, `task_type`, `subject`, `text`, `task_created`, `status`, `assigned_admin`
@@ -195,7 +192,7 @@ LIMIT 1",
 
 				// Initialize variables (no title for SQL commands by default)
 				$ext_name = ''; $ext_ver = '';
-				$title = getMessage('TASK_NO_TITLE');
+				$title = '{--TASK_NO_TITLE--}';
 
 				// Shall I list SQL commands assigned to an extension installation or update task?
 				if ((getConfig('verbose_sql') == 'Y')) {
@@ -220,7 +217,7 @@ LIMIT 1",
 						$taskData['text'] .= getExtensionNotes();
 
 						// Set title
-						$title = getMessage('ADMIN_SQLS_EXECUTED_ON_REGISTER');
+						$title = '{--ADMIN_SQLS_EXECUTED_ON_REGISTER--}';
 					} elseif ($taskData['task_type'] == 'EXTENSION_UPDATE') {
 						// Prepare extension name and version
 						$ext_name = substr($ext_name, 7);
@@ -239,7 +236,7 @@ LIMIT 1",
 						$taskData['text'] .= getExtensionNotes();
 
 						// Set title
-						$title = getMessage('ADMIN_SQLS_EXECUTED_ON_UPDATE');
+						$title = '{--ADMIN_SQLS_EXECUTED_ON_UPDATE--}';
 					} else {
 						// Remove extension's name
 						$ext_name = '';
@@ -266,12 +263,11 @@ LIMIT 1",
 
 				// Prepare array for the template
 				$content = array(
-					'sw'        => $SW,
-					'subject'   => $taskData['subject'],
-					'add'       => $add,
-					'text'      => $taskData['text'],
-					'created'   => generateDateTime($taskData['task_created'], 1),
-					'extension' => $ext_name
+					'subject'      => $taskData['subject'],
+					'add'          => $add,
+					'text'         => $taskData['text'],
+					'task_created' => generateDateTime($taskData['task_created'], 1),
+					'extension'    => $ext_name
 				);
 
 				// Load template
@@ -288,7 +284,7 @@ LIMIT 1",
 						SQL_FREERESULT($result_lines);
 						if ($lines == '0') {
 							// New extension found
-							$OUT .= loadTemplate('admin_ext_reg_form', true, array(
+							$OUT .= loadTemplate('admin_extension_reg_form', true, array(
 								'id'       => bigintval($id),
 								'ext_name' => $ext_name
 							));
@@ -397,9 +393,6 @@ LIMIT 1",
 
 			// Free result
 			SQL_FREERESULT($result_task);
-
-			// Switch colors
-			$SW = 3 - $SW;
 		} // END - foreach
 
 		// Load final template
@@ -430,13 +423,10 @@ LIMIT 1",
 		} // END - if
 
 		// There are uncompleted jobs!
-		$OUT = ''; $SW = 2;
+		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result_tasks)) {
 			// Init infos
-			$content['infos'] = '---';
-
-			// Generate assign link
-			$content['assigned_admin'] = generateAdminLink($content['assigned_admin']);
+			$content['infos'] = '';
 
 			// Generate infos
 			// @TODO Try to move this in includes
@@ -448,23 +438,17 @@ LIMIT 1",
 			}
 
 			// Get task type
-			$content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).'');
+			$content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}';
 
-			if ($content['userid'] > 0) {
+			if (isValidUserId($content['userid'])) {
 				// Member found otherwise it's a system task
 				$content['userid'] = generateUserProfileLink($content['userid']);
 			} else {
 				$content['userid'] = '<em>{--ADMIN_IS_SYSTEM_TASK--}</em>';
 			}
 
-			// Prepare content
-			$content = merge_array($content, array(
-				'sw'             => $SW,
-				'assigned_admin' => $content['assigned_admin'],
-				'userid'         => $content['userid'],
-				'task_type_msg'  => $content['task_type_msg'],
-				'created'        => generateDateTime($content['task_created'], 2)
-			));
+			// Add/translate some content
+			$content['task_created'] = generateDateTime($content['task_created'], 2);
 
 			// Do we have extension task?
 			if (($content['task_type'] == 'EXTENSION') && (isExtensionNameValid($content['infos'])) && (!isExtensionInstalled($content['infos']))) {
@@ -474,9 +458,6 @@ LIMIT 1",
 				// Load default row template
 				$OUT .= loadTemplate('admin_overview_list_rows', true, $content);
 			}
-
-			// Switch color
-			$SW = 3 - $SW;
 		} // END - while
 
 		// Free memory