nextcloud / server

lib/private/Repair.php

Indentation +172 added lines, -172 removed lines

@@ -62,176 +62,176 @@
 
 class Repair implements IOutput {
 
-	/** @var IRepairStep[] */
-	private $repairSteps;
-
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-
-	/** @var string */
-	private $currentStep;
-
-	/**
-	 * Creates a new repair step runner
-	 *
-	 * @param IRepairStep[] $repairSteps array of RepairStep instances
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(array $repairSteps, EventDispatcherInterface $dispatcher) {
-		$this->repairSteps = $repairSteps;
-		$this->dispatcher  = $dispatcher;
-	}
-
-	/**
-	 * Run a series of repair steps for common problems
-	 */
-	public function run() {
-		if (count($this->repairSteps) === 0) {
-			$this->emit('\OC\Repair', 'info', array('No repair steps available'));
-
-			return;
-		}
-		// run each repair step
-		foreach ($this->repairSteps as $step) {
-			$this->currentStep = $step->getName();
-			$this->emit('\OC\Repair', 'step', [$this->currentStep]);
-			$step->run($this);
-		}
-	}
-
-	/**
-	 * Add repair step
-	 *
-	 * @param IRepairStep|string $repairStep repair step
-	 * @throws \Exception
-	 */
-	public function addStep($repairStep) {
-		if (is_string($repairStep)) {
-			try {
-				$s = \OC::$server->query($repairStep);
-			} catch (QueryException $e) {
-				if (class_exists($repairStep)) {
-					$s = new $repairStep();
-				} else {
-					throw new \Exception("Repair step '$repairStep' is unknown");
-				}
-			}
-
-			if ($s instanceof IRepairStep) {
-				$this->repairSteps[] = $s;
-			} else {
-				throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
-			}
-		} else {
-			$this->repairSteps[] = $repairStep;
-		}
-	}
-
-	/**
-	 * Returns the default repair steps to be run on the
-	 * command line or after an upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getRepairSteps() {
-		return [
-			new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->getDatabaseConnection(), false),
-			new RepairMimeTypes(\OC::$server->getConfig()),
-			new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
-			new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
-			new MoveUpdaterStepFile(\OC::$server->getConfig()),
-			new FixMountStorages(\OC::$server->getDatabaseConnection()),
-			new AddLogRotateJob(\OC::$server->getJobList()),
-			new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(SCSSCacher::class), \OC::$server->query(JSCombiner::class)),
-			new ClearGeneratedAvatarCache(\OC::$server->getConfig(), \OC::$server->query(AvatarManager::class)),
-			new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
-			new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
-			new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache'), \OC::$server->getLogger()),
-			new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
-			new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OC::$server->query(ITimeFactory::class)),
-			\OC::$server->query(RemoveCypressFiles::class),
-			\OC::$server->query(SwitchUpdateChannel::class),
-		];
-	}
-
-	/**
-	 * Returns expensive repair steps to be run on the
-	 * command line with a special option.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getExpensiveRepairSteps() {
-		return [
-			new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager())
-		];
-	}
-
-	/**
-	 * Returns the repair steps to be run before an
-	 * upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getBeforeUpgradeRepairSteps() {
-		$connection = \OC::$server->getDatabaseConnection();
-		$config     = \OC::$server->getConfig();
-		$steps      = [
-			new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connection, true),
-			new SqliteAutoincrement($connection),
-			new SaveAccountsTableData($connection, $config),
-			new DropAccountTermsTable($connection)
-		];
-
-		return $steps;
-	}
-
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments
-	 */
-	public function emit($scope, $method, array $arguments = []) {
-		if (!is_null($this->dispatcher)) {
-			$this->dispatcher->dispatch("$scope::$method",
-				new GenericEvent("$scope::$method", $arguments));
-		}
-	}
-
-	public function info($string) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'info', array($string));
-	}
-
-	/**
-	 * @param string $message
-	 */
-	public function warning($message) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'warning', [$message]);
-	}
-
-	/**
-	 * @param int $max
-	 */
-	public function startProgress($max = 0) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
-	}
-
-	/**
-	 * @param int $step
-	 * @param string $description
-	 */
-	public function advance($step = 1, $description = '') {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'advance', [$step, $description]);
-	}
-
-	/**
-	 * @param int $max
-	 */
-	public function finishProgress() {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'finishProgress', []);
-	}
+    /** @var IRepairStep[] */
+    private $repairSteps;
+
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+
+    /** @var string */
+    private $currentStep;
+
+    /**
+     * Creates a new repair step runner
+     *
+     * @param IRepairStep[] $repairSteps array of RepairStep instances
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(array $repairSteps, EventDispatcherInterface $dispatcher) {
+        $this->repairSteps = $repairSteps;
+        $this->dispatcher  = $dispatcher;
+    }
+
+    /**
+     * Run a series of repair steps for common problems
+     */
+    public function run() {
+        if (count($this->repairSteps) === 0) {
+            $this->emit('\OC\Repair', 'info', array('No repair steps available'));
+
+            return;
+        }
+        // run each repair step
+        foreach ($this->repairSteps as $step) {
+            $this->currentStep = $step->getName();
+            $this->emit('\OC\Repair', 'step', [$this->currentStep]);
+            $step->run($this);
+        }
+    }
+
+    /**
+     * Add repair step
+     *
+     * @param IRepairStep|string $repairStep repair step
+     * @throws \Exception
+     */
+    public function addStep($repairStep) {
+        if (is_string($repairStep)) {
+            try {
+                $s = \OC::$server->query($repairStep);
+            } catch (QueryException $e) {
+                if (class_exists($repairStep)) {
+                    $s = new $repairStep();
+                } else {
+                    throw new \Exception("Repair step '$repairStep' is unknown");
+                }
+            }
+
+            if ($s instanceof IRepairStep) {
+                $this->repairSteps[] = $s;
+            } else {
+                throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
+            }
+        } else {
+            $this->repairSteps[] = $repairStep;
+        }
+    }
+
+    /**
+     * Returns the default repair steps to be run on the
+     * command line or after an upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getRepairSteps() {
+        return [
+            new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->getDatabaseConnection(), false),
+            new RepairMimeTypes(\OC::$server->getConfig()),
+            new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
+            new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
+            new MoveUpdaterStepFile(\OC::$server->getConfig()),
+            new FixMountStorages(\OC::$server->getDatabaseConnection()),
+            new AddLogRotateJob(\OC::$server->getJobList()),
+            new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(SCSSCacher::class), \OC::$server->query(JSCombiner::class)),
+            new ClearGeneratedAvatarCache(\OC::$server->getConfig(), \OC::$server->query(AvatarManager::class)),
+            new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
+            new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
+            new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache'), \OC::$server->getLogger()),
+            new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
+            new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OC::$server->query(ITimeFactory::class)),
+            \OC::$server->query(RemoveCypressFiles::class),
+            \OC::$server->query(SwitchUpdateChannel::class),
+        ];
+    }
+
+    /**
+     * Returns expensive repair steps to be run on the
+     * command line with a special option.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getExpensiveRepairSteps() {
+        return [
+            new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager())
+        ];
+    }
+
+    /**
+     * Returns the repair steps to be run before an
+     * upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getBeforeUpgradeRepairSteps() {
+        $connection = \OC::$server->getDatabaseConnection();
+        $config     = \OC::$server->getConfig();
+        $steps      = [
+            new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connection, true),
+            new SqliteAutoincrement($connection),
+            new SaveAccountsTableData($connection, $config),
+            new DropAccountTermsTable($connection)
+        ];
+
+        return $steps;
+    }
+
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments
+     */
+    public function emit($scope, $method, array $arguments = []) {
+        if (!is_null($this->dispatcher)) {
+            $this->dispatcher->dispatch("$scope::$method",
+                new GenericEvent("$scope::$method", $arguments));
+        }
+    }
+
+    public function info($string) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'info', array($string));
+    }
+
+    /**
+     * @param string $message
+     */
+    public function warning($message) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'warning', [$message]);
+    }
+
+    /**
+     * @param int $max
+     */
+    public function startProgress($max = 0) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
+    }
+
+    /**
+     * @param int $step
+     * @param string $description
+     */
+    public function advance($step = 1, $description = '') {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'advance', [$step, $description]);
+    }
+
+    /**
+     * @param int $max
+     */
+    public function finishProgress() {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'finishProgress', []);
+    }
 }

