diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-29 16:22:38 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-29 16:22:38 +0200 |
commit | 30f5fa42e5969a8052026e092eaee2c8ed718a65 (patch) | |
tree | f8e8c3ac50ece84045466a8f484137eb8606bab7 /lib | |
parent | b56af26199aaaf5ca2a2969b0886e6b9b1ae622f (diff) | |
parent | 372a9afabe9dc038e180312ef90fe9c11c692ef8 (diff) | |
download | nextcloud-server-30f5fa42e5969a8052026e092eaee2c8ed718a65.tar.gz nextcloud-server-30f5fa42e5969a8052026e092eaee2c8ed718a65.zip |
Merge pull request #17229 from owncloud/maintenance-plugin-test
Unit tests added for MaintenancePlugin
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/connector/sabre/maintenanceplugin.php | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/lib/private/connector/sabre/maintenanceplugin.php b/lib/private/connector/sabre/maintenanceplugin.php index 21d711e844c..634e5a68128 100644 --- a/lib/private/connector/sabre/maintenanceplugin.php +++ b/lib/private/connector/sabre/maintenanceplugin.php @@ -25,12 +25,16 @@ namespace OC\Connector\Sabre; +use OCP\IConfig; use Sabre\DAV\Exception\ServiceUnavailable; use Sabre\DAV\Server; use Sabre\DAV\ServerPlugin; class MaintenancePlugin extends ServerPlugin { + /** @var IConfig */ + private $config; + /** * Reference to main server object * @@ -39,6 +43,17 @@ class MaintenancePlugin extends ServerPlugin { private $server; /** + * @param IConfig $config + */ + public function __construct(IConfig $config = null) { + $this->config = $config; + if (is_null($config)) { + $this->config = \OC::$server->getConfig(); + } + } + + + /** * This initializes the plugin. * * This function is called by \Sabre\DAV\Server, after @@ -59,14 +74,13 @@ class MaintenancePlugin extends ServerPlugin { * in case the system is in maintenance mode. * * @throws ServiceUnavailable - * @internal param string $method * @return bool */ public function checkMaintenanceMode() { - if (\OC::$server->getSystemConfig()->getValue('singleuser', false)) { + if ($this->config->getSystemValue('singleuser', false)) { throw new ServiceUnavailable('System in single user mode.'); } - if (\OC::$server->getSystemConfig()->getValue('maintenance', false)) { + if ($this->config->getSystemValue('maintenance', false)) { throw new ServiceUnavailable('System in maintenance mode.'); } if (\OC::checkUpgrade(false)) { |