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

Remove obsolete repair steps for logo and updater channel 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2020-04-24 09:57:52 +02:00
parent 3c2dd08264
commit 0bd79b96c5
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
5 changed files with 0 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/composer/composer/autoload_classmap.php
View File

@ -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',

2
lib/composer/composer/autoload_static.php
View File

@ -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',

4
lib/private/Repair.php
View File

@ -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),
];
}

121
lib/private/Repair/NC17/SetEnterpriseLogo.php
View File

@ -1,121 +0,0 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2019, Morris Jobke <hey@morrisjobke.de>
*
* @author Morris Jobke <hey@morrisjobke.de>
*
* @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 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');
}
}

66
lib/private/Repair/NC17/SwitchUpdateChannel.php
View File

@ -1,66 +0,0 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2019, Morris Jobke <hey@morrisjobke.de>
*
* @author Morris Jobke <hey@morrisjobke.de>
* @author Roeland Jago Douma <roeland@famdouma.nl>
*
* @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 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');
}
}
}
}