From 0c77cd21f94dd9922e0e04ec4c7e99eff9376e07 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 6 Feb 2019 17:08:41 +0100 Subject: Make sure maintenance mode is always casted to bool Signed-off-by: Joas Schilling --- core/Command/Encryption/DecryptAll.php | 2 +- core/Command/Encryption/EncryptAll.php | 2 +- core/Command/Maintenance/Mode.php | 2 +- core/Command/Maintenance/Repair.php | 2 +- core/Command/Upgrade.php | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'core/Command') diff --git a/core/Command/Encryption/DecryptAll.php b/core/Command/Encryption/DecryptAll.php index 253223f9529..6ae90196963 100644 --- a/core/Command/Encryption/DecryptAll.php +++ b/core/Command/Encryption/DecryptAll.php @@ -89,7 +89,7 @@ class DecryptAll extends Command { */ protected function forceMaintenanceAndTrashbin() { $this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin'); - $this->wasMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false); + $this->wasMaintenanceModeEnabled = $this->config->getSystemValueBool('maintenance'); $this->config->setSystemValue('maintenance', true); $this->appManager->disableApp('files_trashbin'); } diff --git a/core/Command/Encryption/EncryptAll.php b/core/Command/Encryption/EncryptAll.php index b16fa0af2c7..7a257aac201 100644 --- a/core/Command/Encryption/EncryptAll.php +++ b/core/Command/Encryption/EncryptAll.php @@ -78,7 +78,7 @@ class EncryptAll extends Command { */ protected function forceMaintenanceAndTrashbin() { $this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin'); - $this->wasMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false); + $this->wasMaintenanceModeEnabled = $this->config->getSystemValueBool('maintenance'); $this->config->setSystemValue('maintenance', true); $this->appManager->disableApp('files_trashbin'); } diff --git a/core/Command/Maintenance/Mode.php b/core/Command/Maintenance/Mode.php index db4c9dc8c0b..1692eb08d87 100644 --- a/core/Command/Maintenance/Mode.php +++ b/core/Command/Maintenance/Mode.php @@ -59,7 +59,7 @@ class Mode extends Command { } protected function execute(InputInterface $input, OutputInterface $output) { - $maintenanceMode = $this->config->getSystemValue('maintenance', false); + $maintenanceMode = $this->config->getSystemValueBool('maintenance'); if ($input->getOption('on')) { if ($maintenanceMode === false) { $this->config->setSystemValue('maintenance', true); diff --git a/core/Command/Maintenance/Repair.php b/core/Command/Maintenance/Repair.php index e9595a22285..460bc6880c1 100644 --- a/core/Command/Maintenance/Repair.php +++ b/core/Command/Maintenance/Repair.php @@ -106,7 +106,7 @@ class Repair extends Command { } } - $maintenanceMode = $this->config->getSystemValue('maintenance', false); + $maintenanceMode = $this->config->getSystemValueBool('maintenance'); $this->config->setSystemValue('maintenance', true); $this->progress = new ProgressBar($output); diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php index 5a2deea0b6c..2d7ec4f688d 100644 --- a/core/Command/Upgrade.php +++ b/core/Command/Upgrade.php @@ -180,7 +180,7 @@ class Upgrade extends Command { $dispatcher->addListener('\OC\Repair::info', $repairListener); $dispatcher->addListener('\OC\Repair::warning', $repairListener); $dispatcher->addListener('\OC\Repair::error', $repairListener); - + $updater->listen('\OC\Updater', 'maintenanceEnabled', function () use($output) { $output->writeln('Turned on maintenance mode'); @@ -264,7 +264,7 @@ class Upgrade extends Command { } return self::ERROR_SUCCESS; - } else if($this->config->getSystemValue('maintenance', false)) { + } else if($this->config->getSystemValueBool('maintenance')) { //Possible scenario: Nextcloud core is updated but an app failed $output->writeln('Nextcloud is in maintenance mode'); $output->write('Maybe an upgrade is already in process. Please check the ' -- cgit v1.2.3