nextcloud / server

apps/updatenotification/lib/AppInfo/Application.php

Indentation +42 added lines, -42 removed lines

@@ -30,53 +30,53 @@
 use Psr\Log\LoggerInterface;
 
 class Application extends App implements IBootstrap {
-	public const APP_NAME = 'updatenotification';
+    public const APP_NAME = 'updatenotification';
 
-	public function __construct() {
-		parent::__construct(self::APP_NAME, []);
-	}
+    public function __construct() {
+        parent::__construct(self::APP_NAME, []);
+    }
 
-	public function register(IRegistrationContext $context): void {
-		$context->registerNotifierService(Notifier::class);
-		$context->registerNotifierService(AppUpdateNotifier::class);
+    public function register(IRegistrationContext $context): void {
+        $context->registerNotifierService(Notifier::class);
+        $context->registerNotifierService(AppUpdateNotifier::class);
 
-		$context->registerEventListener(AppUpdateEvent::class, AppUpdateEventListener::class);
-		$context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedEventListener::class);
-	}
+        $context->registerEventListener(AppUpdateEvent::class, AppUpdateEventListener::class);
+        $context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedEventListener::class);
+    }
 
-	public function boot(IBootContext $context): void {
-		$context->injectFn(function (IConfig $config,
-			IUserSession $userSession,
-			IAppManager $appManager,
-			IGroupManager $groupManager,
-			ContainerInterface $container,
-			LoggerInterface $logger,
-		): void {
-			if ($config->getSystemValue('updatechecker', true) !== true) {
-				// Updater check is disabled
-				return;
-			}
+    public function boot(IBootContext $context): void {
+        $context->injectFn(function (IConfig $config,
+            IUserSession $userSession,
+            IAppManager $appManager,
+            IGroupManager $groupManager,
+            ContainerInterface $container,
+            LoggerInterface $logger,
+        ): void {
+            if ($config->getSystemValue('updatechecker', true) !== true) {
+                // Updater check is disabled
+                return;
+            }
 
-			$user = $userSession->getUser();
-			if (!$user instanceof IUser) {
-				// Nothing to do for guests
-				return;
-			}
+            $user = $userSession->getUser();
+            if (!$user instanceof IUser) {
+                // Nothing to do for guests
+                return;
+            }
 
-			if (!$appManager->isEnabledForUser('notifications') &&
-				$groupManager->isAdmin($user->getUID())) {
-				try {
-					$updateChecker = $container->get(UpdateChecker::class);
-				} catch (ContainerExceptionInterface $e) {
-					$logger->error($e->getMessage(), ['exception' => $e]);
-					return;
-				}
+            if (!$appManager->isEnabledForUser('notifications') &&
+                $groupManager->isAdmin($user->getUID())) {
+                try {
+                    $updateChecker = $container->get(UpdateChecker::class);
+                } catch (ContainerExceptionInterface $e) {
+                    $logger->error($e->getMessage(), ['exception' => $e]);
+                    return;
+                }
 
-				if ($updateChecker->getUpdateState() !== []) {
-					Util::addScript(self::APP_NAME, 'update-notification-legacy');
-					$updateChecker->setInitialState();
-				}
-			}
-		});
-	}
+                if ($updateChecker->getUpdateState() !== []) {
+                    Util::addScript(self::APP_NAME, 'update-notification-legacy');
+                    $updateChecker->setInitialState();
+                }
+            }
+        });
+    }
 }

apps/updatenotification/lib/Command/Check.php

Indentation +40 added lines, -40 removed lines

@@ -17,51 +17,51 @@
 
 class Check extends Command {
 
-	public function __construct(
-		private AppManager $appManager,
-		private UpdateChecker $updateChecker,
-		private Installer $installer,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        private AppManager $appManager,
+        private UpdateChecker $updateChecker,
+        private Installer $installer,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure(): void {
-		$this
-			->setName('update:check')
-			->setDescription('Check for server and app updates')
-		;
-	}
+    protected function configure(): void {
+        $this
+            ->setName('update:check')
+            ->setDescription('Check for server and app updates')
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$updatesAvailableCount = 0;
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $updatesAvailableCount = 0;
 
-		// Server
-		$r = $this->updateChecker->getUpdateState();
-		if (isset($r['updateAvailable']) && $r['updateAvailable']) {
-			$output->writeln($r['updateVersionString'] . ' is available. Get more information on how to update at ' . $r['updateLink'] . '.');
-			$updatesAvailableCount += 1;
-		}
+        // Server
+        $r = $this->updateChecker->getUpdateState();
+        if (isset($r['updateAvailable']) && $r['updateAvailable']) {
+            $output->writeln($r['updateVersionString'] . ' is available. Get more information on how to update at ' . $r['updateLink'] . '.');
+            $updatesAvailableCount += 1;
+        }
 
 
-		// Apps
-		$apps = $this->appManager->getEnabledApps();
-		foreach ($apps as $app) {
-			$update = $this->installer->isUpdateAvailable($app);
-			if ($update !== false) {
-				$output->writeln('Update for ' . $app . ' to version ' . $update . ' is available.');
-				$updatesAvailableCount += 1;
-			}
-		}
+        // Apps
+        $apps = $this->appManager->getEnabledApps();
+        foreach ($apps as $app) {
+            $update = $this->installer->isUpdateAvailable($app);
+            if ($update !== false) {
+                $output->writeln('Update for ' . $app . ' to version ' . $update . ' is available.');
+                $updatesAvailableCount += 1;
+            }
+        }
 
-		// Report summary
-		if ($updatesAvailableCount === 0) {
-			$output->writeln('<info>Everything up to date</info>');
-		} elseif ($updatesAvailableCount === 1) {
-			$output->writeln('<comment>1 update available</comment>');
-		} else {
-			$output->writeln('<comment>' . $updatesAvailableCount . ' updates available</comment>');
-		}
+        // Report summary
+        if ($updatesAvailableCount === 0) {
+            $output->writeln('<info>Everything up to date</info>');
+        } elseif ($updatesAvailableCount === 1) {
+            $output->writeln('<comment>1 update available</comment>');
+        } else {
+            $output->writeln('<comment>' . $updatesAvailableCount . ' updates available</comment>');
+        }
 
-		return 0;
-	}
+        return 0;
+    }
 }

apps/updatenotification/lib/Controller/APIController.php

Indentation +168 added lines, -168 removed lines

