nextcloud / server

apps/updatenotification/lib/Settings/Admin.php

Indentation +110 added lines, -110 removed lines

@@ -35,114 +35,114 @@
 use OCP\Util;
 
 class Admin implements ISettings {
-	/** @var IConfig */
-	private $config;
-	/** @var UpdateChecker */
-	private $updateChecker;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IDateTimeFormatter */
-	private $dateTimeFormatter;
-
-	/**
-	 * @param IConfig $config
-	 * @param UpdateChecker $updateChecker
-	 * @param IGroupManager $groupManager
-	 * @param IDateTimeFormatter $dateTimeFormatter
-	 */
-	public function __construct(IConfig $config,
-								UpdateChecker $updateChecker,
-								IGroupManager $groupManager,
-								IDateTimeFormatter $dateTimeFormatter) {
-		$this->config = $config;
-		$this->updateChecker = $updateChecker;
-		$this->groupManager = $groupManager;
-		$this->dateTimeFormatter = $dateTimeFormatter;
-	}
-
-	/**
-	 * @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,
-			'newVersionString' => empty($updateState['updateVersion']) ? '' : $updateState['updateVersion'],
-			'downloadLink' => empty($updateState['downloadLink']) ? '' : $updateState['downloadLink'],
-			'changelogURL' => empty($updateState['changelog']) ? false : $updateState['changelog'],
-			'whatsNew' => empty($updateState['whatsNew']) ? false : $updateState['whatsNew'],
-			'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, '');
-	}
-
-	/**
-	 * @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;
+
+    /**
+     * @param IConfig $config
+     * @param UpdateChecker $updateChecker
+     * @param IGroupManager $groupManager
+     * @param IDateTimeFormatter $dateTimeFormatter
+     */
+    public function __construct(IConfig $config,
+                                UpdateChecker $updateChecker,
+                                IGroupManager $groupManager,
+                                IDateTimeFormatter $dateTimeFormatter) {
+        $this->config = $config;
+        $this->updateChecker = $updateChecker;
+        $this->groupManager = $groupManager;
+        $this->dateTimeFormatter = $dateTimeFormatter;
+    }
+
+    /**
+     * @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,
+            'newVersionString' => empty($updateState['updateVersion']) ? '' : $updateState['updateVersion'],
+            'downloadLink' => empty($updateState['downloadLink']) ? '' : $updateState['downloadLink'],
+            'changelogURL' => empty($updateState['changelog']) ? false : $updateState['changelog'],
+            'whatsNew' => empty($updateState['whatsNew']) ? false : $updateState['whatsNew'],
+            '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, '');
+    }
+
+    /**
+     * @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 +45 added lines, -45 removed lines

@@ -28,55 +28,55 @@
 use OC\Updater\VersionCheck;
 
 class UpdateChecker {
-	/** @var VersionCheck */
-	private $updater;
+    /** @var VersionCheck */
+    private $updater;
 
-	/**
-	 * @param VersionCheck $updater
-	 */
-	public function __construct(VersionCheck $updater) {
-		$this->updater = $updater;
-	}
+    /**
+     * @param VersionCheck $updater
+     */
+    public function __construct(VersionCheck $updater) {
+        $this->updater = $updater;
+    }
 
-	/**
-	 * @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['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['changelog'], 'https://') === 0) {
-				$result['changelog'] = $data['changelog'];
-			}
-			if (is_array($data['whatsNew']) && count($data['whatsNew']) <= 3) {
-				$result['whatsNew'] = $data['whatsNew'];
-			}
+        if (isset($data['version']) && $data['version'] !== '' && $data['version'] !== []) {
+            $result['updateAvailable'] = true;
+            $result['updateVersion'] = $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['changelog'], 'https://') === 0) {
+                $result['changelog'] = $data['changelog'];
+            }
+            if (is_array($data['whatsNew']) && count($data['whatsNew']) <= 3) {
+                $result['whatsNew'] = $data['whatsNew'];
+            }
 
-			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()['updateVersion'],
-			'updateLink' => $this->getUpdateState()['updateLink'] ?? '',
-		]);
-	}
+    /**
+     * @param array $data
+     */
+    public function populateJavaScriptVariables(array $data) {
+        $data['array']['oc_updateState'] =  json_encode([
+            'updateAvailable' => true,
+            'updateVersion' => $this->getUpdateState()['updateVersion'],
+            'updateLink' => $this->getUpdateState()['updateLink'] ?? '',
+        ]);
+    }
 }

lib/private/Updater/VersionCheck.php

