[Pkg-owncloud-commits] [owncloud] 106/199: Use OC\Config instead of OC_Config

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 43759f1f468fac8de4a8db0b8d94d004f6fb3745
Author: scolebrook <scolebrook at mac.com>
Date:   Wed May 28 16:26:13 2014 -0400

    Use OC\Config instead of OC_Config
---
 core/command/maintenance/mode.php | 19 ++++++++++++++-----
 core/register_command.php         |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/core/command/maintenance/mode.php b/core/command/maintenance/mode.php
index b4a7408..f26a113 100644
--- a/core/command/maintenance/mode.php
+++ b/core/command/maintenance/mode.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright (c) 2013 Robin Appelman <icewind at owncloud.com>
- * and Stephen Colebrook <scolebrook at mac.com>
+ * Copyright (c) 2013 Robin Appelman <icewind at owncloud.com> and
+ * Copyright (c) 2014 Stephen Colebrook <scolebrook at mac.com>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
@@ -9,6 +9,8 @@
 
 namespace OC\Core\Command\Maintenance;
 
+use OC\Config;
+
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -16,6 +18,13 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class Mode extends Command {
 
+	protected $config;
+
+	public function __construct(Config $config) {
+		$this->config = $config;
+		parent::__construct();
+	}
+
 	protected function configure() {
 		$this
 			->setName('maintenance:mode')
@@ -36,13 +45,13 @@ class Mode extends Command {
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		if ($input->getOption('on')) {
-			\OC_Config::setValue('maintenance', true);
+			$this->config->setValue('maintenance', true);
 			$output->writeln('Maintenance mode enabled');
 		} elseif ($input->getOption('off')) {
-			\OC_Config::setValue('maintenance', false);
+			$this->config->setValue('maintenance', false);
 			$output->writeln('Maintenance mode disabled');
 		} else {
-			if (\OC_Config::getValue('maintenance', false)) {
+			if ($this->config->getValue('maintenance', false)) {
 				$output->writeln('Maintenance mode is currently enabled');
 			} else {
 				$output->writeln('Maintenance mode is currently disabled');
diff --git a/core/register_command.php b/core/register_command.php
index 801fd98..8b1491a 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -12,7 +12,7 @@ $application->add(new OC\Core\Command\Db\GenerateChangeScript());
 $application->add(new OC\Core\Command\Db\ConvertType(OC_Config::getObject(), new \OC\DB\ConnectionFactory()));
 $application->add(new OC\Core\Command\Upgrade());
 $application->add(new OC\Core\Command\Maintenance\SingleUser());
-$application->add(new OC\Core\Command\Maintenance\Mode());
+$application->add(new OC\Core\Command\Maintenance\Mode(OC_Config::getObject()));
 $application->add(new OC\Core\Command\App\Disable());
 $application->add(new OC\Core\Command\App\Enable());
 $application->add(new OC\Core\Command\App\ListApps());

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git