@@ -26,172 +26,172 @@
  */
 class APIController extends OCSController {
 
-	protected ?string $language = null;
-
-	/**
-	 * List of apps that were in the appstore but are now shipped and don't have
-	 * a compatible update available.
-	 *
-	 * @var array<string, int>
-	 */
-	protected array $appsShippedInFutureVersion = [
-		'bruteforcesettings' => 25,
-		'suspicious_login' => 25,
-		'twofactor_totp' => 25,
-		'files_downloadlimit' => 29,
-		'twofactor_nextcloud_notification' => 30,
-		'app_api' => 30,
-	];
-
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		protected IConfig $config,
-		protected IAppManager $appManager,
-		protected AppFetcher $appFetcher,
-		protected IFactory $l10nFactory,
-		protected IUserSession $userSession,
-		protected Manager $manager,
-	) {
-		parent::__construct($appName, $request);
-	}
-
-	/**
-	 * List available updates for apps
-	 *
-	 * @param string $newVersion Server version to check updates for
-	 *
-	 * @return DataResponse<Http::STATUS_OK, array{missing: list<UpdateNotificationApp>, available: list<UpdateNotificationApp>}, array{}>|DataResponse<Http::STATUS_NOT_FOUND, array{appstore_disabled: bool, already_on_latest?: bool}, array{}>
-	 *
-	 * 200: Apps returned
-	 * 404: New versions not found
-	 */
-	public function getAppList(string $newVersion): DataResponse {
-		if (!$this->config->getSystemValue('appstoreenabled', true)) {
-			return new DataResponse([
-				'appstore_disabled' => true,
-			], Http::STATUS_NOT_FOUND);
-		}
-
-		// Get list of installed custom apps
-		$installedApps = $this->appManager->getEnabledApps();
-		$installedApps = array_filter($installedApps, function ($app) {
-			try {
-				$this->appManager->getAppPath($app);
-			} catch (AppPathNotFoundException $e) {
-				return false;
-			}
-			return !$this->appManager->isShipped($app) && !isset($this->appsShippedInFutureVersion[$app]);
-		});
-
-		if (empty($installedApps)) {
-			return new DataResponse([
-				'missing' => [],
-				'available' => [],
-			]);
-		}
-
-		$this->appFetcher->setVersion($newVersion, 'future-apps.json', false);
-
-		// Apps available on the app store for that version
-		$availableApps = array_map(static function (array $app): string {
-			return $app['id'];
-		}, $this->appFetcher->get());
-
-		if (empty($availableApps)) {
-			return new DataResponse([
-				'appstore_disabled' => false,
-				'already_on_latest' => false,
-			], Http::STATUS_NOT_FOUND);
-		}
-
-		// Ignore apps that are deployed from git
-		$installedApps = array_filter($installedApps, function (string $appId) {
-			try {
-				return !file_exists($this->appManager->getAppPath($appId) . '/.git');
-			} catch (AppPathNotFoundException $e) {
-				return true;
-			}
-		});
-
-		$missing = array_diff($installedApps, $availableApps);
-		$missing = array_map([$this, 'getAppDetails'], $missing);
-		sort($missing);
-
-		$available = array_intersect($installedApps, $availableApps);
-		$available = array_map([$this, 'getAppDetails'], $available);
-		sort($available);
-
-		return new DataResponse([
-			'missing' => $missing,
-			'available' => $available,
-		]);
-	}
-
-	/**
-	 * Get translated app name
-	 *
-	 * @param string $appId
-	 * @return UpdateNotificationApp
-	 */
-	protected function getAppDetails(string $appId): array {
-		$app = $this->appManager->getAppInfo($appId, false, $this->language);
-		$name = $app['name'] ?? $appId;
-		return [
-			'appId' => $appId,
-			'appName' => $name,
-		];
-	}
-
-	protected function getLanguage(): string {
-		if ($this->language === null) {
-			$this->language = $this->l10nFactory->getUserLanguage($this->userSession->getUser());
-		}
-		return $this->language;
-	}
-
-	/**
-	 * Get changelog entry for an app
-	 *
-	 * @param string $appId App to search changelog entry for
-	 * @param string|null $version The version to search the changelog entry for (defaults to the latest installed)
-	 *
-	 * @return DataResponse<Http::STATUS_OK, array{appName: string, content: string, version: string}, array{}>|DataResponse<Http::STATUS_NOT_FOUND, array{}, array{}>|DataResponse<Http::STATUS_BAD_REQUEST, array{}, array{}>
-	 *
-	 * 200: Changelog entry returned
-	 * 400: The `version` parameter is not a valid version format
-	 * 404: No changelog found
-	 */
-	public function getAppChangelogEntry(string $appId, ?string $version = null): DataResponse {
-		$version = $version ?? $this->appManager->getAppVersion($appId);
-		// handle pre-release versions
-		$matches = [];
-		$result = preg_match('/^(\d+\.\d+(\.\d+)?)/', $version, $matches);
-		if ($result === false || $result === 0) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-		$shortVersion = $matches[0];
-
-		$changes = $this->manager->getChangelog($appId, $shortVersion);
-
-		if ($changes === null) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		// Remove version headline
-		/** @var string[] */
-		$changes = explode("\n", $changes, 2);
-		$changes = trim(end($changes));
-
-		// Get app info for localized app name
-		$info = $this->appManager->getAppInfo($appId) ?? [];
-		/** @var string */
-		$appName = $info['name'] ?? $appId;
-
-		return new DataResponse([
-			'appName' => $appName,
-			'content' => $changes,
-			'version' => $version,
-		]);
-	}
+    protected ?string $language = null;
+
+    /**
+     * List of apps that were in the appstore but are now shipped and don't have
+     * a compatible update available.
+     *
+     * @var array<string, int>
+     */
+    protected array $appsShippedInFutureVersion = [
+        'bruteforcesettings' => 25,
+        'suspicious_login' => 25,
+        'twofactor_totp' => 25,
+        'files_downloadlimit' => 29,
+        'twofactor_nextcloud_notification' => 30,
+        'app_api' => 30,
+    ];
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        protected IConfig $config,
+        protected IAppManager $appManager,
+        protected AppFetcher $appFetcher,
+        protected IFactory $l10nFactory,
+        protected IUserSession $userSession,
+        protected Manager $manager,
+    ) {
+        parent::__construct($appName, $request);
+    }
+
+    /**
+     * List available updates for apps
+     *
+     * @param string $newVersion Server version to check updates for
+     *
+     * @return DataResponse<Http::STATUS_OK, array{missing: list<UpdateNotificationApp>, available: list<UpdateNotificationApp>}, array{}>|DataResponse<Http::STATUS_NOT_FOUND, array{appstore_disabled: bool, already_on_latest?: bool}, array{}>
+     *
+     * 200: Apps returned
+     * 404: New versions not found
+     */
+    public function getAppList(string $newVersion): DataResponse {
+        if (!$this->config->getSystemValue('appstoreenabled', true)) {
+            return new DataResponse([
+                'appstore_disabled' => true,
+            ], Http::STATUS_NOT_FOUND);
+        }
+
+        // Get list of installed custom apps
+        $installedApps = $this->appManager->getEnabledApps();
+        $installedApps = array_filter($installedApps, function ($app) {
+            try {
+                $this->appManager->getAppPath($app);
+            } catch (AppPathNotFoundException $e) {
+                return false;
+            }
+            return !$this->appManager->isShipped($app) && !isset($this->appsShippedInFutureVersion[$app]);
+        });
+
+        if (empty($installedApps)) {
+            return new DataResponse([
+                'missing' => [],
+                'available' => [],
+            ]);
+        }
+
+        $this->appFetcher->setVersion($newVersion, 'future-apps.json', false);
+
+        // Apps available on the app store for that version
+        $availableApps = array_map(static function (array $app): string {
+            return $app['id'];
+        }, $this->appFetcher->get());
+
+        if (empty($availableApps)) {
+            return new DataResponse([
+                'appstore_disabled' => false,
+                'already_on_latest' => false,
+            ], Http::STATUS_NOT_FOUND);
+        }
+
+        // Ignore apps that are deployed from git
+        $installedApps = array_filter($installedApps, function (string $appId) {
+            try {
+                return !file_exists($this->appManager->getAppPath($appId) . '/.git');
+            } catch (AppPathNotFoundException $e) {
+                return true;
+            }
+        });
+
+        $missing = array_diff($installedApps, $availableApps);
+        $missing = array_map([$this, 'getAppDetails'], $missing);
+        sort($missing);
+
+        $available = array_intersect($installedApps, $availableApps);
+        $available = array_map([$this, 'getAppDetails'], $available);
+        sort($available);
+
+        return new DataResponse([
+            'missing' => $missing,
+            'available' => $available,
+        ]);
+    }
+
+    /**
+     * Get translated app name
+     *
+     * @param string $appId
+     * @return UpdateNotificationApp
+     */
+    protected function getAppDetails(string $appId): array {
+        $app = $this->appManager->getAppInfo($appId, false, $this->language);
+        $name = $app['name'] ?? $appId;
+        return [
+            'appId' => $appId,
+            'appName' => $name,
+        ];
+    }
+
+    protected function getLanguage(): string {
+        if ($this->language === null) {
+            $this->language = $this->l10nFactory->getUserLanguage($this->userSession->getUser());
+        }
+        return $this->language;
+    }
+
+    /**
+     * Get changelog entry for an app
+     *
+     * @param string $appId App to search changelog entry for
+     * @param string|null $version The version to search the changelog entry for (defaults to the latest installed)
+     *
+     * @return DataResponse<Http::STATUS_OK, array{appName: string, content: string, version: string}, array{}>|DataResponse<Http::STATUS_NOT_FOUND, array{}, array{}>|DataResponse<Http::STATUS_BAD_REQUEST, array{}, array{}>
+     *
+     * 200: Changelog entry returned
+     * 400: The `version` parameter is not a valid version format
+     * 404: No changelog found
+     */
+    public function getAppChangelogEntry(string $appId, ?string $version = null): DataResponse {
+        $version = $version ?? $this->appManager->getAppVersion($appId);
+        // handle pre-release versions
+        $matches = [];
+        $result = preg_match('/^(\d+\.\d+(\.\d+)?)/', $version, $matches);
+        if ($result === false || $result === 0) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+        $shortVersion = $matches[0];
+
+        $changes = $this->manager->getChangelog($appId, $shortVersion);
+
+        if ($changes === null) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        // Remove version headline
+        /** @var string[] */
+        $changes = explode("\n", $changes, 2);
+        $changes = trim(end($changes));
+
+        // Get app info for localized app name
+        $info = $this->appManager->getAppInfo($appId) ?? [];
+        /** @var string */
+        $appName = $info['name'] ?? $appId;
+
+        return new DataResponse([
+            'appName' => $appName,
+            'content' => $changes,
+            'version' => $version,
+        ]);
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -75,7 +75,7 @@ 
 
 		// Get list of installed custom apps
 		$installedApps = $this->appManager->getEnabledApps();
-		$installedApps = array_filter($installedApps, function ($app) {
+		$installedApps = array_filter($installedApps, function($app) {
 			try {
 				$this->appManager->getAppPath($app);
 			} catch (AppPathNotFoundException $e) {
@@ -94,7 +94,7 @@ 
 		$this->appFetcher->setVersion($newVersion, 'future-apps.json', false);
 
 		// Apps available on the app store for that version
-		$availableApps = array_map(static function (array $app): string {
+		$availableApps = array_map(static function(array $app): string {
 			return $app['id'];
 		}, $this->appFetcher->get());
 
@@ -106,9 +106,9 @@ 
 		}
 
 		// Ignore apps that are deployed from git
-		$installedApps = array_filter($installedApps, function (string $appId) {
+		$installedApps = array_filter($installedApps, function(string $appId) {
 			try {
-				return !file_exists($this->appManager->getAppPath($appId) . '/.git');
+				return !file_exists($this->appManager->getAppPath($appId).'/.git');
 			} catch (AppPathNotFoundException $e) {
 				return true;
 			}

apps/updatenotification/lib/Controller/AdminController.php

Indentation +39 added lines, -39 removed lines

@@ -24,49 +24,49 @@
 
 class AdminController extends Controller {
 
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		private IJobList $jobList,
-		private ISecureRandom $secureRandom,
-		private IConfig $config,
-		private IAppConfig $appConfig,
-		private ITimeFactory $timeFactory,
-		private IL10N $l10n,
-	) {
-		parent::__construct($appName, $request);
-	}
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        private IJobList $jobList,
+        private ISecureRandom $secureRandom,
+        private IConfig $config,
+        private IAppConfig $appConfig,
+        private ITimeFactory $timeFactory,
+        private IL10N $l10n,
+    ) {
+        parent::__construct($appName, $request);
+    }
 
-	private function isUpdaterEnabled(): bool {
-		return !$this->config->getSystemValueBool('upgrade.disable-web');
-	}
+    private function isUpdaterEnabled(): bool {
+        return !$this->config->getSystemValueBool('upgrade.disable-web');
+    }
 
-	/**
-	 * @param string $channel
-	 * @return DataResponse
-	 */
-	public function setChannel(string $channel): DataResponse {
-		Util::setChannel($channel);
-		$this->appConfig->setValueInt('core', 'lastupdatedat', 0);
-		return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Channel updated')]]);
-	}
+    /**
+     * @param string $channel
+     * @return DataResponse
+     */
+    public function setChannel(string $channel): DataResponse {
+        Util::setChannel($channel);
+        $this->appConfig->setValueInt('core', 'lastupdatedat', 0);
+        return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Channel updated')]]);
+    }
 
-	/**
-	 * @return DataResponse
-	 */
-	public function createCredentials(): DataResponse {
-		if (!$this->isUpdaterEnabled()) {
-			return new DataResponse(['status' => 'error', 'message' => $this->l10n->t('Web updater is disabled')], Http::STATUS_FORBIDDEN);
-		}
+    /**
+     * @return DataResponse
+     */
+    public function createCredentials(): DataResponse {
+        if (!$this->isUpdaterEnabled()) {
+            return new DataResponse(['status' => 'error', 'message' => $this->l10n->t('Web updater is disabled')], Http::STATUS_FORBIDDEN);
+        }
 
-		// Create a new job and store the creation date
-		$this->jobList->add(ResetToken::class);
-		$this->appConfig->setValueInt('core', 'updater.secret.created', $this->timeFactory->getTime());
+        // Create a new job and store the creation date
+        $this->jobList->add(ResetToken::class);
+        $this->appConfig->setValueInt('core', 'updater.secret.created', $this->timeFactory->getTime());
 
-		// Create a new token
-		$newToken = $this->secureRandom->generate(64);
-		$this->config->setSystemValue('updater.secret', password_hash($newToken, PASSWORD_DEFAULT));
+        // Create a new token
+        $newToken = $this->secureRandom->generate(64);
+        $this->config->setSystemValue('updater.secret', password_hash($newToken, PASSWORD_DEFAULT));
 
-		return new DataResponse($newToken);
-	}
+        return new DataResponse($newToken);
+    }
 }

apps/updatenotification/lib/Settings/Admin.php

Indentation +124 added lines, -124 removed lines

@@ -24,128 +24,128 @@
 use Psr\Log\LoggerInterface;
 
 class Admin implements ISettings {
-	public function __construct(
-		private IConfig $config,
-		private IAppConfig $appConfig,
-		private UpdateChecker $updateChecker,
-		private IGroupManager $groupManager,
-		private IDateTimeFormatter $dateTimeFormatter,
-		private IFactory $l10nFactory,
-		private IRegistry $subscriptionRegistry,
-		private IUserManager $userManager,
-		private LoggerInterface $logger,
-		private IInitialState $initialState,
-		private ServerVersion $serverVersion,
-	) {
-	}
-
-	public function getForm(): TemplateResponse {
-		$lastUpdateCheckTimestamp = $this->appConfig->getValueInt('core', 'lastupdatedat');
-		$lastUpdateCheck = $this->dateTimeFormatter->formatDateTime($lastUpdateCheckTimestamp);
-
-		$channels = [
-			'daily',
-			'beta',
-			'stable',
-			'production',
-		];
-		$currentChannel = $this->serverVersion->getChannel();
-		if ($currentChannel === 'git') {
-			$channels[] = 'git';
-		}
-
-		$updateState = $this->updateChecker->getUpdateState();
-
-		$notifyGroups = $this->appConfig->getValueArray(Application::APP_NAME, 'notify_groups', ['admin']);
-
-		$defaultUpdateServerURL = 'https://updates.nextcloud.com/updater_server/';
-		$updateServerURL = $this->config->getSystemValue('updater.server.url', $defaultUpdateServerURL);
-		$defaultCustomerUpdateServerURLPrefix = 'https://updates.nextcloud.com/customers/';
-
-		$isDefaultUpdateServerURL = $updateServerURL === $defaultUpdateServerURL
-			|| strpos($updateServerURL, $defaultCustomerUpdateServerURLPrefix) === 0;
-
-		$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'] ?? []),
-			'webUpdaterEnabled' => !$this->config->getSystemValue('upgrade.disable-web', false),
-			'isWebUpdaterRecommended' => $this->isWebUpdaterRecommended(),
-			'updaterEnabled' => empty($updateState['updaterEnabled']) ? false : $updateState['updaterEnabled'],
-			'versionIsEol' => empty($updateState['versionIsEol']) ? false : $updateState['versionIsEol'],
-			'isDefaultUpdateServerURL' => $isDefaultUpdateServerURL,
-			'updateServerURL' => $updateServerURL,
-			'notifyGroups' => $this->getSelectedGroups($notifyGroups),
-			'hasValidSubscription' => $hasValidSubscription,
-		];
-		$this->initialState->provideInitialState('data', $params);
-
-		return new TemplateResponse('updatenotification', 'admin', [], '');
-	}
-
-	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 string[] $groupIds
-	 * @return list<array{id: string, displayname: string}>
-	 */
-	protected function getSelectedGroups(array $groupIds): array {
-		$result = [];
-		foreach ($groupIds as $groupId) {
-			$group = $this->groupManager->get($groupId);
-
-			if ($group === null) {
-				continue;
-			}
-
-			$result[] = ['id' => $group->getGID(), 'displayname' => $group->getDisplayName()];
-		}
-
-		return $result;
-	}
-
-	public function getSection(): ?string {
-		if (!$this->config->getSystemValueBool('updatechecker', true)) {
-			// update checker is disabled so we do not show the section at all
-			return null;
-		}
-
-		return 'overview';
-	}
-
-	public function getPriority(): int {
-		return 11;
-	}
-
-	private function isWebUpdaterRecommended(): bool {
-		return (int)$this->userManager->countUsersTotal(100) < 100;
-	}
+    public function __construct(
+        private IConfig $config,
+        private IAppConfig $appConfig,
+        private UpdateChecker $updateChecker,
+        private IGroupManager $groupManager,
+        private IDateTimeFormatter $dateTimeFormatter,
+        private IFactory $l10nFactory,
+        private IRegistry $subscriptionRegistry,
+        private IUserManager $userManager,
+        private LoggerInterface $logger,
+        private IInitialState $initialState,
+        private ServerVersion $serverVersion,
+    ) {
+    }
+
+    public function getForm(): TemplateResponse {
+        $lastUpdateCheckTimestamp = $this->appConfig->getValueInt('core', 'lastupdatedat');
+        $lastUpdateCheck = $this->dateTimeFormatter->formatDateTime($lastUpdateCheckTimestamp);
+
+        $channels = [
+            'daily',
+            'beta',
+            'stable',
+            'production',
+        ];
+        $currentChannel = $this->serverVersion->getChannel();
+        if ($currentChannel === 'git') {
+            $channels[] = 'git';
+        }
+
+        $updateState = $this->updateChecker->getUpdateState();
+
+        $notifyGroups = $this->appConfig->getValueArray(Application::APP_NAME, 'notify_groups', ['admin']);
+
+        $defaultUpdateServerURL = 'https://updates.nextcloud.com/updater_server/';
+        $updateServerURL = $this->config->getSystemValue('updater.server.url', $defaultUpdateServerURL);
+        $defaultCustomerUpdateServerURLPrefix = 'https://updates.nextcloud.com/customers/';
+
+        $isDefaultUpdateServerURL = $updateServerURL === $defaultUpdateServerURL
+            || strpos($updateServerURL, $defaultCustomerUpdateServerURLPrefix) === 0;
+
+        $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'] ?? []),
+            'webUpdaterEnabled' => !$this->config->getSystemValue('upgrade.disable-web', false),
+            'isWebUpdaterRecommended' => $this->isWebUpdaterRecommended(),
+            'updaterEnabled' => empty($updateState['updaterEnabled']) ? false : $updateState['updaterEnabled'],
+            'versionIsEol' => empty($updateState['versionIsEol']) ? false : $updateState['versionIsEol'],
+            'isDefaultUpdateServerURL' => $isDefaultUpdateServerURL,
+            'updateServerURL' => $updateServerURL,
+            'notifyGroups' => $this->getSelectedGroups($notifyGroups),
+            'hasValidSubscription' => $hasValidSubscription,
+        ];
+        $this->initialState->provideInitialState('data', $params);
+
+        return new TemplateResponse('updatenotification', 'admin', [], '');
+    }
+
+    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 string[] $groupIds
+     * @return list<array{id: string, displayname: string}>
+     */
+    protected function getSelectedGroups(array $groupIds): array {
+        $result = [];
+        foreach ($groupIds as $groupId) {
+            $group = $this->groupManager->get($groupId);
+
+            if ($group === null) {
+                continue;
+            }
+
+            $result[] = ['id' => $group->getGID(), 'displayname' => $group->getDisplayName()];
+        }
+
+        return $result;
+    }
+
+    public function getSection(): ?string {
+        if (!$this->config->getSystemValueBool('updatechecker', true)) {
+            // update checker is disabled so we do not show the section at all
+            return null;
+        }
+
+        return 'overview';
+    }
+
+    public function getPriority(): int {
+        return 11;
+    }
+
+    private function isWebUpdaterRecommended(): bool {
+        return (int)$this->userManager->countUsersTotal(100) < 100;
+    }
 }

apps/updatenotification/lib/Manager.php

Indentation +85 added lines, -85 removed lines

@@ -16,99 +16,99 @@
 
 class Manager {
 
-	private ?IUser $currentUser;
+    private ?IUser $currentUser;
 
-	public function __construct(
-		IUserSession $currentSession,
-		private IAppManager $appManager,
-		private IFactory $l10NFactory,
-		private LoggerInterface $logger,
-	) {
-		$this->currentUser = $currentSession->getUser();
-	}
+    public function __construct(
+        IUserSession $currentSession,
+        private IAppManager $appManager,
+        private IFactory $l10NFactory,
+        private LoggerInterface $logger,
+    ) {
+        $this->currentUser = $currentSession->getUser();
+    }
 
-	/**
-	 * Get the changelog entry for the given appId
-	 * @param string $appId The app for which to query the entry
-	 * @param string $version The version for which to query the changelog entry
-	 * @param ?string $languageCode The language in which to query the changelog (defaults to current user language and fallsback to English)
-	 * @return string|null Either the changelog entry or null if no changelog is found
-	 */
-	public function getChangelog(string $appId, string $version, ?string $languageCode = null): ?string {
-		if ($languageCode === null) {
-			$languageCode = $this->l10NFactory->getUserLanguage($this->currentUser);
-		}
+    /**
+     * Get the changelog entry for the given appId
+     * @param string $appId The app for which to query the entry
+     * @param string $version The version for which to query the changelog entry
+     * @param ?string $languageCode The language in which to query the changelog (defaults to current user language and fallsback to English)
+     * @return string|null Either the changelog entry or null if no changelog is found
+     */
+    public function getChangelog(string $appId, string $version, ?string $languageCode = null): ?string {
+        if ($languageCode === null) {
+            $languageCode = $this->l10NFactory->getUserLanguage($this->currentUser);
+        }
 
-		$path = $this->getChangelogFile($appId, $languageCode);
-		if ($path === null) {
-			$this->logger->debug('No changelog file found for app ' . $appId . ' and language code ' . $languageCode);
-			return null;
-		}
+        $path = $this->getChangelogFile($appId, $languageCode);
+        if ($path === null) {
+            $this->logger->debug('No changelog file found for app ' . $appId . ' and language code ' . $languageCode);
+            return null;
+        }
 
-		$changes = $this->retrieveChangelogEntry($path, $version);
-		return $changes;
-	}
+        $changes = $this->retrieveChangelogEntry($path, $version);
+        return $changes;
+    }
 
-	/**
-	 * Get the changelog file in the requested language or fallback to English
-	 * @param string $appId The app to load the changelog for
-	 * @param string $languageCode The language code to search
-	 * @return string|null Either the file path or null if not found
-	 */
-	public function getChangelogFile(string $appId, string $languageCode): ?string {
-		try {
-			$appPath = $this->appManager->getAppPath($appId);
-			$files = ["CHANGELOG.$languageCode.md", 'CHANGELOG.en.md'];
-			foreach ($files as $file) {
-				$path = $appPath . '/' . $file;
-				if (is_file($path)) {
-					return $path;
-				}
-			}
-		} catch (\Throwable $e) {
-			// ignore and return null below
-		}
-		return null;
-	}
+    /**
+     * Get the changelog file in the requested language or fallback to English
+     * @param string $appId The app to load the changelog for
+     * @param string $languageCode The language code to search
+     * @return string|null Either the file path or null if not found
+     */
+    public function getChangelogFile(string $appId, string $languageCode): ?string {
+        try {
+            $appPath = $this->appManager->getAppPath($appId);
+            $files = ["CHANGELOG.$languageCode.md", 'CHANGELOG.en.md'];
+            foreach ($files as $file) {
+                $path = $appPath . '/' . $file;
+                if (is_file($path)) {
+                    return $path;
+                }
+            }
+        } catch (\Throwable $e) {
+            // ignore and return null below
+        }
+        return null;
+    }
 
-	/**
-	 * Retrieve a log entry from the changelog
-	 * @param string $path The path to the changelog file
-	 * @param string $version The version to query (make sure to only pass in "{major}.{minor}(.{patch}" format)
-	 */
-	protected function retrieveChangelogEntry(string $path, string $version): ?string {
-		$matches = [];
-		$content = file_get_contents($path);
-		if ($content === false) {
-			$this->logger->debug('Could not open changelog file', ['file-path' => $path]);
-			return null;
-		}
+    /**
+     * Retrieve a log entry from the changelog
+     * @param string $path The path to the changelog file
+     * @param string $version The version to query (make sure to only pass in "{major}.{minor}(.{patch}" format)
+     */
+    protected function retrieveChangelogEntry(string $path, string $version): ?string {
+        $matches = [];
+        $content = file_get_contents($path);
+        if ($content === false) {
+            $this->logger->debug('Could not open changelog file', ['file-path' => $path]);
+            return null;
+        }
 
-		$result = preg_match_all('/^## (?:\[)?(?:v)?(\d+\.\d+(\.\d+)?)/m', $content, $matches, PREG_OFFSET_CAPTURE);
-		if ($result === false || $result === 0) {
-			$this->logger->debug('No entries in changelog found', ['file_path' => $path]);
-			return null;
-		}
+        $result = preg_match_all('/^## (?:\[)?(?:v)?(\d+\.\d+(\.\d+)?)/m', $content, $matches, PREG_OFFSET_CAPTURE);
+        if ($result === false || $result === 0) {
+            $this->logger->debug('No entries in changelog found', ['file_path' => $path]);
+            return null;
+        }
 
-		// Get the key of the match that equals the requested version
-		$index = array_key_first(
-			// Get the array containing the match that equals the requested version, keys are preserved so: [1 => '1.2.4']
-			array_filter(
-				// This is the array of the versions found, like ['1.2.3', '1.2.4']
-				$matches[1],
-				// Callback to filter only version that matches the requested version
-				fn (array $match) => version_compare($match[0], $version, '=='),
-			)
-		);
+        // Get the key of the match that equals the requested version
+        $index = array_key_first(
+            // Get the array containing the match that equals the requested version, keys are preserved so: [1 => '1.2.4']
+            array_filter(
+                // This is the array of the versions found, like ['1.2.3', '1.2.4']
+                $matches[1],
+                // Callback to filter only version that matches the requested version
+                fn (array $match) => version_compare($match[0], $version, '=='),
+            )
+        );
 
-		if ($index === null) {
-			$this->logger->debug('No changelog entry for version ' . $version . ' found', ['file_path' => $path]);
-			return null;
-		}
+        if ($index === null) {
+            $this->logger->debug('No changelog entry for version ' . $version . ' found', ['file_path' => $path]);
+            return null;
+        }
 
-		$offsetChangelogEntry = $matches[0][$index][1];
-		// Length of the changelog entry (offset of next match - own offset) or null if the whole rest should be considered
-		$lengthChangelogEntry = $index < ($result - 1) ? ($matches[0][$index + 1][1] - $offsetChangelogEntry) : null;
-		return substr($content, $offsetChangelogEntry, $lengthChangelogEntry);
-	}
+        $offsetChangelogEntry = $matches[0][$index][1];
+        // Length of the changelog entry (offset of next match - own offset) or null if the whole rest should be considered
+        $lengthChangelogEntry = $index < ($result - 1) ? ($matches[0][$index + 1][1] - $offsetChangelogEntry) : null;
+        return substr($content, $offsetChangelogEntry, $lengthChangelogEntry);
+    }
 }

apps/updatenotification/lib/Notification/Notifier.php

Indentation +138 added lines, -138 removed lines

@@ -24,142 +24,142 @@
 use OCP\ServerVersion;
 
 class Notifier implements INotifier {
-	/** @var string[] */
-	protected $appVersions;
-
-	/**
-	 * Notifier constructor.
-	 */
-	public function __construct(
-		protected IURLGenerator $url,
-		protected IAppConfig $appConfig,
-		protected IManager $notificationManager,
-		protected IFactory $l10NFactory,
-		protected IUserSession $userSession,
-		protected IGroupManager $groupManager,
-		protected IAppManager $appManager,
-		protected ServerVersion $serverVersion,
-	) {
-		$this->appVersions = $this->appManager->getAppInstalledVersions();
-	}
-
-	/**
-	 * Identifier of the notifier, only use [a-z0-9_]
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getID(): string {
-		return Application::APP_NAME;
-	}
-
-	/**
-	 * Human readable name describing the notifier
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getName(): string {
-		return $this->l10NFactory->get(Application::APP_NAME)->t('Update notifications');
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @param string $languageCode The code of the language that should be used to prepare the notification
-	 * @return INotification
-	 * @throws UnknownNotificationException When the notification was not prepared by a notifier
-	 * @throws AlreadyProcessedException When the notification is not needed anymore and should be deleted
-	 * @since 9.0.0
-	 */
-	public function prepare(INotification $notification, string $languageCode): INotification {
-		if ($notification->getApp() !== Application::APP_NAME) {
-			throw new UnknownNotificationException('Unknown app id');
-		}
-
-		if ($notification->getSubject() !== 'update_available' && $notification->getSubject() !== 'connection_error') {
-			throw new UnknownNotificationException('Unknown subject');
-		}
-
-		$l = $this->l10NFactory->get(Application::APP_NAME, $languageCode);
-		if ($notification->getSubject() === 'connection_error') {
-			$errors = $this->appConfig->getAppValueInt('update_check_errors', 0);
-			if ($errors === 0) {
-				throw new AlreadyProcessedException();
-			}
-
-			$notification->setParsedSubject($l->t('The update server could not be reached since %d days to check for new updates.', [$errors]))
-				->setParsedMessage($l->t('Please check the Nextcloud and server log files for errors.'));
-		} else {
-			if ($notification->getObjectType() === 'core') {
-				$this->updateAlreadyInstalledCheck($notification, $this->getCoreVersions());
-
-				$parameters = $notification->getSubjectParameters();
-				$notification->setRichSubject($l->t('Update to {serverAndVersion} is available.'), [
-					'serverAndVersion' => [
-						'type' => 'highlight',
-						'id' => $notification->getObjectType(),
-						'name' => $parameters['version'],
-					]
-				]);
-
-				if ($this->isAdmin()) {
-					$notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index', ['section' => 'overview']) . '#version');
-				}
-			} else {
-				$appInfo = $this->getAppInfo($notification->getObjectType(), $languageCode);
-				$appName = ($appInfo === null) ? $notification->getObjectType() : $appInfo['name'];
-
-				if (isset($this->appVersions[$notification->getObjectType()])) {
-					$this->updateAlreadyInstalledCheck($notification, $this->appVersions[$notification->getObjectType()]);
-				}
-
-				$notification->setRichSubject($l->t('Update for {app} to version %s is available.', [$notification->getObjectId()]), [
-					'app' => [
-						'type' => 'app',
-						'id' => $notification->getObjectType(),
-						'name' => $appName,
-					]
-				]);
-
-				if ($this->isAdmin()) {
-					$notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps', ['category' => 'updates']) . '#app-' . $notification->getObjectType());
-				}
-			}
-		}
-
-		$notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath(Application::APP_NAME, 'notification.svg')));
-
-		return $notification;
-	}
-
-	/**
-	 * Remove the notification and prevent rendering, when the update is installed
-	 *
-	 * @param INotification $notification
-	 * @param string $installedVersion
-	 * @throws AlreadyProcessedException When the update is already installed
-	 */
-	protected function updateAlreadyInstalledCheck(INotification $notification, $installedVersion): void {
-		if (version_compare($notification->getObjectId(), $installedVersion, '<=')) {
-			throw new AlreadyProcessedException();
-		}
-	}
-
-	protected function isAdmin(): bool {
-		$user = $this->userSession->getUser();
-
-		if ($user instanceof IUser) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-
-		return false;
-	}
-
-	protected function getCoreVersions(): string {
-		return implode('.', $this->serverVersion->getVersion());
-	}
-
-	protected function getAppInfo(string $appId, ?string $languageCode): ?array {
-		return $this->appManager->getAppInfo($appId, false, $languageCode);
-	}
+    /** @var string[] */
+    protected $appVersions;
+
+    /**
+     * Notifier constructor.
+     */
+    public function __construct(
+        protected IURLGenerator $url,
+        protected IAppConfig $appConfig,
+        protected IManager $notificationManager,
+        protected IFactory $l10NFactory,
+        protected IUserSession $userSession,
+        protected IGroupManager $groupManager,
+        protected IAppManager $appManager,
+        protected ServerVersion $serverVersion,
+    ) {
+        $this->appVersions = $this->appManager->getAppInstalledVersions();
+    }
+
+    /**
+     * Identifier of the notifier, only use [a-z0-9_]
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getID(): string {
+        return Application::APP_NAME;
+    }
+
+    /**
+     * Human readable name describing the notifier
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getName(): string {
+        return $this->l10NFactory->get(Application::APP_NAME)->t('Update notifications');
+    }
+
+    /**
+     * @param INotification $notification
+     * @param string $languageCode The code of the language that should be used to prepare the notification
+     * @return INotification
+     * @throws UnknownNotificationException When the notification was not prepared by a notifier
+     * @throws AlreadyProcessedException When the notification is not needed anymore and should be deleted
+     * @since 9.0.0
+     */
+    public function prepare(INotification $notification, string $languageCode): INotification {
+        if ($notification->getApp() !== Application::APP_NAME) {
+            throw new UnknownNotificationException('Unknown app id');
+        }
+
+        if ($notification->getSubject() !== 'update_available' && $notification->getSubject() !== 'connection_error') {
+            throw new UnknownNotificationException('Unknown subject');
+        }
+
+        $l = $this->l10NFactory->get(Application::APP_NAME, $languageCode);
+        if ($notification->getSubject() === 'connection_error') {
+            $errors = $this->appConfig->getAppValueInt('update_check_errors', 0);
+            if ($errors === 0) {
+                throw new AlreadyProcessedException();
+            }
+
+            $notification->setParsedSubject($l->t('The update server could not be reached since %d days to check for new updates.', [$errors]))
+                ->setParsedMessage($l->t('Please check the Nextcloud and server log files for errors.'));
+        } else {
+            if ($notification->getObjectType() === 'core') {
+                $this->updateAlreadyInstalledCheck($notification, $this->getCoreVersions());
+
+                $parameters = $notification->getSubjectParameters();
+                $notification->setRichSubject($l->t('Update to {serverAndVersion} is available.'), [
+                    'serverAndVersion' => [
+                        'type' => 'highlight',
+                        'id' => $notification->getObjectType(),
+                        'name' => $parameters['version'],
+                    ]
+                ]);
+
+                if ($this->isAdmin()) {
+                    $notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index', ['section' => 'overview']) . '#version');
+                }
+            } else {
+                $appInfo = $this->getAppInfo($notification->getObjectType(), $languageCode);
+                $appName = ($appInfo === null) ? $notification->getObjectType() : $appInfo['name'];
+
+                if (isset($this->appVersions[$notification->getObjectType()])) {
+                    $this->updateAlreadyInstalledCheck($notification, $this->appVersions[$notification->getObjectType()]);
+                }
+
+                $notification->setRichSubject($l->t('Update for {app} to version %s is available.', [$notification->getObjectId()]), [
+                    'app' => [
+                        'type' => 'app',
+                        'id' => $notification->getObjectType(),
+                        'name' => $appName,
+                    ]
+                ]);
+
+                if ($this->isAdmin()) {
+                    $notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps', ['category' => 'updates']) . '#app-' . $notification->getObjectType());
+                }
+            }
+        }
+
+        $notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath(Application::APP_NAME, 'notification.svg')));
+
+        return $notification;
+    }
+
+    /**
+     * Remove the notification and prevent rendering, when the update is installed
+     *
+     * @param INotification $notification
+     * @param string $installedVersion
+     * @throws AlreadyProcessedException When the update is already installed
+     */
+    protected function updateAlreadyInstalledCheck(INotification $notification, $installedVersion): void {
+        if (version_compare($notification->getObjectId(), $installedVersion, '<=')) {
+            throw new AlreadyProcessedException();
+        }
+    }
+
+    protected function isAdmin(): bool {
+        $user = $this->userSession->getUser();
+
+        if ($user instanceof IUser) {
+            return $this->groupManager->isAdmin($user->getUID());
+        }
+
+        return false;
+    }
+
+    protected function getCoreVersions(): string {
+        return implode('.', $this->serverVersion->getVersion());
+    }
+
+    protected function getAppInfo(string $appId, ?string $languageCode): ?array {
+        return $this->appManager->getAppInfo($appId, false, $languageCode);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -103,7 +103,7 @@ 
 				]);
 
 				if ($this->isAdmin()) {
-					$notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index', ['section' => 'overview']) . '#version');
+					$notification->setLink($this->url->linkToRouteAbsolute('settings.AdminSettings.index', ['section' => 'overview']).'#version');
 				}
 			} else {
 				$appInfo = $this->getAppInfo($notification->getObjectType(), $languageCode);
@@ -122,7 +122,7 @@ 
 				]);
 
 				if ($this->isAdmin()) {
-					$notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps', ['category' => 'updates']) . '#app-' . $notification->getObjectType());
+					$notification->setLink($this->url->linkToRouteAbsolute('settings.AppSettings.viewApps', ['category' => 'updates']).'#app-'.$notification->getObjectType());
 				}
 			}
 		}

