diff options
Diffstat (limited to 'apps/encryption/appinfo')
| -rw-r--r-- | apps/encryption/appinfo/info.xml | 4 | ||||
| -rw-r--r-- | apps/encryption/appinfo/register_command.php | 38 |
2 files changed, 4 insertions, 38 deletions
diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml index 539f9f116d2..f6632b2ae92 100644 --- a/apps/encryption/appinfo/info.xml +++ b/apps/encryption/appinfo/info.xml @@ -30,4 +30,8 @@ <settings> <admin>OCA\Encryption\Settings\Admin</admin> </settings> + <commands> + <command>OCA\Encryption\Command\EnableMasterKey</command> + <command>OCA\Encryption\Command\MigrateKeys</command> + </commands> </info> diff --git a/apps/encryption/appinfo/register_command.php b/apps/encryption/appinfo/register_command.php deleted file mode 100644 index ced82d21a64..00000000000 --- a/apps/encryption/appinfo/register_command.php +++ /dev/null @@ -1,38 +0,0 @@ -<?php -/** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Björn Schießle <bjoern@schiessle.org> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * 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, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * - */ - -use OCA\Encryption\Command\MigrateKeys; -use Symfony\Component\Console\Helper\QuestionHelper; - -$userManager = OC::$server->getUserManager(); -$view = new \OC\Files\View(); -$config = \OC::$server->getConfig(); -$l = \OC::$server->getL10N('encryption'); -$userSession = \OC::$server->getUserSession(); -$connection = \OC::$server->getDatabaseConnection(); -$logger = \OC::$server->getLogger(); -$questionHelper = new QuestionHelper(); -$crypt = new \OCA\Encryption\Crypto\Crypt($logger, $userSession, $config, $l); -$util = new \OCA\Encryption\Util($view, $crypt, $logger, $userSession, $config, $userManager); - -$application->add(new MigrateKeys($userManager, $view, $connection, $config, $logger)); -$application->add(new \OCA\Encryption\Command\EnableMasterKey($util, $config, $questionHelper)); |