From 458c2fa2971e6595a18a289b0afeb4a79ea0e0d3 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Thu, 12 May 2022 17:08:54 +0200 Subject: Remove OCP\App and OCP\BackgroundJob Both deprecated since NC 23 IAppManager is the replacement for OCP\App unfortunately it can't be dependency injected in classes used by the installed otherwise the database connection is initialised too early Signed-off-by: Carl Schwan --- core/Command/Maintenance/Repair.php | 2 +- core/Command/User/ResetPassword.php | 9 ++++++--- core/register_command.php | 2 +- core/templates/installation.php | 2 +- core/templates/layout.base.php | 6 +++--- core/templates/layout.guest.php | 8 ++++---- 6 files changed, 16 insertions(+), 13 deletions(-) (limited to 'core') diff --git a/core/Command/Maintenance/Repair.php b/core/Command/Maintenance/Repair.php index aa0f6a2a086..2c1fda7c8e4 100644 --- a/core/Command/Maintenance/Repair.php +++ b/core/Command/Maintenance/Repair.php @@ -82,7 +82,7 @@ class Repair extends Command { if (!$this->appManager->isEnabledForUser($app)) { continue; } - $info = \OC_App::getAppInfo($app); + $info = $this->appManager->getAppInfo($app); if (!is_array($info)) { continue; } diff --git a/core/Command/User/ResetPassword.php b/core/Command/User/ResetPassword.php index 21bc5cc45b0..294cea38b71 100644 --- a/core/Command/User/ResetPassword.php +++ b/core/Command/User/ResetPassword.php @@ -28,6 +28,7 @@ namespace OC\Core\Command\User; use OC\Core\Command\Base; +use OCP\App\IAppManager; use OCP\IUser; use OCP\IUserManager; use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext; @@ -41,10 +42,12 @@ use Symfony\Component\Console\Question\Question; class ResetPassword extends Base { protected IUserManager $userManager; + private IAppManager $appManager; - public function __construct(IUserManager $userManager) { - $this->userManager = $userManager; + public function __construct(IUserManager $userManager, IAppManager $appManager) { parent::__construct(); + $this->userManager = $userManager; + $this->appManager = $appManager; } protected function configure() { @@ -84,7 +87,7 @@ class ResetPassword extends Base { /** @var QuestionHelper $helper */ $helper = $this->getHelper('question'); - if (\OCP\App::isEnabled('encryption')) { + if ($this->appManager->isEnabledForUser('encryption', $user)) { $output->writeln( 'Warning: Resetting the password when using encryption will result in data loss!' ); diff --git a/core/register_command.php b/core/register_command.php index d80465e0906..98a653aed7e 100644 --- a/core/register_command.php +++ b/core/register_command.php @@ -183,7 +183,7 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) { $application->add(new OC\Core\Command\User\Enable(\OC::$server->getUserManager())); $application->add(new OC\Core\Command\User\LastSeen(\OC::$server->getUserManager())); $application->add(\OC::$server->get(\OC\Core\Command\User\Report::class)); - $application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager())); + $application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager(), \OC::$server->getAppManager())); $application->add(new OC\Core\Command\User\Setting(\OC::$server->getUserManager(), \OC::$server->getConfig())); $application->add(new OC\Core\Command\User\ListCommand(\OC::$server->getUserManager(), \OC::$server->getGroupManager())); $application->add(new OC\Core\Command\User\Info(\OC::$server->getUserManager(), \OC::$server->getGroupManager())); diff --git a/core/templates/installation.php b/core/templates/installation.php index b08f1cd9ac1..45d9cfc9252 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -55,7 +55,7 @@ script('core', 'install'); 0): ?>
- t('Storage & database')); ?> + t('Storage & database')); ?>
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 0eb80098889..d8a54bfec2e 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -7,9 +7,9 @@ - - - + + + diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 432bc4e8601..c275d9746b7 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -17,10 +17,10 @@ - - - - + + + + -- cgit v1.2.3