Indentation +92 added lines, -92 removed lines

@@ -31,98 +31,98 @@
 
 class VersionCheck {
 
-	/** @var IClientService */
-	private $clientService;
+    /** @var IClientService */
+    private $clientService;
 	
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * @param IClientService $clientService
-	 * @param IConfig $config
-	 */
-	public function __construct(IClientService $clientService,
-								IConfig $config) {
-		$this->clientService = $clientService;
-		$this->config = $config;
-	}
-
-
-	/**
-	 * Check if a new version is available
-	 *
-	 * @return array|bool
-	 */
-	public function check() {
-		// Look up the cache - it is invalidated all 30 minutes
-		if (((int)$this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) {
-			return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true);
-		}
-
-		$updaterUrl = $this->config->getSystemValue('updater.server.url', 'https://updates.nextcloud.com/updater_server/');
-
-		$this->config->setAppValue('core', 'lastupdatedat', time());
-
-		if ($this->config->getAppValue('core', 'installedat', '') === '') {
-			$this->config->setAppValue('core', 'installedat', microtime(true));
-		}
-
-		$version = Util::getVersion();
-		$version['installed'] = $this->config->getAppValue('core', 'installedat');
-		$version['updated'] = $this->config->getAppValue('core', 'lastupdatedat');
-		$version['updatechannel'] = \OC_Util::getChannel();
-		$version['edition'] = '';
-		$version['build'] = \OC_Util::getBuild();
-		$version['php_major'] = PHP_MAJOR_VERSION;
-		$version['php_minor'] = PHP_MINOR_VERSION;
-		$version['php_release'] = PHP_RELEASE_VERSION;
-		$versionString = implode('x', $version);
-
-		//fetch xml data from updater
-		$url = $updaterUrl . '?version=' . $versionString;
-
-		$tmp = [];
-		try {
-			$xml = $this->getUrlContent($url);
-		} catch (\Exception $e) {
-			return false;
-		}
-
-		if ($xml) {
-			$loadEntities = libxml_disable_entity_loader(true);
-			$data = @simplexml_load_string($xml);
-			libxml_disable_entity_loader($loadEntities);
-			if ($data !== false) {
-				$tmp['version'] = (string)$data->version;
-				$tmp['versionstring'] = (string)$data->versionstring;
-				$tmp['url'] = (string)$data->url;
-				$tmp['web'] = (string)$data->web;
-				$tmp['changelog'] = isset($data->changelog) ? (string)$data->changelog : '';
-				// TODO: one's it is decided, use the proper field…
-				$tmp['whatsNew'] = isset($data->whatsNew) ? ((array)$data->whatsNew)['item'] : null;
-				$tmp['whatsNew'] = isset($data->whatsNew_admin) ? ((array)$data->whatsNew_admin)['item'] : (string)$data->whatsNew;
-				$tmp['autoupdater'] = (string)$data->autoupdater;
-				$tmp['eol'] = isset($data->eol) ? (string)$data->eol : '0';
-			} else {
-				libxml_clear_errors();
-			}
-		}
-
-		// Cache the result
-		$this->config->setAppValue('core', 'lastupdateResult', json_encode($tmp));
-		return $tmp;
-	}
-
-	/**
-	 * @codeCoverageIgnore
-	 * @param string $url
-	 * @return resource|string
-	 * @throws \Exception
-	 */
-	protected function getUrlContent($url) {
-		$client = $this->clientService->newClient();
-		$response = $client->get($url);
-		return $response->getBody();
-	}
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * @param IClientService $clientService
+     * @param IConfig $config
+     */
+    public function __construct(IClientService $clientService,
+                                IConfig $config) {
+        $this->clientService = $clientService;
+        $this->config = $config;
+    }
+
+
+    /**
+     * Check if a new version is available
+     *
+     * @return array|bool
+     */
+    public function check() {
+        // Look up the cache - it is invalidated all 30 minutes
+        if (((int)$this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) {
+            return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true);
+        }
+
+        $updaterUrl = $this->config->getSystemValue('updater.server.url', 'https://updates.nextcloud.com/updater_server/');
+
+        $this->config->setAppValue('core', 'lastupdatedat', time());
+
+        if ($this->config->getAppValue('core', 'installedat', '') === '') {
+            $this->config->setAppValue('core', 'installedat', microtime(true));
+        }
+
+        $version = Util::getVersion();
+        $version['installed'] = $this->config->getAppValue('core', 'installedat');
+        $version['updated'] = $this->config->getAppValue('core', 'lastupdatedat');
+        $version['updatechannel'] = \OC_Util::getChannel();
+        $version['edition'] = '';
+        $version['build'] = \OC_Util::getBuild();
+        $version['php_major'] = PHP_MAJOR_VERSION;
+        $version['php_minor'] = PHP_MINOR_VERSION;
+        $version['php_release'] = PHP_RELEASE_VERSION;
+        $versionString = implode('x', $version);
+
+        //fetch xml data from updater
+        $url = $updaterUrl . '?version=' . $versionString;
+
+        $tmp = [];
+        try {
+            $xml = $this->getUrlContent($url);
+        } catch (\Exception $e) {
+            return false;
+        }
+
+        if ($xml) {
+            $loadEntities = libxml_disable_entity_loader(true);
+            $data = @simplexml_load_string($xml);
+            libxml_disable_entity_loader($loadEntities);
+            if ($data !== false) {
+                $tmp['version'] = (string)$data->version;
+                $tmp['versionstring'] = (string)$data->versionstring;
+                $tmp['url'] = (string)$data->url;
+                $tmp['web'] = (string)$data->web;
+                $tmp['changelog'] = isset($data->changelog) ? (string)$data->changelog : '';
+                // TODO: one's it is decided, use the proper field…
+                $tmp['whatsNew'] = isset($data->whatsNew) ? ((array)$data->whatsNew)['item'] : null;
+                $tmp['whatsNew'] = isset($data->whatsNew_admin) ? ((array)$data->whatsNew_admin)['item'] : (string)$data->whatsNew;
+                $tmp['autoupdater'] = (string)$data->autoupdater;
+                $tmp['eol'] = isset($data->eol) ? (string)$data->eol : '0';
+            } else {
+                libxml_clear_errors();
+            }
+        }
+
+        // Cache the result
+        $this->config->setAppValue('core', 'lastupdateResult', json_encode($tmp));
+        return $tmp;
+    }
+
+    /**
+     * @codeCoverageIgnore
+     * @param string $url
+     * @return resource|string
+     * @throws \Exception
+     */
+    protected function getUrlContent($url) {
+        $client = $this->clientService->newClient();
+        $response = $client->get($url);
+        return $response->getBody();
+    }
 }
 

