From 0bd79b96c529be99752262ff4958efbfedc75c23 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 24 Apr 2020 09:57:52 +0200 Subject: Remove obsolete repair steps for logo and updater channel Signed-off-by: Morris Jobke --- lib/composer/composer/autoload_classmap.php | 2 - lib/composer/composer/autoload_static.php | 2 - lib/private/Repair.php | 4 - lib/private/Repair/NC17/SetEnterpriseLogo.php | 121 ------------------------ lib/private/Repair/NC17/SwitchUpdateChannel.php | 66 ------------- 5 files changed, 195 deletions(-) delete mode 100644 lib/private/Repair/NC17/SetEnterpriseLogo.php delete mode 100644 lib/private/Repair/NC17/SwitchUpdateChannel.php (limited to 'lib') diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 53ffecddd3b..7a4bf0ad846 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -1183,8 +1183,6 @@ return array( 'OC\\Repair\\NC16\\AddClenupLoginFlowV2BackgroundJob' => $baseDir . '/lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php', 'OC\\Repair\\NC16\\CleanupCardDAVPhotoCache' => $baseDir . '/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php', 'OC\\Repair\\NC16\\ClearCollectionsAccessCache' => $baseDir . '/lib/private/Repair/NC16/ClearCollectionsAccessCache.php', - 'OC\\Repair\\NC17\\SetEnterpriseLogo' => $baseDir . '/lib/private/Repair/NC17/SetEnterpriseLogo.php', - 'OC\\Repair\\NC17\\SwitchUpdateChannel' => $baseDir . '/lib/private/Repair/NC17/SwitchUpdateChannel.php', 'OC\\Repair\\NC18\\ResetGeneratedAvatarFlag' => $baseDir . '/lib/private/Repair/NC18/ResetGeneratedAvatarFlag.php', 'OC\\Repair\\OldGroupMembershipShares' => $baseDir . '/lib/private/Repair/OldGroupMembershipShares.php', 'OC\\Repair\\Owncloud\\DropAccountTermsTable' => $baseDir . '/lib/private/Repair/Owncloud/DropAccountTermsTable.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 45ab02ded2b..ab2f1ffa56f 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -1212,8 +1212,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Repair\\NC16\\AddClenupLoginFlowV2BackgroundJob' => __DIR__ . '/../../..' . '/lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php', 'OC\\Repair\\NC16\\CleanupCardDAVPhotoCache' => __DIR__ . '/../../..' . '/lib/private/Repair/NC16/CleanupCardDAVPhotoCache.php', 'OC\\Repair\\NC16\\ClearCollectionsAccessCache' => __DIR__ . '/../../..' . '/lib/private/Repair/NC16/ClearCollectionsAccessCache.php', - 'OC\\Repair\\NC17\\SetEnterpriseLogo' => __DIR__ . '/../../..' . '/lib/private/Repair/NC17/SetEnterpriseLogo.php', - 'OC\\Repair\\NC17\\SwitchUpdateChannel' => __DIR__ . '/../../..' . '/lib/private/Repair/NC17/SwitchUpdateChannel.php', 'OC\\Repair\\NC18\\ResetGeneratedAvatarFlag' => __DIR__ . '/../../..' . '/lib/private/Repair/NC18/ResetGeneratedAvatarFlag.php', 'OC\\Repair\\OldGroupMembershipShares' => __DIR__ . '/../../..' . '/lib/private/Repair/OldGroupMembershipShares.php', 'OC\\Repair\\Owncloud\\DropAccountTermsTable' => __DIR__ . '/../../..' . '/lib/private/Repair/Owncloud/DropAccountTermsTable.php', diff --git a/lib/private/Repair.php b/lib/private/Repair.php index 4084a9efb81..60609de4170 100644 --- a/lib/private/Repair.php +++ b/lib/private/Repair.php @@ -47,8 +47,6 @@ use OC\Repair\NC14\AddPreviewBackgroundCleanupJob; use OC\Repair\NC16\AddClenupLoginFlowV2BackgroundJob; use OC\Repair\NC16\CleanupCardDAVPhotoCache; use OC\Repair\NC16\ClearCollectionsAccessCache; -use OC\Repair\NC17\SetEnterpriseLogo; -use OC\Repair\NC17\SwitchUpdateChannel; use OC\Repair\NC18\ResetGeneratedAvatarFlag; use OC\Repair\OldGroupMembershipShares; use OC\Repair\Owncloud\DropAccountTermsTable; @@ -157,8 +155,6 @@ class Repair implements IOutput { new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()), new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OC::$server->query(ITimeFactory::class)), new ClearCollectionsAccessCache(\OC::$server->getConfig(), \OC::$server->query(IManager::class)), - \OC::$server->query(SwitchUpdateChannel::class), - \OC::$server->query(SetEnterpriseLogo::class), \OC::$server->query(ResetGeneratedAvatarFlag::class), ]; } diff --git a/lib/private/Repair/NC17/SetEnterpriseLogo.php b/lib/private/Repair/NC17/SetEnterpriseLogo.php deleted file mode 100644 index 31e9e0ee9fc..00000000000 --- a/lib/private/Repair/NC17/SetEnterpriseLogo.php +++ /dev/null @@ -1,121 +0,0 @@ - - * - * @author Morris Jobke - * - * @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 . - * - */ - -namespace OC\Repair\NC17; - -use OC\Files\AppData\Factory; -use OC\Template\SCSSCacher; -use OCA\Theming\ThemingDefaults; -use OCP\Files\IAppData; -use OCP\Files\NotFoundException; -use OCP\IConfig; -use OCP\Migration\IOutput; -use OCP\Migration\IRepairStep; -use OCP\Support\Subscription\IRegistry; - -/** - * @deprecated - can be removed in 18 - */ -class SetEnterpriseLogo implements IRepairStep { - - /** @var IConfig $config */ - private $config; - - /** @var IRegistry $subscriptionRegistry */ - private $subscriptionRegistry; - - /** @var IAppData $appData */ - private $appData; - - /** @var SCSSCacher $scssCacher */ - private $scssCacher; - - /** @var \OC_Defaults|ThemingDefaults */ - private $themingDefaults; - - public function getName(): string { - return 'Sets the enterprise logo'; - } - - public function __construct( - IConfig $config, - IRegistry $subscriptionRegistry, - Factory $appDataFactory, - SCSSCacher $SCSSCacher, - $ThemingDefaults - ) { - $this->config = $config; - $this->subscriptionRegistry = $subscriptionRegistry; - $this->appData = $appDataFactory->get('theming'); - $this->scssCacher = $SCSSCacher; - $this->themingDefaults = $ThemingDefaults; - } - - public function run(IOutput $output): void { - // only run once - if ($this->config->getAppValue('core', 'enterpriseLogoChecked') === 'yes') { - $output->info('Repair step already executed'); - return; - } - - if (!$this->subscriptionRegistry->delegateHasValidSubscription()) { - // no need to set the enterprise logo - $this->config->setAppValue('core', 'enterpriseLogoChecked', 'yes'); - return; - } - - if ($this->themingDefaults instanceof ThemingDefaults) { - $output->info('Theming is enabled - trying to set logo.'); - try { - $folder = $this->appData->getFolder('images'); - } catch (NotFoundException $e) { - $folder = $this->appData->newFolder('images'); - } - - if (!$folder->fileExists('logo') || $folder->getFile('logo')->getSize() === 0) { - $output->info('Logo does not exist yet - setting it.'); - - if ($folder->fileExists('logo')) { - $folder->getFile('logo')->delete(); - } - $target = $folder->newFile('logo'); - - $target->putContent(file_get_contents(__DIR__ . '/../../../../core/img/logo/logo-enterprise.png')); - - $this->themingDefaults->set('logoMime', 'image/png'); - - $this->scssCacher->process(\OC::$SERVERROOT, 'core/css/css-variables.scss', 'core'); - } else { - $output->info('Logo already set - skipping.'); - } - } else { - $output->info('Theming is not enabled - skipping.'); - } - - // if all were done, no need to redo the repair during next upgrade - $this->config->setAppValue('core', 'enterpriseLogoChecked', 'yes'); - } -} diff --git a/lib/private/Repair/NC17/SwitchUpdateChannel.php b/lib/private/Repair/NC17/SwitchUpdateChannel.php deleted file mode 100644 index 836a89906ac..00000000000 --- a/lib/private/Repair/NC17/SwitchUpdateChannel.php +++ /dev/null @@ -1,66 +0,0 @@ - - * - * @author Morris Jobke - * @author Roeland Jago Douma - * - * @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 . - * - */ - -namespace OC\Repair\NC17; - -use OCP\IConfig; -use OCP\Migration\IOutput; -use OCP\Migration\IRepairStep; -use OCP\Support\Subscription\IRegistry; - -/** - * @deprecated - can be removed in 18 - */ -class SwitchUpdateChannel implements IRepairStep { - - /** @var IConfig */ - private $config; - - /** @var IRegistry */ - private $subscriptionRegistry; - - public function __construct(IConfig $config, IRegistry $subscriptionRegistry) { - $this->config = $config; - $this->subscriptionRegistry = $subscriptionRegistry; - } - - public function getName(): string { - return 'Switches from deprecated "production" to "stable" update channel'; - } - - public function run(IOutput $output): void { - $currentChannel = $this->config->getSystemValue('updater.release.channel', 'stable'); - - if ($currentChannel === 'production') { - if ($this->subscriptionRegistry->delegateHasValidSubscription()) { - $this->config->setSystemValue('updater.release.channel', 'enterprise'); - } else { - $this->config->setSystemValue('updater.release.channel', 'stable'); - } - } - } -} -- cgit v1.2.3