mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4274 from nextcloud/fix-share-by-mail-capabilities 

move share by mail capabilities to the share provider
This commit is contained in:
Roeland Jago Douma 2017-04-10 19:50:13 +02:00 committed by GitHub
parent 18580395d4 cbacca4202
commit a750436ebc
5 changed files with 98 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/files_sharing/lib/Capabilities.php
View File

@ -21,7 +21,6 @@
*/
namespace OCA\Files_Sharing;
use OCP\App\IAppManager;
use OCP\Capabilities\ICapability;
use \OCP\IConfig;
@ -35,12 +34,8 @@ class Capabilities implements ICapability {
/** @var IConfig */
private $config;
/** @var IAppManager */
private $appManager;
public function __construct(IConfig $config, IAppManager $appManager) {
public function __construct(IConfig $config) {
$this->config = $config;
$this->appManager = $appManager;
}
/**
@ -99,15 +94,6 @@ class Capabilities implements ICapability {
'expire_date' => ['enabled' => true]
];
if ($this->appManager->isEnabledForUser('sharebymail')) {
$res['mailshare'] = [
'enabled' => true,
'upload_files_drop' => ['enabled' => true],
'password' => ['enabled' => true],
'expire_date' => ['enabled' => true]
];
}
return [
'files_sharing' => $res,
];

4
apps/files_sharing/tests/CapabilitiesTest.php
View File

@ -57,9 +57,7 @@ class CapabilitiesTest extends \Test\TestCase {
private function getResults(array $map) {
$config = $this->getMockBuilder('\OCP\IConfig')->disableOriginalConstructor()->getMock();
$config->method('getAppValue')->will($this->returnValueMap($map));
$appManager = $this->getMockBuilder(IAppManager::class)->getMock();
$appManager->expects($this->any())->method('isEnabledForUser')->with('sharebymail')->willReturn(true);
$cap = new Capabilities($config, $appManager);
$cap = new Capabilities($config);
$result = $this->getFilesSharingPart($cap->getCapabilities());
return $result;
}

4
apps/sharebymail/appinfo/app.php
View File

@ -19,6 +19,4 @@
*
*/
$settings = new \OCA\ShareByMail\Settings();
\OCP\Util::connectHook('\OCP\Config', 'js', $settings, 'announceShareProvider');
$app = new \OCA\ShareByMail\AppInfo\Application();

45
apps/sharebymail/lib/AppInfo/Application.php Normal file
View File

@ -0,0 +1,45 @@
<?php
/**
* @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\ShareByMail\AppInfo;
use OCA\ShareByMail\Settings;
use OCP\AppFramework\App;
use OCP\Util;
class Application extends App {
public function __construct(array $urlParams = array()) {
parent::__construct('sharebymail', $urlParams);
$settings = new Settings();
/** register capabilities */
$container = $this->getContainer();
$container->registerCapability('OCA\ShareByMail\Capabilities');
/** register hooks */
Util::connectHook('\OCP\Config', 'js', $settings, 'announceShareProvider');
}
}

50
apps/sharebymail/lib/Capabilities.php Normal file
View File

@ -0,0 +1,50 @@
<?php
/**
* @copyright Copyright (c) 2017 Bjoern Schiessle <bjoern@schiessle.org>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\ShareByMail;
use OCP\Capabilities\ICapability;
class Capabilities implements ICapability {
/**
* Function an app uses to return the capabilities
*
* @return array Array containing the apps capabilities
* @since 8.2.0
*/
public function getCapabilities() {
return [
'files_sharing' =>
[
'sharebymail' =>
[
'enabled' => true,
'upload_files_drop' => ['enabled' => true],
'password' => ['enabled' => true],
'expire_date' => ['enabled' => true]
]
]
];
}
}