nextcloud / server

apps/updatenotification/lib/Settings/Admin.php

Indentation +136 added lines, -136 removed lines

@@ -37,140 +37,140 @@
 use OCP\Util;
 
 class Admin implements ISettings {
-	/** @var IConfig */
-	private $config;
-	/** @var UpdateChecker */
-	private $updateChecker;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IDateTimeFormatter */
-	private $dateTimeFormatter;
-	/** @var IUserSession */
-	private $session;
-	/** @var IFactory */
-	private $l10nFactory;
-
-	public function __construct(
-		IConfig $config,
-		UpdateChecker $updateChecker,
-		IGroupManager $groupManager,
-		IDateTimeFormatter $dateTimeFormatter,
-		IUserSession $session,
-		IFactory $l10nFactory
-	) {
-		$this->config = $config;
-		$this->updateChecker = $updateChecker;
-		$this->groupManager = $groupManager;
-		$this->dateTimeFormatter = $dateTimeFormatter;
-		$this->session = $session;
-		$this->l10nFactory = $l10nFactory;
-	}
-
-	/**
-	 * @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);
-
-		$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' => $updateServerURL === $defaultUpdateServerURL,
-			'updateServerURL' => $updateServerURL,
-			'notifyGroups' => $this->getSelectedGroups($notifyGroups),
-		];
-
-		$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 IUserSession */
+    private $session;
+    /** @var IFactory */
+    private $l10nFactory;
+
+    public function __construct(
+        IConfig $config,
+        UpdateChecker $updateChecker,
+        IGroupManager $groupManager,
+        IDateTimeFormatter $dateTimeFormatter,
+        IUserSession $session,
+        IFactory $l10nFactory
+    ) {
+        $this->config = $config;
+        $this->updateChecker = $updateChecker;
+        $this->groupManager = $groupManager;
+        $this->dateTimeFormatter = $dateTimeFormatter;
+        $this->session = $session;
+        $this->l10nFactory = $l10nFactory;
+    }
+
+    /**
+     * @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);
+
+        $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' => $updateServerURL === $defaultUpdateServerURL,
+            'updateServerURL' => $updateServerURL,
+            'notifyGroups' => $this->getSelectedGroups($notifyGroups),
+        ];
+
+        $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;
+    }
 }

apps/updatenotification/lib/UpdateChecker.php

Indentation +50 added lines, -50 removed lines

@@ -29,60 +29,60 @@
 use OC\Updater\VersionCheck;
 
 class UpdateChecker {
-	/** @var VersionCheck */
-	private $updater;
-	/** @var ChangesCheck */
-	private $changesCheck;
+    /** @var VersionCheck */
+    private $updater;
+    /** @var ChangesCheck */
+    private $changesCheck;
 
-	/**
-	 * @param VersionCheck $updater
-	 */
-	public function __construct(VersionCheck $updater, ChangesCheck $changesCheck) {
-		$this->updater = $updater;
-		$this->changesCheck = $changesCheck;
-	}
+    /**
+     * @param VersionCheck $updater
+     */
+    public function __construct(VersionCheck $updater, ChangesCheck $changesCheck) {
+        $this->updater = $updater;
+        $this->changesCheck = $changesCheck;
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getUpdateState(): array {
-		$data = $this->updater->check();
-		$result = [];
+    /**
+     * @return array
+     */
+    public function getUpdateState(): array {
+        $data = $this->updater->check();
+        $result = [];
 
-		if (isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
-			$result['updateAvailable'] = true;
-			$result['updateVersion'] = $data['version'];
-			$result['updateVersionString'] = $data['versionstring'];
-			$result['updaterEnabled'] = $data['autoupdater'] === '1';
-			$result['versionIsEol'] = $data['eol'] === '1';
-			if (strpos($data['web'], 'https://') === 0) {
-				$result['updateLink'] = $data['web'];
-			}
-			if (strpos($data['url'], 'https://') === 0) {
-				$result['downloadLink'] = $data['url'];
-			}
-			if (strpos($data['changes'], 'https://') === 0) {
-				try {
-					$result['changes'] = $this->changesCheck->check($data['changes'], $data['version']);
-				} catch (\Exception $e) {
-					// no info, not a problem
-				}
-			}
+        if (isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
+            $result['updateAvailable'] = true;
+            $result['updateVersion'] = $data['version'];
+            $result['updateVersionString'] = $data['versionstring'];
+            $result['updaterEnabled'] = $data['autoupdater'] === '1';
+            $result['versionIsEol'] = $data['eol'] === '1';
+            if (strpos($data['web'], 'https://') === 0) {
+                $result['updateLink'] = $data['web'];
+            }
+            if (strpos($data['url'], 'https://') === 0) {
+                $result['downloadLink'] = $data['url'];
+            }
+            if (strpos($data['changes'], 'https://') === 0) {
+                try {
+                    $result['changes'] = $this->changesCheck->check($data['changes'], $data['version']);
+                } catch (\Exception $e) {
+                    // no info, not a problem
+                }
+            }
 
-			return $result;
-		}
+            return $result;
+        }
 
-		return [];
-	}
+        return [];
+    }
 
-	/**
-	 * @param array $data
-	 */
-	public function populateJavaScriptVariables(array $data) {
-		$data['array']['oc_updateState'] =  json_encode([
-			'updateAvailable' => true,
-			'updateVersion' => $this->getUpdateState()['updateVersionString'],
-			'updateLink' => $this->getUpdateState()['updateLink'] ?? '',
-		]);
-	}
+    /**
+     * @param array $data
+     */
+    public function populateJavaScriptVariables(array $data) {
+        $data['array']['oc_updateState'] =  json_encode([
+            'updateAvailable' => true,
+            'updateVersion' => $this->getUpdateState()['updateVersionString'],
+            'updateLink' => $this->getUpdateState()['updateLink'] ?? '',
+        ]);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 	 * @param array $data
 	 */
 	public function populateJavaScriptVariables(array $data) {
-		$data['array']['oc_updateState'] =  json_encode([
+		$data['array']['oc_updateState'] = json_encode([
 			'updateAvailable' => true,
 			'updateVersion' => $this->getUpdateState()['updateVersionString'],
 			'updateLink' => $this->getUpdateState()['updateLink'] ?? '',

apps/updatenotification/lib/Command/Check.php

Indentation +51 added lines, -51 removed lines

@@ -32,65 +32,65 @@
 
 class Check extends Command {
 
-	/**
-	 * @var Installer $installer
-	 */
-	private $installer;
+    /**
+     * @var Installer $installer
+     */
+    private $installer;
 
-	/**
-	 * @var AppManager $appManager
-	 */
-	private $appManager;
+    /**
+     * @var AppManager $appManager
+     */
+    private $appManager;
 
-	/**
-	 * @var UpdateChecker $updateChecker
-	 */
-	private $updateChecker;
+    /**
+     * @var UpdateChecker $updateChecker
+     */
+    private $updateChecker;
 
-	public function __construct(AppManager $appManager, UpdateChecker $updateChecker, Installer $installer) {
-		parent::__construct();
-		$this->installer = $installer;
-		$this->appManager = $appManager;
-		$this->updateChecker = $updateChecker;
-	}
+    public function __construct(AppManager $appManager, UpdateChecker $updateChecker, Installer $installer) {
+        parent::__construct();
+        $this->installer = $installer;
+        $this->appManager = $appManager;
+        $this->updateChecker = $updateChecker;
+    }
 
-	protected function configure() {
-		$this
-			->setName('update:check')
-			->setDescription('Check for server and app updates')
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('update:check')
+            ->setDescription('Check for server and app updates')
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$updatesAvailableCount = 0;
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $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->getInstalledApps();
-		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->getInstalledApps();
+        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>');
-		} else if ($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>');
+        } else if ($updatesAvailableCount === 1) {
+            $output->writeln('<comment>1 update available</comment>');
+        } else {
+            $output->writeln('<comment>' . $updatesAvailableCount . ' updates available</comment>');
+        }
 
-		return 0;
-	}
+        return 0;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
 		// 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'] . '.');
+			$output->writeln($r['updateVersionString'].' is available. Get more information on how to update at '.$r['updateLink'].'.');
 			$updatesAvailableCount += 1;
 		}
 
@@ -77,7 +77,7 @@ 
 		foreach ($apps as $app) {
 			$update = $this->installer->isUpdateAvailable($app);
 			if ($update !== false) {
-				$output->writeln('Update for ' . $app . ' to version ' . $update . ' is available.');
+				$output->writeln('Update for '.$app.' to version '.$update.' is available.');
 				$updatesAvailableCount += 1;
 			}
 		}
@@ -88,7 +88,7 @@ 
 		} else if ($updatesAvailableCount === 1) {
 			$output->writeln('<comment>1 update available</comment>');
 		} else {
-			$output->writeln('<comment>' . $updatesAvailableCount . ' updates available</comment>');
+			$output->writeln('<comment>'.$updatesAvailableCount.' updates available</comment>');
 		}
 
 		return 0;