lib/private/Repair/NC17/SwitchUpdateChannel.php

Indentation +26 added lines, -26 removed lines

@@ -31,30 +31,30 @@
  */
 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');
-			}
-		}
-	}
+    /** @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');
+            }
+        }
+    }
 }

apps/updatenotification/lib/Settings/Admin.php

Indentation +143 added lines, -143 removed lines

@@ -38,147 +38,147 @@
 use OCP\Util;
 
 class Admin implements ISettings {
-	/** @var IConfig */
-	private $config;
-	/** @var UpdateChecker */
-	private $updateChecker;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IDateTimeFormatter */
-	private $dateTimeFormatter;
-	/** @var IFactory */
-	private $l10nFactory;
-	/** @var IRegistry */
-	private $subscriptionRegistry;
-
-	public function __construct(
-		IConfig $config,
-		UpdateChecker $updateChecker,
-		IGroupManager $groupManager,
-		IDateTimeFormatter $dateTimeFormatter,
-		IFactory $l10nFactory,
-		IRegistry $subscriptionRegistry
-	) {
-		$this->config = $config;
-		$this->updateChecker = $updateChecker;
-		$this->groupManager = $groupManager;
-		$this->dateTimeFormatter = $dateTimeFormatter;
-		$this->l10nFactory = $l10nFactory;
-		$this->subscriptionRegistry = $subscriptionRegistry;
-	}
-
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm(): TemplateResponse {
-		$lastUpdateCheckTimestamp = $this->config->getAppValue('core', 'lastupdatedat');
-		$lastUpdateCheck = $this->dateTimeFormatter->formatDateTime($lastUpdateCheckTimestamp);
-
-		$channels = [
-			'daily',
-			'beta',
-			'stable',
-			'production',
-		];
-		$currentChannel = Util::getChannel();
-		if ($currentChannel === 'git') {
-			$channels[] = 'git';
-		}
-
-		$updateState = $this->updateChecker->getUpdateState();
-
-		$notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
-
-		$defaultUpdateServerURL = 'https://updates.nextcloud.com/updater_server/';
-		$updateServerURL = $this->config->getSystemValue('updater.server.url', $defaultUpdateServerURL);
-		$defaultCustomerUpdateServerURLPrefix = 'https://updates.nextcloud.com/customers/';
-
-		$isDefaultUpdateServerURL = $updateServerURL === $defaultUpdateServerURL
-			|| $updateServerURL === substr($updateServerURL, 0, strlen($defaultCustomerUpdateServerURLPrefix));
-
-		$hasValidSubscription = $this->subscriptionRegistry->delegateHasValidSubscription();
-
-		$params = [
-			'isNewVersionAvailable' => !empty($updateState['updateAvailable']),
-			'isUpdateChecked' => $lastUpdateCheckTimestamp > 0,
-			'lastChecked' => $lastUpdateCheck,
-			'currentChannel' => $currentChannel,
-			'channels' => $channels,
-			'newVersion' => empty($updateState['updateVersion']) ? '' : $updateState['updateVersion'],
-			'newVersionString' => empty($updateState['updateVersionString']) ? '' : $updateState['updateVersionString'],
-			'downloadLink' => empty($updateState['downloadLink']) ? '' : $updateState['downloadLink'],
-			'changes' => $this->filterChanges($updateState['changes'] ?? []),
-			'updaterEnabled' => empty($updateState['updaterEnabled']) ? false : $updateState['updaterEnabled'],
-			'versionIsEol' => empty($updateState['versionIsEol']) ? false : $updateState['versionIsEol'],
-			'isDefaultUpdateServerURL' => $isDefaultUpdateServerURL,
-			'updateServerURL' => $updateServerURL,
-			'notifyGroups' => $this->getSelectedGroups($notifyGroups),
-			'hasValidSubscription' => $hasValidSubscription,
-		];
-
-		$params = [
-			'json' => json_encode($params),
-		];
-
-		return new TemplateResponse('updatenotification', 'admin', $params, '');
-	}
-
-	protected function filterChanges(array $changes): array {
-		$filtered = [];
-		if(isset($changes['changelogURL'])) {
-			$filtered['changelogURL'] = $changes['changelogURL'];
-		}
-		if(!isset($changes['whatsNew'])) {
-			return $filtered;
-		}
-
-		$iterator = $this->l10nFactory->getLanguageIterator();
-		do {
-			$lang = $iterator->current();
-			if(isset($changes['whatsNew'][$lang])) {
-				$filtered['whatsNew'] = $changes['whatsNew'][$lang];
-				return $filtered;
-			}
-			$iterator->next();
-		} while($lang !== 'en' && $iterator->valid());
-
-		return $filtered;
-	}
-
-	/**
-	 * @param array $groupIds
-	 * @return array
-	 */
-	protected function getSelectedGroups(array $groupIds): array {
-		$result = [];
-		foreach ($groupIds as $groupId) {
-			$group = $this->groupManager->get($groupId);
-
-			if ($group === null) {
-				continue;
-			}
-
-			$result[] = ['value' => $group->getGID(), 'label' => $group->getDisplayName()];
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection(): string {
-		return 'overview';
-	}
-
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority(): int {
-		return 11;
-	}
+    /** @var IConfig */
+    private $config;
+    /** @var UpdateChecker */
+    private $updateChecker;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IDateTimeFormatter */
+    private $dateTimeFormatter;
+    /** @var IFactory */
+    private $l10nFactory;
+    /** @var IRegistry */
+    private $subscriptionRegistry;
+
+    public function __construct(
+        IConfig $config,
+        UpdateChecker $updateChecker,
+        IGroupManager $groupManager,
+        IDateTimeFormatter $dateTimeFormatter,
+        IFactory $l10nFactory,
+        IRegistry $subscriptionRegistry
+    ) {
+        $this->config = $config;
+        $this->updateChecker = $updateChecker;
+        $this->groupManager = $groupManager;
+        $this->dateTimeFormatter = $dateTimeFormatter;
+        $this->l10nFactory = $l10nFactory;
+        $this->subscriptionRegistry = $subscriptionRegistry;
+    }
+
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm(): TemplateResponse {
+        $lastUpdateCheckTimestamp = $this->config->getAppValue('core', 'lastupdatedat');
+        $lastUpdateCheck = $this->dateTimeFormatter->formatDateTime($lastUpdateCheckTimestamp);
+
+        $channels = [
+            'daily',
+            'beta',
+            'stable',
+            'production',
+        ];
+        $currentChannel = Util::getChannel();
+        if ($currentChannel === 'git') {
+            $channels[] = 'git';
+        }
+
+        $updateState = $this->updateChecker->getUpdateState();
+
+        $notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true);
+
+        $defaultUpdateServerURL = 'https://updates.nextcloud.com/updater_server/';
+        $updateServerURL = $this->config->getSystemValue('updater.server.url', $defaultUpdateServerURL);
+        $defaultCustomerUpdateServerURLPrefix = 'https://updates.nextcloud.com/customers/';
+
+        $isDefaultUpdateServerURL = $updateServerURL === $defaultUpdateServerURL
+            || $updateServerURL === substr($updateServerURL, 0, strlen($defaultCustomerUpdateServerURLPrefix));
+
+        $hasValidSubscription = $this->subscriptionRegistry->delegateHasValidSubscription();
+
+        $params = [
+            'isNewVersionAvailable' => !empty($updateState['updateAvailable']),
+            'isUpdateChecked' => $lastUpdateCheckTimestamp > 0,
+            'lastChecked' => $lastUpdateCheck,
+            'currentChannel' => $currentChannel,
+            'channels' => $channels,
+            'newVersion' => empty($updateState['updateVersion']) ? '' : $updateState['updateVersion'],
+            'newVersionString' => empty($updateState['updateVersionString']) ? '' : $updateState['updateVersionString'],
+            'downloadLink' => empty($updateState['downloadLink']) ? '' : $updateState['downloadLink'],
+            'changes' => $this->filterChanges($updateState['changes'] ?? []),
+            'updaterEnabled' => empty($updateState['updaterEnabled']) ? false : $updateState['updaterEnabled'],
+            'versionIsEol' => empty($updateState['versionIsEol']) ? false : $updateState['versionIsEol'],
+            'isDefaultUpdateServerURL' => $isDefaultUpdateServerURL,
+            'updateServerURL' => $updateServerURL,
+            'notifyGroups' => $this->getSelectedGroups($notifyGroups),
+            'hasValidSubscription' => $hasValidSubscription,
+        ];
+
+        $params = [
+            'json' => json_encode($params),
+        ];
+
+        return new TemplateResponse('updatenotification', 'admin', $params, '');
+    }
+
+    protected function filterChanges(array $changes): array {
+        $filtered = [];
+        if(isset($changes['changelogURL'])) {
+            $filtered['changelogURL'] = $changes['changelogURL'];
+        }
+        if(!isset($changes['whatsNew'])) {
+            return $filtered;
+        }
+
+        $iterator = $this->l10nFactory->getLanguageIterator();
+        do {
+            $lang = $iterator->current();
+            if(isset($changes['whatsNew'][$lang])) {
+                $filtered['whatsNew'] = $changes['whatsNew'][$lang];
+                return $filtered;
+            }
+            $iterator->next();
+        } while($lang !== 'en' && $iterator->valid());
+
+        return $filtered;
+    }
+
+    /**
+     * @param array $groupIds
+     * @return array
+     */
+    protected function getSelectedGroups(array $groupIds): array {
+        $result = [];
+        foreach ($groupIds as $groupId) {
+            $group = $this->groupManager->get($groupId);
+
+            if ($group === null) {
+                continue;
+            }
+
+            $result[] = ['value' => $group->getGID(), 'label' => $group->getDisplayName()];
+        }
+
+        return $result;
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection(): string {
+        return 'overview';
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority(): int {
+        return 11;
+    }
 }