apps/updatenotification/lib/BackgroundJob/UpdateAvailableNotifications.php

Indentation +218 added lines, -218 removed lines

@@ -23,222 +23,222 @@
 
 class UpdateAvailableNotifications extends TimedJob {
 
-	/**
-	 * Numbers of failed updater connection to report error as notification.
-	 * @var list<int>
-	 */
-	protected const CONNECTION_NOTIFICATIONS = [3, 7, 14, 30];
-
-	/** @var ?string[] */
-	protected $users = null;
-
-	public function __construct(
-		ITimeFactory $timeFactory,
-		protected ServerVersion $serverVersion,
-		protected IConfig $config,
-		protected IAppConfig $appConfig,
-		protected IManager $notificationManager,
-		protected IGroupManager $groupManager,
-		protected IAppManager $appManager,
-		protected Installer $installer,
-		protected VersionCheck $versionCheck,
-	) {
-		parent::__construct($timeFactory);
-		// Run once a day
-		$this->setInterval(60 * 60 * 24);
-		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
-	}
-
-	protected function run($argument) {
-		// Do not check for updates if not connected to the internet
-		if (!$this->config->getSystemValueBool('has_internet_connection', true)) {
-			return;
-		}
-
-		if (\OC::$CLI && !$this->config->getSystemValueBool('debug', false)) {
-			try {
-				// Jitter the pinging of the updater server and the appstore a bit.
-				// Otherwise all Nextcloud installations are pinging the servers
-				// in one of 288
-				sleep(random_int(1, 180));
-			} catch (\Exception $e) {
-			}
-		}
-
-		$this->checkCoreUpdate();
-		$this->checkAppUpdates();
-	}
-
-	/**
-	 * Check for Nextcloud server update
-	 */
-	protected function checkCoreUpdate(): void {
-		if (!$this->config->getSystemValueBool('updatechecker', true)) {
-			// update checker is disabled so no core update check!
-			return;
-		}
-
-		if (\in_array($this->serverVersion->getChannel(), ['daily', 'git'], true)) {
-			// "These aren't the update channels you're looking for." - Ben Obi-Wan Kenobi
-			return;
-		}
-
-		$status = $this->versionCheck->check();
-		if ($status === false) {
-			$errors = 1 + $this->appConfig->getAppValueInt('update_check_errors', 0);
-			$this->appConfig->setAppValueInt('update_check_errors', $errors);
-
-			if (\in_array($errors, self::CONNECTION_NOTIFICATIONS, true)) {
-				$this->sendErrorNotifications($errors);
-			}
-		} elseif (\is_array($status)) {
-			$this->appConfig->setAppValueInt('update_check_errors', 0);
-			$this->clearErrorNotifications();
-
-			if (isset($status['version'])) {
-				$this->createNotifications('core', $status['version'], $status['versionstring']);
-			}
-		}
-	}
-
-	/**
-	 * Send a message to the admin when the update server could not be reached
-	 * @param int $numDays
-	 */
-	protected function sendErrorNotifications($numDays): void {
-		$this->clearErrorNotifications();
-
-		$notification = $this->notificationManager->createNotification();
-		try {
-			$notification->setApp(Application::APP_NAME)
-				->setDateTime(new \DateTime())
-				->setObject(Application::APP_NAME, 'error')
-				->setSubject('connection_error', ['days' => $numDays]);
-
-			foreach ($this->getUsersToNotify() as $uid) {
-				$notification->setUser($uid);
-				$this->notificationManager->notify($notification);
-			}
-		} catch (\InvalidArgumentException $e) {
-			return;
-		}
-	}
-
-	/**
-	 * Remove error notifications again
-	 */
-	protected function clearErrorNotifications(): void {
-		$notification = $this->notificationManager->createNotification();
-		try {
-			$notification->setApp(Application::APP_NAME)
-				->setSubject('connection_error')
-				->setObject(Application::APP_NAME, 'error');
-		} catch (\InvalidArgumentException $e) {
-			return;
-		}
-		$this->notificationManager->markProcessed($notification);
-	}
-
-	/**
-	 * Check all installed apps for updates
-	 */
-	protected function checkAppUpdates(): void {
-		$apps = $this->appManager->getEnabledApps();
-		foreach ($apps as $app) {
-			$update = $this->isUpdateAvailable($app);
-			if ($update !== false) {
-				$this->createNotifications($app, $update);
-			}
-		}
-	}
-
-	/**
-	 * Create notifications for this app version
-	 *
-	 * @param string $app
-	 * @param string $version
-	 * @param string $visibleVersion
-	 */
-	protected function createNotifications($app, $version, $visibleVersion = ''): void {
-		$lastNotification = $this->appConfig->getAppValueString($app, '');
-		if ($lastNotification === $version) {
-			// We already notified about this update
-			return;
-		}
-
-		if ($lastNotification !== '') {
-			// Delete old updates
-			$this->deleteOutdatedNotifications($app, $lastNotification);
-		}
-
-		$notification = $this->notificationManager->createNotification();
-		try {
-			$notification->setApp(Application::APP_NAME)
-				->setDateTime(new \DateTime())
-				->setObject($app, $version);
-
-			if ($visibleVersion !== '') {
-				$notification->setSubject('update_available', ['version' => $visibleVersion]);
-			} else {
-				$notification->setSubject('update_available');
-			}
-
-			foreach ($this->getUsersToNotify() as $uid) {
-				$notification->setUser($uid);
-				$this->notificationManager->notify($notification);
-			}
-		} catch (\InvalidArgumentException $e) {
-			return;
-		}
-
-		$this->appConfig->setAppValueString($app, $version);
-	}
-
-	/**
-	 * @return string[]
-	 */
-	protected function getUsersToNotify(): array {
-		if ($this->users !== null) {
-			return $this->users;
-		}
-
-		$notifyGroups = $this->appConfig->getAppValueArray('notify_groups', ['admin']);
-		$this->users = [];
-		foreach ($notifyGroups as $group) {
-			$groupToNotify = $this->groupManager->get($group);
-			if ($groupToNotify instanceof IGroup) {
-				foreach ($groupToNotify->getUsers() as $user) {
-					$this->users[] = $user->getUID();
-				}
-			}
-		}
-
-		$this->users = array_values(array_unique($this->users));
-		return $this->users;
-	}
-
-	/**
-	 * Delete notifications for old updates
-	 *
-	 * @param string $app
-	 * @param string $version
-	 */
-	protected function deleteOutdatedNotifications($app, $version): void {
-		$notification = $this->notificationManager->createNotification();
-		try {
-			$notification->setApp(Application::APP_NAME)
-				->setObject($app, $version);
-		} catch (\InvalidArgumentException) {
-			return;
-		}
-		$this->notificationManager->markProcessed($notification);
-	}
-
-	/**
-	 * @param string $app
-	 * @return string|false
-	 */
-	protected function isUpdateAvailable($app) {
-		return $this->installer->isUpdateAvailable($app);
-	}
+    /**
+     * Numbers of failed updater connection to report error as notification.
+     * @var list<int>
+     */
+    protected const CONNECTION_NOTIFICATIONS = [3, 7, 14, 30];
+
+    /** @var ?string[] */
+    protected $users = null;
+
+    public function __construct(
+        ITimeFactory $timeFactory,
+        protected ServerVersion $serverVersion,
+        protected IConfig $config,
+        protected IAppConfig $appConfig,
+        protected IManager $notificationManager,
+        protected IGroupManager $groupManager,
+        protected IAppManager $appManager,
+        protected Installer $installer,
+        protected VersionCheck $versionCheck,
+    ) {
+        parent::__construct($timeFactory);
+        // Run once a day
+        $this->setInterval(60 * 60 * 24);
+        $this->setTimeSensitivity(self::TIME_INSENSITIVE);
+    }
+
+    protected function run($argument) {
+        // Do not check for updates if not connected to the internet
+        if (!$this->config->getSystemValueBool('has_internet_connection', true)) {
+            return;
+        }
+
+        if (\OC::$CLI && !$this->config->getSystemValueBool('debug', false)) {
+            try {
+                // Jitter the pinging of the updater server and the appstore a bit.
+                // Otherwise all Nextcloud installations are pinging the servers
+                // in one of 288
+                sleep(random_int(1, 180));
+            } catch (\Exception $e) {
+            }
+        }
+
+        $this->checkCoreUpdate();
+        $this->checkAppUpdates();
+    }
+
+    /**
+     * Check for Nextcloud server update
+     */
+    protected function checkCoreUpdate(): void {
+        if (!$this->config->getSystemValueBool('updatechecker', true)) {
+            // update checker is disabled so no core update check!
+            return;
+        }
+
+        if (\in_array($this->serverVersion->getChannel(), ['daily', 'git'], true)) {
+            // "These aren't the update channels you're looking for." - Ben Obi-Wan Kenobi
+            return;
+        }
+
+        $status = $this->versionCheck->check();
+        if ($status === false) {
+            $errors = 1 + $this->appConfig->getAppValueInt('update_check_errors', 0);
+            $this->appConfig->setAppValueInt('update_check_errors', $errors);
+
+            if (\in_array($errors, self::CONNECTION_NOTIFICATIONS, true)) {
+                $this->sendErrorNotifications($errors);
+            }
+        } elseif (\is_array($status)) {
+            $this->appConfig->setAppValueInt('update_check_errors', 0);
+            $this->clearErrorNotifications();
+
+            if (isset($status['version'])) {
+                $this->createNotifications('core', $status['version'], $status['versionstring']);
+            }
+        }
+    }
+
+    /**
+     * Send a message to the admin when the update server could not be reached
+     * @param int $numDays
+     */
+    protected function sendErrorNotifications($numDays): void {
+        $this->clearErrorNotifications();
+
+        $notification = $this->notificationManager->createNotification();
+        try {
+            $notification->setApp(Application::APP_NAME)
+                ->setDateTime(new \DateTime())
+                ->setObject(Application::APP_NAME, 'error')
+                ->setSubject('connection_error', ['days' => $numDays]);
+
+            foreach ($this->getUsersToNotify() as $uid) {
+                $notification->setUser($uid);
+                $this->notificationManager->notify($notification);
+            }
+        } catch (\InvalidArgumentException $e) {
+            return;
+        }
+    }
+
+    /**
+     * Remove error notifications again
+     */
+    protected function clearErrorNotifications(): void {
+        $notification = $this->notificationManager->createNotification();
+        try {
+            $notification->setApp(Application::APP_NAME)
+                ->setSubject('connection_error')
+                ->setObject(Application::APP_NAME, 'error');
+        } catch (\InvalidArgumentException $e) {
+            return;
+        }
+        $this->notificationManager->markProcessed($notification);
+    }
+
+    /**
+     * Check all installed apps for updates
+     */
+    protected function checkAppUpdates(): void {
+        $apps = $this->appManager->getEnabledApps();
+        foreach ($apps as $app) {
+            $update = $this->isUpdateAvailable($app);
+            if ($update !== false) {
+                $this->createNotifications($app, $update);
+            }
+        }
+    }
+
+    /**
+     * Create notifications for this app version
+     *
+     * @param string $app
+     * @param string $version
+     * @param string $visibleVersion
+     */
+    protected function createNotifications($app, $version, $visibleVersion = ''): void {
+        $lastNotification = $this->appConfig->getAppValueString($app, '');
+        if ($lastNotification === $version) {
+            // We already notified about this update
+            return;
+        }
+
+        if ($lastNotification !== '') {
+            // Delete old updates
+            $this->deleteOutdatedNotifications($app, $lastNotification);
+        }
+
+        $notification = $this->notificationManager->createNotification();
+        try {
+            $notification->setApp(Application::APP_NAME)
+                ->setDateTime(new \DateTime())
+                ->setObject($app, $version);
+
+            if ($visibleVersion !== '') {
+                $notification->setSubject('update_available', ['version' => $visibleVersion]);
+            } else {
+                $notification->setSubject('update_available');
+            }
+
+            foreach ($this->getUsersToNotify() as $uid) {
+                $notification->setUser($uid);
+                $this->notificationManager->notify($notification);
+            }
+        } catch (\InvalidArgumentException $e) {
+            return;
+        }
+
+        $this->appConfig->setAppValueString($app, $version);
+    }
+
+    /**
+     * @return string[]
+     */
+    protected function getUsersToNotify(): array {
+        if ($this->users !== null) {
+            return $this->users;
+        }
+
+        $notifyGroups = $this->appConfig->getAppValueArray('notify_groups', ['admin']);
+        $this->users = [];
+        foreach ($notifyGroups as $group) {
+            $groupToNotify = $this->groupManager->get($group);
+            if ($groupToNotify instanceof IGroup) {
+                foreach ($groupToNotify->getUsers() as $user) {
+                    $this->users[] = $user->getUID();
+                }
+            }
+        }
+
+        $this->users = array_values(array_unique($this->users));
+        return $this->users;
+    }
+
+    /**
+     * Delete notifications for old updates
+     *
+     * @param string $app
+     * @param string $version
+     */
+    protected function deleteOutdatedNotifications($app, $version): void {
+        $notification = $this->notificationManager->createNotification();
+        try {
+            $notification->setApp(Application::APP_NAME)
+                ->setObject($app, $version);
+        } catch (\InvalidArgumentException) {
+            return;
+        }
+        $this->notificationManager->markProcessed($notification);
+    }
+
+    /**
+     * @param string $app
+     * @return string|false
+     */
+    protected function isUpdateAvailable($app) {
+        return $this->installer->isUpdateAvailable($app);
+    }
 }