Spacing +11 added lines, -11 removed lines

@@ -55,7 +55,7 @@ 
 	 */
 	public function check() {
 		// Look up the cache - it is invalidated all 30 minutes
-		if (((int)$this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) {
+		if (((int) $this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) {
 			return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true);
 		}
 
@@ -79,7 +79,7 @@ 
 		$versionString = implode('x', $version);
 
 		//fetch xml data from updater
-		$url = $updaterUrl . '?version=' . $versionString;
+		$url = $updaterUrl.'?version='.$versionString;
 
 		$tmp = [];
 		try {
@@ -93,16 +93,16 @@ 
 			$data = @simplexml_load_string($xml);
 			libxml_disable_entity_loader($loadEntities);
 			if ($data !== false) {
-				$tmp['version'] = (string)$data->version;
-				$tmp['versionstring'] = (string)$data->versionstring;
-				$tmp['url'] = (string)$data->url;
-				$tmp['web'] = (string)$data->web;
-				$tmp['changelog'] = isset($data->changelog) ? (string)$data->changelog : '';
+				$tmp['version'] = (string) $data->version;
+				$tmp['versionstring'] = (string) $data->versionstring;
+				$tmp['url'] = (string) $data->url;
+				$tmp['web'] = (string) $data->web;
+				$tmp['changelog'] = isset($data->changelog) ? (string) $data->changelog : '';
 				// TODO: one's it is decided, use the proper field…
-				$tmp['whatsNew'] = isset($data->whatsNew) ? ((array)$data->whatsNew)['item'] : null;
-				$tmp['whatsNew'] = isset($data->whatsNew_admin) ? ((array)$data->whatsNew_admin)['item'] : (string)$data->whatsNew;
-				$tmp['autoupdater'] = (string)$data->autoupdater;
-				$tmp['eol'] = isset($data->eol) ? (string)$data->eol : '0';
+				$tmp['whatsNew'] = isset($data->whatsNew) ? ((array) $data->whatsNew)['item'] : null;
+				$tmp['whatsNew'] = isset($data->whatsNew_admin) ? ((array) $data->whatsNew_admin)['item'] : (string) $data->whatsNew;
+				$tmp['autoupdater'] = (string) $data->autoupdater;
+				$tmp['eol'] = isset($data->eol) ? (string) $data->eol : '0';
 			} else {
 				libxml_clear_errors();
 			}