From 0452fde212e45645503c4bc1cd4a1c8d7f911ec5 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Thu, 29 Jan 2015 09:17:58 +0100 Subject: Converted getCapabilities to non static function --- apps/files_sharing/lib/capabilities.php | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/apps/files_sharing/lib/capabilities.php b/apps/files_sharing/lib/capabilities.php index f6228e3ec7a..6e14a60921b 100644 --- a/apps/files_sharing/lib/capabilities.php +++ b/apps/files_sharing/lib/capabilities.php @@ -16,27 +16,44 @@ namespace OCA\Files_Sharing; */ class Capabilities { - /** - * @return \OC_OCS_Result + private $config; + + /* + * @codeCoverageIgnore + */ + public function __construct($config) { + $this->config = $config; + } + + /* + * @codeCoverageIgnore */ public static function getCapabilities() { $config = \OC::$server->getConfig(); + $cap = new Capabilities($config); + return $cap->getCaps(); + } + + /** + * @return \OC_OCS_Result + */ + public function getCaps() { $res = array(); - if ($config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') { + if ($this->config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') { $res['allow_links'] = true; - if ($config->getAppValue('core', 'shareapi_enforce_links_password', 'yes') === 'yes') { + if ($this->config->getAppValue('core', 'shareapi_enforce_links_password', 'yes') === 'yes') { $res['enforce_links_password'] = true; } - if ($config->getAppValue('core', 'shareapi_allow_public_upload', 'yes') === 'yes') { + if ($this->config->getAppValue('core', 'shareapi_allow_public_upload', 'yes') === 'yes') { $res['allow_public_upload'] = true; } $res = array('sharing' => $res); - } - + } + return new \OC_OCS_Result(array( 'capabilities' => array( 'files' => $res -- cgit v1.2.3