Align updater class with index.php

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
nextcloud · Mar 23, 2021 · 3dc32a9 · 3dc32a9
1 parent b655d27
commit 3dc32a9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/index.php b/index.php
@@ -177,7 +177,7 @@ public function __construct($baseDir) {
 		require_once $configFileName;
 		$this->configValues = $CONFIG;
 
-		if (php_sapi_name() !== 'cli' && $this->configValues['upgrade.disable-web'] ?? false) {
+		if (php_sapi_name() !== 'cli' && ($this->configValues['upgrade.disable-web'] ?? false)) {
 			// updater disabled
 			$this->disabled = true;
 			return;

diff --git a/lib/Updater.php b/lib/Updater.php
@@ -36,6 +36,8 @@ class Updater {
 	private $updateAvailable = false;
 	/** @var string */
 	private $requestID = null;
+	/** @var bool */
+	private $disabled = false;
 
 	/**
 	 * Updater constructor
@@ -58,6 +60,12 @@ public function __construct($baseDir) {
 		require_once $configFileName;
 		$this->configValues = $CONFIG;
 
+		if (php_sapi_name() !== 'cli' && ($this->configValues['upgrade.disable-web'] ?? false)) {
+			// updater disabled
+			$this->disabled = true;
+			return;
+		}
+
 		$dataDir = $this->getDataDirectoryLocation();
 		if(empty($dataDir) || !is_string($dataDir)) {
 			throw new \Exception('Could not read data directory from config.php.');
@@ -93,6 +101,15 @@ public function __construct($baseDir) {
 		$this->buildTime = $buildTime;
 	}
 
+	/**
+	 * Returns whether the web updater is disabled
+	 *
+	 * @return bool
+	 */
+	public function isDisabled() {
+		return $this->disabled;
+	}
+
 	/**
 	 * Returns current version or "unknown" if this could not be determined.
 	 *