apps/updatenotification/composer/composer/autoload_static.php

Spacing +24 added lines, -24 removed lines

@@ -6,43 +6,43 @@
 
 class ComposerStaticInitUpdateNotification
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\UpdateNotification\\' => 23,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\UpdateNotification\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-        'OCA\\UpdateNotification\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\UpdateNotification\\BackgroundJob\\AppUpdatedNotifications' => __DIR__ . '/..' . '/../lib/BackgroundJob/AppUpdatedNotifications.php',
-        'OCA\\UpdateNotification\\BackgroundJob\\ResetToken' => __DIR__ . '/..' . '/../lib/BackgroundJob/ResetToken.php',
-        'OCA\\UpdateNotification\\BackgroundJob\\UpdateAvailableNotifications' => __DIR__ . '/..' . '/../lib/BackgroundJob/UpdateAvailableNotifications.php',
-        'OCA\\UpdateNotification\\Command\\Check' => __DIR__ . '/..' . '/../lib/Command/Check.php',
-        'OCA\\UpdateNotification\\Controller\\APIController' => __DIR__ . '/..' . '/../lib/Controller/APIController.php',
-        'OCA\\UpdateNotification\\Controller\\AdminController' => __DIR__ . '/..' . '/../lib/Controller/AdminController.php',
-        'OCA\\UpdateNotification\\Controller\\ChangelogController' => __DIR__ . '/..' . '/../lib/Controller/ChangelogController.php',
-        'OCA\\UpdateNotification\\Listener\\AppUpdateEventListener' => __DIR__ . '/..' . '/../lib/Listener/AppUpdateEventListener.php',
-        'OCA\\UpdateNotification\\Listener\\BeforeTemplateRenderedEventListener' => __DIR__ . '/..' . '/../lib/Listener/BeforeTemplateRenderedEventListener.php',
-        'OCA\\UpdateNotification\\Manager' => __DIR__ . '/..' . '/../lib/Manager.php',
-        'OCA\\UpdateNotification\\Notification\\AppUpdateNotifier' => __DIR__ . '/..' . '/../lib/Notification/AppUpdateNotifier.php',
-        'OCA\\UpdateNotification\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php',
-        'OCA\\UpdateNotification\\ResponseDefinitions' => __DIR__ . '/..' . '/../lib/ResponseDefinitions.php',
-        'OCA\\UpdateNotification\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
-        'OCA\\UpdateNotification\\UpdateChecker' => __DIR__ . '/..' . '/../lib/UpdateChecker.php',
+    public static $classMap = array(
+        'Composer\\InstalledVersions' => __DIR__.'/..'.'/composer/InstalledVersions.php',
+        'OCA\\UpdateNotification\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\UpdateNotification\\BackgroundJob\\AppUpdatedNotifications' => __DIR__.'/..'.'/../lib/BackgroundJob/AppUpdatedNotifications.php',
+        'OCA\\UpdateNotification\\BackgroundJob\\ResetToken' => __DIR__.'/..'.'/../lib/BackgroundJob/ResetToken.php',
+        'OCA\\UpdateNotification\\BackgroundJob\\UpdateAvailableNotifications' => __DIR__.'/..'.'/../lib/BackgroundJob/UpdateAvailableNotifications.php',
+        'OCA\\UpdateNotification\\Command\\Check' => __DIR__.'/..'.'/../lib/Command/Check.php',
+        'OCA\\UpdateNotification\\Controller\\APIController' => __DIR__.'/..'.'/../lib/Controller/APIController.php',
+        'OCA\\UpdateNotification\\Controller\\AdminController' => __DIR__.'/..'.'/../lib/Controller/AdminController.php',
+        'OCA\\UpdateNotification\\Controller\\ChangelogController' => __DIR__.'/..'.'/../lib/Controller/ChangelogController.php',
+        'OCA\\UpdateNotification\\Listener\\AppUpdateEventListener' => __DIR__.'/..'.'/../lib/Listener/AppUpdateEventListener.php',
+        'OCA\\UpdateNotification\\Listener\\BeforeTemplateRenderedEventListener' => __DIR__.'/..'.'/../lib/Listener/BeforeTemplateRenderedEventListener.php',
+        'OCA\\UpdateNotification\\Manager' => __DIR__.'/..'.'/../lib/Manager.php',
+        'OCA\\UpdateNotification\\Notification\\AppUpdateNotifier' => __DIR__.'/..'.'/../lib/Notification/AppUpdateNotifier.php',
+        'OCA\\UpdateNotification\\Notification\\Notifier' => __DIR__.'/..'.'/../lib/Notification/Notifier.php',
+        'OCA\\UpdateNotification\\ResponseDefinitions' => __DIR__.'/..'.'/../lib/ResponseDefinitions.php',
+        'OCA\\UpdateNotification\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
+        'OCA\\UpdateNotification\\UpdateChecker' => __DIR__.'/..'.'/../lib/UpdateChecker.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitUpdateNotification::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitUpdateNotification::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitUpdateNotification::$classMap;