From 5e786faa6c577abfd48976a6839f61d08b0a6e5e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 24 May 2018 15:35:46 +0200
Subject: Introduce proper constants for taskmanager status

---
 modules-available/sysconfig/addmodule_custommodule.inc.php | 4 ++--
 modules-available/sysconfig/inc/configmodule.inc.php       | 2 +-
 modules-available/sysconfig/inc/configtgz.inc.php          | 2 +-
 modules-available/sysconfig/page.inc.php                   | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'modules-available')

diff --git a/modules-available/sysconfig/addmodule_custommodule.inc.php b/modules-available/sysconfig/addmodule_custommodule.inc.php
index 8c24a071..c234f765 100644
--- a/modules-available/sysconfig/addmodule_custommodule.inc.php
+++ b/modules-available/sysconfig/addmodule_custommodule.inc.php
@@ -62,7 +62,7 @@ class CustomModule_ProcessUpload extends AddModule_Base
 			unlink($tempfile);
 			$this->tmError();
 		}
-		if ($status['statusCode'] != TASK_FINISHED) {
+		if ($status['statusCode'] != Taskmanager::TASK_FINISHED) {
 			unlink($tempfile);
 			$this->taskError($status);
 		}
@@ -128,7 +128,7 @@ class CustomModule_CompressModule extends AddModule_Base
 		if (!isset($status['statusCode'])) {
 			$this->tmError();
 		}
-		if ($status['statusCode'] != TASK_FINISHED) {
+		if ($status['statusCode'] != Taskmanager::TASK_FINISHED) {
 			$this->taskError($status);
 		}
 		// Seems ok, create entry
diff --git a/modules-available/sysconfig/inc/configmodule.inc.php b/modules-available/sysconfig/inc/configmodule.inc.php
index 2cee37a9..b6db9c4f 100644
--- a/modules-available/sysconfig/inc/configmodule.inc.php
+++ b/modules-available/sysconfig/inc/configmodule.inc.php
@@ -354,7 +354,7 @@ abstract class ConfigModule
 		// Wait for generation if requested
 		if ($timeoutMs > 0 && isset($ret['id']) && !Taskmanager::isFinished($ret))
 			$ret = Taskmanager::waitComplete($ret, $timeoutMs);
-		if ($ret === true || (isset($ret['statusCode']) && $ret['statusCode'] === TASK_FINISHED)) {
+		if ($ret === true || (isset($ret['statusCode']) && $ret['statusCode'] === Taskmanager::TASK_FINISHED)) {
 			// Already Finished
 			if (file_exists($this->moduleArchive) && !file_exists($tmpTgz))
 				$tmpTgz = false; // If generateInternal succeeded and there's no tmpTgz, it means the file didn't have to be updated
diff --git a/modules-available/sysconfig/inc/configtgz.inc.php b/modules-available/sysconfig/inc/configtgz.inc.php
index 5b459a2e..7b042cdb 100644
--- a/modules-available/sysconfig/inc/configtgz.inc.php
+++ b/modules-available/sysconfig/inc/configtgz.inc.php
@@ -112,7 +112,7 @@ class ConfigTgz
 		// Wait for completion
 		if ($timeoutMs > 0 && !Taskmanager::isFailed($task) && !Taskmanager::isFinished($task))
 			$task = Taskmanager::waitComplete($task, $timeoutMs);
-		if ($task === true || (isset($task['statusCode']) && $task['statusCode'] === TASK_FINISHED)) {
+		if ($task === true || (isset($task['statusCode']) && $task['statusCode'] === Taskmanager::TASK_FINISHED)) {
 			// Success!
 			$this->markUpdated();
 			return true;
diff --git a/modules-available/sysconfig/page.inc.php b/modules-available/sysconfig/page.inc.php
index 8d1799af..515d432c 100644
--- a/modules-available/sysconfig/page.inc.php
+++ b/modules-available/sysconfig/page.inc.php
@@ -425,12 +425,12 @@ class Page_SysConfig extends Page
 		$task = Taskmanager::submit('DeleteFile', array(
 			'file' => $row['filepath']
 		));
-		if (isset($task['statusCode']) && $task['statusCode'] === TASK_WAITING) {
+		if (isset($task['statusCode']) && $task['statusCode'] === Taskmanager::TASK_WAITING) {
 			$task = Taskmanager::waitComplete($task['id']);
 		}
-		if (!isset($task['statusCode']) || $task['statusCode'] === TASK_ERROR) {
+		if (!isset($task['statusCode']) || $task['statusCode'] === Taskmanager::TASK_ERROR) {
 			Message::addWarning('main.task-error', $task['data']['error']);
-		} elseif ($task['statusCode'] === TASK_FINISHED) {
+		} elseif ($task['statusCode'] === Taskmanager::TASK_FINISHED) {
 			Message::addSuccess('module-deleted', $row['title']);
 		}
 		Database::exec("DELETE FROM configtgz_module WHERE moduleid = :moduleid LIMIT 1", array('moduleid' => $moduleid));
-- 
cgit v1.2.3-55-g7522