nextcloud / server

lib/private/Updater/ChangesCheck.php

Indentation +112 added lines, -112 removed lines

@@ -30,128 +30,128 @@
 use OCP\ILogger;
 
 class ChangesCheck {
-	/** @var IClientService */
-	protected $clientService;
-	/** @var ChangesMapper */
-	private $mapper;
-	/** @var ILogger */
-	private $logger;
+    /** @var IClientService */
+    protected $clientService;
+    /** @var ChangesMapper */
+    private $mapper;
+    /** @var ILogger */
+    private $logger;
 
-	const RESPONSE_NO_CONTENT = 0;
-	const RESPONSE_USE_CACHE = 1;
-	const RESPONSE_HAS_CONTENT = 2;
+    const RESPONSE_NO_CONTENT = 0;
+    const RESPONSE_USE_CACHE = 1;
+    const RESPONSE_HAS_CONTENT = 2;
 
-	public function __construct(IClientService $clientService, ChangesMapper $mapper, ILogger $logger) {
-		$this->clientService = $clientService;
-		$this->mapper = $mapper;
-		$this->logger = $logger;
-	}
+    public function __construct(IClientService $clientService, ChangesMapper $mapper, ILogger $logger) {
+        $this->clientService = $clientService;
+        $this->mapper = $mapper;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * @throws \Exception
-	 */
-	public function check(string $uri, string $version): array {
-		try {
-			$version = $this->normalizeVersion($version);
-			$changesInfo = $this->mapper->getChanges($version);
-			if($changesInfo->getLastCheck() + 1800 > time()) {
-				return json_decode($changesInfo->getData(), true);
-			}
-		} catch (DoesNotExistException $e) {
-			$changesInfo = new ChangesResult();
-		}
+    /**
+     * @throws \Exception
+     */
+    public function check(string $uri, string $version): array {
+        try {
+            $version = $this->normalizeVersion($version);
+            $changesInfo = $this->mapper->getChanges($version);
+            if($changesInfo->getLastCheck() + 1800 > time()) {
+                return json_decode($changesInfo->getData(), true);
+            }
+        } catch (DoesNotExistException $e) {
+            $changesInfo = new ChangesResult();
+        }
 
-		$response = $this->queryChangesServer($uri, $changesInfo);
+        $response = $this->queryChangesServer($uri, $changesInfo);
 
-		switch($this->evaluateResponse($response)) {
-			case self::RESPONSE_NO_CONTENT:
-				return [];
-			case self::RESPONSE_USE_CACHE:
-				return json_decode($changesInfo->getData(), true);
-			case self::RESPONSE_HAS_CONTENT:
-			default:
-				$data = $this->extractData($response->getBody());
-				$changesInfo->setData(json_encode($data));
-				$changesInfo->setEtag($response->getHeader('Etag'));
-				$this->cacheResult($changesInfo, $version);
+        switch($this->evaluateResponse($response)) {
+            case self::RESPONSE_NO_CONTENT:
+                return [];
+            case self::RESPONSE_USE_CACHE:
+                return json_decode($changesInfo->getData(), true);
+            case self::RESPONSE_HAS_CONTENT:
+            default:
+                $data = $this->extractData($response->getBody());
+                $changesInfo->setData(json_encode($data));
+                $changesInfo->setEtag($response->getHeader('Etag'));
+                $this->cacheResult($changesInfo, $version);
 
-				return $data;
-		}
-	}
+                return $data;
+        }
+    }
 
-	protected function evaluateResponse(IResponse $response): int {
-		if($response->getStatusCode() === 304) {
-			return self::RESPONSE_USE_CACHE;
-		} else if($response->getStatusCode() === 404) {
-			return self::RESPONSE_NO_CONTENT;
-		} else if($response->getStatusCode() === 200) {
-			return self::RESPONSE_HAS_CONTENT;
-		}
-		$this->logger->debug('Unexpected return code {code} from changelog server', [
-			'app' => 'core',
-			'code' => $response->getStatusCode(),
-		]);
-		return self::RESPONSE_NO_CONTENT;
-	}
+    protected function evaluateResponse(IResponse $response): int {
+        if($response->getStatusCode() === 304) {
+            return self::RESPONSE_USE_CACHE;
+        } else if($response->getStatusCode() === 404) {
+            return self::RESPONSE_NO_CONTENT;
+        } else if($response->getStatusCode() === 200) {
+            return self::RESPONSE_HAS_CONTENT;
+        }
+        $this->logger->debug('Unexpected return code {code} from changelog server', [
+            'app' => 'core',
+            'code' => $response->getStatusCode(),
+        ]);
+        return self::RESPONSE_NO_CONTENT;
+    }
 
-	protected function cacheResult(ChangesResult $entry, string $version) {
-		if($entry->getVersion() === $version) {
-			$this->mapper->update($entry);
-		} else {
-			$entry->setVersion($version);
-			$this->mapper->insert($entry);
-		}
-	}
+    protected function cacheResult(ChangesResult $entry, string $version) {
+        if($entry->getVersion() === $version) {
+            $this->mapper->update($entry);
+        } else {
+            $entry->setVersion($version);
+            $this->mapper->insert($entry);
+        }
+    }
 
-	/**
-	 * @throws \Exception
-	 */
-	protected function queryChangesServer(string $uri, ChangesResult $entry): IResponse {
-		$headers = [];
-		if($entry->getEtag() !== '') {
-			$headers['If-None-Match'] = [$entry->getEtag()];
-		}
+    /**
+     * @throws \Exception
+     */
+    protected function queryChangesServer(string $uri, ChangesResult $entry): IResponse {
+        $headers = [];
+        if($entry->getEtag() !== '') {
+            $headers['If-None-Match'] = [$entry->getEtag()];
+        }
 
-		$entry->setLastCheck(time());
-		$client = $this->clientService->newClient();
-		return $client->get($uri, [
-			'headers' => $headers,
-		]);
-	}
+        $entry->setLastCheck(time());
+        $client = $this->clientService->newClient();
+        return $client->get($uri, [
+            'headers' => $headers,
+        ]);
+    }
 
-	protected function extractData($body):array {
-		$data = [];
-		if ($body) {
-			$loadEntities = libxml_disable_entity_loader(true);
-			$xml = @simplexml_load_string($body);
-			libxml_disable_entity_loader($loadEntities);
-			if ($xml !== false) {
-				$data['changelogURL'] = (string)$xml->changelog['href'];
-				$data['whatsNew'] = [];
-				foreach($xml->whatsNew as $infoSet) {
-					$data['whatsNew'][(string)$infoSet['lang']] = [
-						'regular' => (array)$infoSet->regular->item,
-						'admin' => (array)$infoSet->admin->item,
-					];
-				}
-			} else {
-				libxml_clear_errors();
-			}
-		}
-		return $data;
-	}
+    protected function extractData($body):array {
+        $data = [];
+        if ($body) {
+            $loadEntities = libxml_disable_entity_loader(true);
+            $xml = @simplexml_load_string($body);
+            libxml_disable_entity_loader($loadEntities);
+            if ($xml !== false) {
+                $data['changelogURL'] = (string)$xml->changelog['href'];
+                $data['whatsNew'] = [];
+                foreach($xml->whatsNew as $infoSet) {
+                    $data['whatsNew'][(string)$infoSet['lang']] = [
+                        'regular' => (array)$infoSet->regular->item,
+                        'admin' => (array)$infoSet->admin->item,
+                    ];
+                }
+            } else {
+                libxml_clear_errors();
+            }
+        }
+        return $data;
+    }
 
-	/**
-	 * returns a x.y.z form of the provided version. Extra numbers will be
-	 * omitted, missing ones added as zeros.
-	 */
-	protected function normalizeVersion(string $version): string {
-		$versionNumbers = array_slice(explode('.', $version), 0, 3);
-		$versionNumbers[0] = $versionNumbers[0] ?: '0'; // deal with empty input
-		while(count($versionNumbers) < 3) {
-			// changelog server expects x.y.z, pad 0 if it is too short
-			$versionNumbers[] = 0;
-		}
-		return implode('.', $versionNumbers);
-	}
+    /**
+     * returns a x.y.z form of the provided version. Extra numbers will be
+     * omitted, missing ones added as zeros.
+     */
+    protected function normalizeVersion(string $version): string {
+        $versionNumbers = array_slice(explode('.', $version), 0, 3);
+        $versionNumbers[0] = $versionNumbers[0] ?: '0'; // deal with empty input
+        while(count($versionNumbers) < 3) {
+            // changelog server expects x.y.z, pad 0 if it is too short
+            $versionNumbers[] = 0;
+        }
+        return implode('.', $versionNumbers);
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -54,7 +54,7 @@ 
 		try {
 			$version = $this->normalizeVersion($version);
 			$changesInfo = $this->mapper->getChanges($version);
-			if($changesInfo->getLastCheck() + 1800 > time()) {
+			if ($changesInfo->getLastCheck() + 1800 > time()) {
 				return json_decode($changesInfo->getData(), true);
 			}
 		} catch (DoesNotExistException $e) {
@@ -63,7 +63,7 @@ 
 
 		$response = $this->queryChangesServer($uri, $changesInfo);
 
-		switch($this->evaluateResponse($response)) {
+		switch ($this->evaluateResponse($response)) {
 			case self::RESPONSE_NO_CONTENT:
 				return [];
 			case self::RESPONSE_USE_CACHE:
@@ -80,11 +80,11 @@ 
 	}
 
 	protected function evaluateResponse(IResponse $response): int {
-		if($response->getStatusCode() === 304) {
+		if ($response->getStatusCode() === 304) {
 			return self::RESPONSE_USE_CACHE;
-		} else if($response->getStatusCode() === 404) {
+		} else if ($response->getStatusCode() === 404) {
 			return self::RESPONSE_NO_CONTENT;
-		} else if($response->getStatusCode() === 200) {
+		} else if ($response->getStatusCode() === 200) {
 			return self::RESPONSE_HAS_CONTENT;
 		}
 		$this->logger->debug('Unexpected return code {code} from changelog server', [
@@ -95,7 +95,7 @@ 
 	}
 
 	protected function cacheResult(ChangesResult $entry, string $version) {
-		if($entry->getVersion() === $version) {
+		if ($entry->getVersion() === $version) {
 			$this->mapper->update($entry);
 		} else {
 			$entry->setVersion($version);
@@ -108,7 +108,7 @@ 
 	 */
 	protected function queryChangesServer(string $uri, ChangesResult $entry): IResponse {
 		$headers = [];
-		if($entry->getEtag() !== '') {
+		if ($entry->getEtag() !== '') {
 			$headers['If-None-Match'] = [$entry->getEtag()];
 		}
 
@@ -126,12 +126,12 @@ 
 			$xml = @simplexml_load_string($body);
 			libxml_disable_entity_loader($loadEntities);
 			if ($xml !== false) {
-				$data['changelogURL'] = (string)$xml->changelog['href'];
+				$data['changelogURL'] = (string) $xml->changelog['href'];
 				$data['whatsNew'] = [];
-				foreach($xml->whatsNew as $infoSet) {
-					$data['whatsNew'][(string)$infoSet['lang']] = [
-						'regular' => (array)$infoSet->regular->item,
-						'admin' => (array)$infoSet->admin->item,
+				foreach ($xml->whatsNew as $infoSet) {
+					$data['whatsNew'][(string) $infoSet['lang']] = [
+						'regular' => (array) $infoSet->regular->item,
+						'admin' => (array) $infoSet->admin->item,
 					];
 				}
 			} else {
@@ -148,7 +148,7 @@ 
 	protected function normalizeVersion(string $version): string {
 		$versionNumbers = array_slice(explode('.', $version), 0, 3);
 		$versionNumbers[0] = $versionNumbers[0] ?: '0'; // deal with empty input
-		while(count($versionNumbers) < 3) {
+		while (count($versionNumbers) < 3) {
 			// changelog server expects x.y.z, pad 0 if it is too short
 			$versionNumbers[] = 0;
 		}

lib/private/Updater/ChangesMapper.php

Indentation +21 added lines, -21 removed lines

@@ -30,28 +30,28 @@
 use OCP\IDBConnection;
 
 class ChangesMapper extends QBMapper {
-	const TABLE_NAME = 'whats_new';
+    const TABLE_NAME = 'whats_new';
 
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, self::TABLE_NAME);
-	}
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, self::TABLE_NAME);
+    }
 
-	/**
-	 * @throws DoesNotExistException
-	 */
-	public function getChanges(string $version): ChangesResult {
-		/* @var $qb IQueryBuilder */
-		$qb = $this->db->getQueryBuilder();
-		$result = $qb->select('*')
-			->from(self::TABLE_NAME)
-			->where($qb->expr()->eq('version', $qb->createNamedParameter($version)))
-			->execute();
+    /**
+     * @throws DoesNotExistException
+     */
+    public function getChanges(string $version): ChangesResult {
+        /* @var $qb IQueryBuilder */
+        $qb = $this->db->getQueryBuilder();
+        $result = $qb->select('*')
+            ->from(self::TABLE_NAME)
+            ->where($qb->expr()->eq('version', $qb->createNamedParameter($version)))
+            ->execute();
 
-		$data = $result->fetch();
-		$result->closeCursor();
-		if ($data === false) {
-			throw new DoesNotExistException('Changes info is not present');
-		}
-		return ChangesResult::fromRow($data);
-	}
+        $data = $result->fetch();
+        $result->closeCursor();
+        if ($data === false) {
+            throw new DoesNotExistException('Changes info is not present');
+        }
+        return ChangesResult::fromRow($data);
+    }
 }

lib/private/Updater/VersionCheck.php

Indentation +89 added lines, -89 removed lines

@@ -31,95 +31,95 @@
 
 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['changes'] = isset($data->changes) ? (string)$data->changes : '';
-				$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['changes'] = isset($data->changes) ? (string)$data->changes : '';
+                $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 +9 added lines, -9 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,13 +93,13 @@ 
 			$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['changes'] = isset($data->changes) ? (string)$data->changes : '';
-				$tmp['autoupdater'] = (string)$data->autoupdater;
-				$tmp['eol'] = isset($data->eol) ? (string)$data->eol : '0';
+				$tmp['version'] = (string) $data->version;
+				$tmp['versionstring'] = (string) $data->versionstring;
+				$tmp['url'] = (string) $data->url;
+				$tmp['web'] = (string) $data->web;
+				$tmp['changes'] = isset($data->changes) ? (string) $data->changes : '';
+				$tmp['autoupdater'] = (string) $data->autoupdater;
+				$tmp['eol'] = isset($data->eol) ? (string) $data->eol : '0';
 			} else {
 				libxml_clear_errors();
 			}

lib/private/Updater/ChangesResult.php

Indentation +14 added lines, -14 removed lines

@@ -40,22 +40,22 @@
  * @method void setData(string $data)
  */
 class ChangesResult extends Entity {
-	/** @var string */
-	protected $version = '';
+    /** @var string */
+    protected $version = '';
 
-	/** @var string */
-	protected $etag = '';
+    /** @var string */
+    protected $etag = '';
 
-	/** @var int */
-	protected $lastCheck = 0;
+    /** @var int */
+    protected $lastCheck = 0;
 
-	/** @var string */
-	protected $data = '';
+    /** @var string */
+    protected $data = '';
 
-	public function __construct() {
-		$this->addType('version', 'string');
-		$this->addType('etag', 'string');
-		$this->addType('lastCheck', 'int');
-		$this->addType('data', 'string');
-	}
+    public function __construct() {
+        $this->addType('version', 'string');
+        $this->addType('etag', 'string');
+        $this->addType('lastCheck', 'int');
+        $this->addType('data', 'string');
+    }
 }

apps/updatenotification/lib/UpdateChecker.php

Indentation +49 added lines, -49 removed lines

@@ -29,59 +29,59 @@
 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['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['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()['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'] ?? '',
+        ]);
+    }
 }

apps/updatenotification/lib/Settings/Admin.php

Indentation +155 added lines, -155 removed lines

@@ -37,159 +37,159 @@
 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,
-			'newVersionString' => empty($updateState['updateVersion']) ? '' : $updateState['updateVersion'],
-			'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) {
-		$filtered = [];
-		if(isset($changes['changelogURL'])) {
-			$filtered['changelogURL'] = $changes['changelogURL'];
-		}
-		if(!isset($changes['whatsNew'])) {
-			return $filtered;
-		}
-
-		$isFirstCall = true;
-		do {
-			$lang = $this->l10nFactory->iterateLanguage($isFirstCall);
-			if($this->findWhatsNewTranslation($lang, $filtered, $changes['whatsNew'])) {
-				return $filtered;
-			}
-			$isFirstCall = false;
-		} while($lang !== 'en');
-
-		return $filtered;
-	}
-
-	protected function getLangTrunk(string $lang):string {
-		$pos = strpos($lang, '_');
-		if($pos !== false) {
-			$lang = substr($lang, 0, $pos);
-		}
-		return $lang;
-	}
-
-	protected function findWhatsNewTranslation(string $lang, array &$result, array $whatsNew): bool {
-		if(isset($whatsNew[$lang])) {
-			$result['whatsNew'] = $whatsNew[$lang];
-			return true;
-		}
-		$trunkedLang = $this->getLangTrunk($lang);
-		if($trunkedLang !== $lang && isset($whatsNew[$trunkedLang])) {
-			$result['whatsNew'] = $whatsNew[$trunkedLang];
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @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,
+            'newVersionString' => empty($updateState['updateVersion']) ? '' : $updateState['updateVersion'],
+            '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) {
+        $filtered = [];
+        if(isset($changes['changelogURL'])) {
+            $filtered['changelogURL'] = $changes['changelogURL'];
+        }
+        if(!isset($changes['whatsNew'])) {
+            return $filtered;
+        }
+
+        $isFirstCall = true;
+        do {
+            $lang = $this->l10nFactory->iterateLanguage($isFirstCall);
+            if($this->findWhatsNewTranslation($lang, $filtered, $changes['whatsNew'])) {
+                return $filtered;
+            }
+            $isFirstCall = false;
+        } while($lang !== 'en');
+
+        return $filtered;
+    }
+
+    protected function getLangTrunk(string $lang):string {
+        $pos = strpos($lang, '_');
+        if($pos !== false) {
+            $lang = substr($lang, 0, $pos);
+        }
+        return $lang;
+    }
+
+    protected function findWhatsNewTranslation(string $lang, array &$result, array $whatsNew): bool {
+        if(isset($whatsNew[$lang])) {
+            $result['whatsNew'] = $whatsNew[$lang];
+            return true;
+        }
+        $trunkedLang = $this->getLangTrunk($lang);
+        if($trunkedLang !== $lang && isset($whatsNew[$trunkedLang])) {
+            $result['whatsNew'] = $whatsNew[$trunkedLang];
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @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;
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -116,40 +116,40 @@
 
 	protected function filterChanges(array $changes) {
 		$filtered = [];
-		if(isset($changes['changelogURL'])) {
+		if (isset($changes['changelogURL'])) {
 			$filtered['changelogURL'] = $changes['changelogURL'];
 		}
-		if(!isset($changes['whatsNew'])) {
+		if (!isset($changes['whatsNew'])) {
 			return $filtered;
 		}
 
 		$isFirstCall = true;
 		do {
 			$lang = $this->l10nFactory->iterateLanguage($isFirstCall);
-			if($this->findWhatsNewTranslation($lang, $filtered, $changes['whatsNew'])) {
+			if ($this->findWhatsNewTranslation($lang, $filtered, $changes['whatsNew'])) {
 				return $filtered;
 			}
 			$isFirstCall = false;
-		} while($lang !== 'en');
+		} while ($lang !== 'en');
 
 		return $filtered;
 	}
 
 	protected function getLangTrunk(string $lang):string {
 		$pos = strpos($lang, '_');
-		if($pos !== false) {
+		if ($pos !== false) {
 			$lang = substr($lang, 0, $pos);
 		}
 		return $lang;
 	}
 
 	protected function findWhatsNewTranslation(string $lang, array &$result, array $whatsNew): bool {
-		if(isset($whatsNew[$lang])) {
+		if (isset($whatsNew[$lang])) {
 			$result['whatsNew'] = $whatsNew[$lang];
 			return true;
 		}
 		$trunkedLang = $this->getLangTrunk($lang);
-		if($trunkedLang !== $lang && isset($whatsNew[$trunkedLang])) {
+		if ($trunkedLang !== $lang && isset($whatsNew[$trunkedLang])) {
 			$result['whatsNew'] = $whatsNew[$trunkedLang];
 			return true;
 		}

core/Migrations/Version14000Date20180626223656.php

Indentation +37 added lines, -37 removed lines

@@ -28,42 +28,42 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version14000Date20180626223656 extends SimpleMigrationStep {
-	public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		if(!$schema->hasTable('whats_new')) {
-			$table = $schema->createTable('whats_new');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('version', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '11',
-			]);
-			$table->addColumn('etag', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('last_check', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-				'default' => 0,
-			]);
-			$table->addColumn('data', 'text', [
-				'notnull' => true,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['version']);
-			$table->addIndex(['version', 'etag'], 'version_etag_idx');
-		}
+    public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        if(!$schema->hasTable('whats_new')) {
+            $table = $schema->createTable('whats_new');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('version', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '11',
+            ]);
+            $table->addColumn('etag', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('last_check', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+                'default' => 0,
+            ]);
+            $table->addColumn('data', 'text', [
+                'notnull' => true,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['version']);
+            $table->addIndex(['version', 'etag'], 'version_etag_idx');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
-		if(!$schema->hasTable('whats_new')) {
+		if (!$schema->hasTable('whats_new')) {
 			$table = $schema->createTable('whats_new');
 			$table->addColumn('id', 'integer', [
 				'autoincrement' => true,

lib/public/L10N/IFactory.php

Indentation +66 added lines, -66 removed lines

@@ -25,78 +25,78 @@
  * @since 8.2.0
  */
 interface IFactory {
-	/**
-	 * Get a language instance
-	 *
-	 * @param string $app
-	 * @param string|null $lang
-	 * @return \OCP\IL10N
-	 * @since 8.2.0
-	 */
-	public function get($app, $lang = null);
+    /**
+     * Get a language instance
+     *
+     * @param string $app
+     * @param string|null $lang
+     * @return \OCP\IL10N
+     * @since 8.2.0
+     */
+    public function get($app, $lang = null);
 
-	/**
-	 * Find the best language
-	 *
-	 * @param string|null $app App id or null for core
-	 * @return string language If nothing works it returns 'en'
-	 * @since 9.0.0
-	 */
-	public function findLanguage($app = null);
+    /**
+     * Find the best language
+     *
+     * @param string|null $app App id or null for core
+     * @return string language If nothing works it returns 'en'
+     * @since 9.0.0
+     */
+    public function findLanguage($app = null);
 
-	/**
-	 * @param string|null $lang user language as default locale
-	 * @return string locale If nothing works it returns 'en_US'
-	 * @since 14.0.0
-	 */
-	public function findLocale($lang = null);
+    /**
+     * @param string|null $lang user language as default locale
+     * @return string locale If nothing works it returns 'en_US'
+     * @since 14.0.0
+     */
+    public function findLocale($lang = null);
 
-	/**
-	 * Find all available languages for an app
-	 *
-	 * @param string|null $app App id or null for core
-	 * @return string[] an array of available languages
-	 * @since 9.0.0
-	 */
-	public function findAvailableLanguages($app = null);
+    /**
+     * Find all available languages for an app
+     *
+     * @param string|null $app App id or null for core
+     * @return string[] an array of available languages
+     * @since 9.0.0
+     */
+    public function findAvailableLanguages($app = null);
 
-	/**
-	 * @return array an array of available
-	 * @since 14.0.0
-	 */
-	public function findAvailableLocales();
+    /**
+     * @return array an array of available
+     * @since 14.0.0
+     */
+    public function findAvailableLocales();
 
-	/**
-	 * @param string|null $app App id or null for core
-	 * @param string $lang
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function languageExists($app, $lang);
+    /**
+     * @param string|null $app App id or null for core
+     * @param string $lang
+     * @return bool
+     * @since 9.0.0
+     */
+    public function languageExists($app, $lang);
 
-	/**
-	 * @param string $locale
-	 * @return bool
-	 * @since 14.0.0
-	 */
-	public function localeExists($locale);
+    /**
+     * @param string $locale
+     * @return bool
+     * @since 14.0.0
+     */
+    public function localeExists($locale);
 
-	/**
-	 * Creates a function from the plural string
-	 *
-	 * @param string $string
-	 * @return string Unique function name
-	 * @since 14.0.0
-	 */
-	public function createPluralFunction($string);
+    /**
+     * Creates a function from the plural string
+     *
+     * @param string $string
+     * @return string Unique function name
+     * @since 14.0.0
+     */
+    public function createPluralFunction($string);
 
-	/**
-	 * iterate through language settings (if provided) in this order:
-	 * 1. returns the forced language or:
-	 * 2. returns the user language or:
-	 * 3. returns the system default language or:
-	 * 4+∞. returns 'en'
-	 * @since 14.0.0
-	 */
-	public function iterateLanguage(bool $reset = false): string;
+    /**
+     * iterate through language settings (if provided) in this order:
+     * 1. returns the forced language or:
+     * 2. returns the user language or:
+     * 3. returns the system default language or:
+     * 4+∞. returns 'en'
+     * @since 14.0.0
+     */
+    public function iterateLanguage(bool $reset = false): string;
 }

lib/private/L10N/Factory.php

Indentation +600 added lines, -600 removed lines

@@ -41,604 +41,604 @@
  */
 class Factory implements IFactory {
 
-	/** @var string */
-	protected $requestLanguage = '';
-
-	/**
-	 * cached instances
-	 * @var array Structure: Lang => App => \OCP\IL10N
-	 */
-	protected $instances = [];
-
-	/**
-	 * @var array Structure: App => string[]
-	 */
-	protected $availableLanguages = [];
-
-	/**
-	 * @var array
-	 */
-	protected $availableLocales = [];
-
-	/**
-	 * @var array Structure: string => callable
-	 */
-	protected $pluralFunctions = [];
-
-	const COMMON_LANGUAGE_CODES = [
-		'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it',
-		'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
-	];
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IRequest */
-	protected $request;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/** @var string */
-	protected $serverRoot;
-
-	/**
-	 * @param IConfig $config
-	 * @param IRequest $request
-	 * @param IUserSession $userSession
-	 * @param string $serverRoot
-	 */
-	public function __construct(IConfig $config,
-								IRequest $request,
-								IUserSession $userSession,
-								$serverRoot) {
-		$this->config = $config;
-		$this->request = $request;
-		$this->userSession = $userSession;
-		$this->serverRoot = $serverRoot;
-	}
-
-	/**
-	 * Get a language instance
-	 *
-	 * @param string $app
-	 * @param string|null $lang
-	 * @param string|null $locale
-	 * @return \OCP\IL10N
-	 */
-	public function get($app, $lang = null, $locale = null) {
-		$app = \OC_App::cleanAppId($app);
-		if ($lang !== null) {
-			$lang = str_replace(array('\0', '/', '\\', '..'), '', (string) $lang);
-		}
-
-		$forceLang = $this->config->getSystemValue('force_language', false);
-		if (is_string($forceLang)) {
-			$lang = $forceLang;
-		}
-
-		$forceLocale = $this->config->getSystemValue('force_locale', false);
-		if (is_string($forceLocale)) {
-			$locale = $forceLocale;
-		}
-
-		if ($lang === null || !$this->languageExists($app, $lang)) {
-			$lang = $this->findLanguage($app);
-		}
-
-		if ($locale === null || !$this->localeExists($locale)) {
-			$locale = $this->findLocale($lang);
-		}
-
-		if (!isset($this->instances[$lang][$app])) {
-			$this->instances[$lang][$app] = new L10N(
-				$this, $app, $lang, $locale,
-				$this->getL10nFilesForApp($app, $lang)
-			);
-		}
-
-		return $this->instances[$lang][$app];
-	}
-
-	/**
-	 * Find the best language
-	 *
-	 * @param string|null $app App id or null for core
-	 * @return string language If nothing works it returns 'en'
-	 */
-	public function findLanguage($app = null) {
-		$forceLang = $this->config->getSystemValue('force_language', false);
-		if (is_string($forceLang)) {
-			$this->requestLanguage = $forceLang;
-		}
-
-		if ($this->requestLanguage !== '' && $this->languageExists($app, $this->requestLanguage)) {
-			return $this->requestLanguage;
-		}
-
-		/**
-		 * At this point Nextcloud might not yet be installed and thus the lookup
-		 * in the preferences table might fail. For this reason we need to check
-		 * whether the instance has already been installed
-		 *
-		 * @link https://github.com/owncloud/core/issues/21955
-		 */
-		if ($this->config->getSystemValue('installed', false)) {
-			$userId = !is_null($this->userSession->getUser()) ? $this->userSession->getUser()->getUID() :  null;
-			if (!is_null($userId)) {
-				$userLang = $this->config->getUserValue($userId, 'core', 'lang', null);
-			} else {
-				$userLang = null;
-			}
-		} else {
-			$userId = null;
-			$userLang = null;
-		}
-
-		if ($userLang) {
-			$this->requestLanguage = $userLang;
-			if ($this->languageExists($app, $userLang)) {
-				return $userLang;
-			}
-		}
-
-		try {
-			// Try to get the language from the Request
-			$lang = $this->getLanguageFromRequest($app);
-			if ($userId !== null && $app === null && !$userLang) {
-				$this->config->setUserValue($userId, 'core', 'lang', $lang);
-			}
-			return $lang;
-		} catch (LanguageNotFoundException $e) {
-			// Finding language from request failed fall back to default language
-			$defaultLanguage = $this->config->getSystemValue('default_language', false);
-			if ($defaultLanguage !== false && $this->languageExists($app, $defaultLanguage)) {
-				return $defaultLanguage;
-			}
-		}
-
-		// We could not find any language so fall back to english
-		return 'en';
-	}
-
-	/**
-	 * find the best locale
-	 *
-	 * @param string $lang
-	 * @return null|string
-	 */
-	public function findLocale($lang = null) {
-		$forceLocale = $this->config->getSystemValue('force_locale', false);
-		if (is_string($forceLocale) && $this->localeExists($forceLocale)) {
-			return $forceLocale;
-		}
-
-		if ($this->config->getSystemValue('installed', false)) {
-			$userId = null !== $this->userSession->getUser() ? $this->userSession->getUser()->getUID() :  null;
-			$userLocale = null;
-			if (null !== $userId) {
-				$userLocale = $this->config->getUserValue($userId, 'core', 'locale', null);
-			}
-		} else {
-			$userId = null;
-			$userLocale = null;
-		}
-
-		if ($userLocale && $this->localeExists($userLocale)) {
-			return $userLocale;
-		}
-
-		// Default : use system default locale
-		$defaultLocale = $this->config->getSystemValue('default_locale', false);
-		if ($defaultLocale !== false && $this->localeExists($defaultLocale)) {
-			return $defaultLocale;
-		}
-
-		// If no user locale set, use lang as locale
-		if (null !== $lang && $this->localeExists($lang)) {
-			return $lang;
-		}
-
-		// At last, return USA
-		return 'en_US';
-	}
-
-	/**
-	 * Find all available languages for an app
-	 *
-	 * @param string|null $app App id or null for core
-	 * @return array an array of available languages
-	 */
-	public function findAvailableLanguages($app = null) {
-		$key = $app;
-		if ($key === null) {
-			$key = 'null';
-		}
-
-		// also works with null as key
-		if (!empty($this->availableLanguages[$key])) {
-			return $this->availableLanguages[$key];
-		}
-
-		$available = ['en']; //english is always available
-		$dir = $this->findL10nDir($app);
-		if (is_dir($dir)) {
-			$files = scandir($dir);
-			if ($files !== false) {
-				foreach ($files as $file) {
-					if (substr($file, -5) === '.json' && substr($file, 0, 4) !== 'l10n') {
-						$available[] = substr($file, 0, -5);
-					}
-				}
-			}
-		}
-
-		// merge with translations from theme
-		$theme = $this->config->getSystemValue('theme');
-		if (!empty($theme)) {
-			$themeDir = $this->serverRoot . '/themes/' . $theme . substr($dir, strlen($this->serverRoot));
-
-			if (is_dir($themeDir)) {
-				$files = scandir($themeDir);
-				if ($files !== false) {
-					foreach ($files as $file) {
-						if (substr($file, -5) === '.json' && substr($file, 0, 4) !== 'l10n') {
-							$available[] = substr($file, 0, -5);
-						}
-					}
-				}
-			}
-		}
-
-		$this->availableLanguages[$key] = $available;
-		return $available;
-	}
-
-	/**
-	 * @return array|mixed
-	 */
-	public function findAvailableLocales() {
-		if (!empty($this->availableLocales)) {
-			return $this->availableLocales;
-		}
-
-		$localeData = file_get_contents(\OC::$SERVERROOT . '/resources/locales.json');
-		$this->availableLocales = \json_decode($localeData, true);
-
-		return $this->availableLocales;
-	}
-
-	/**
-	 * @param string|null $app App id or null for core
-	 * @param string $lang
-	 * @return bool
-	 */
-	public function languageExists($app, $lang) {
-		if ($lang === 'en') {//english is always available
-			return true;
-		}
-
-		$languages = $this->findAvailableLanguages($app);
-		return array_search($lang, $languages) !== false;
-	}
-
-	public function iterateLanguage(bool $reset = false): string {
-		static $i = 0;
-		if($reset) {
-			$i = 0;
-		}
-		switch($i) {
-			/** @noinspection PhpMissingBreakStatementInspection */
-			case 0:
-				$i++;
-				$forcedLang = $this->config->getSystemValue('force_language', false);
-				if(is_string($forcedLang)) {
-					return $forcedLang;
-				}
-			/** @noinspection PhpMissingBreakStatementInspection */
-			case 1:
-				$i++;
-				$user = $this->userSession->getUser();
-				if($user instanceof IUser) {
-					$userLang = $this->config->getUserValue($user->getUID(), 'core', 'lang', null);
-					if(is_string($userLang)) {
-						return $userLang;
-					}
-				}
-			case 2:
-				$i++;
-				return $this->config->getSystemValue('default_language', 'en');
-			default:
-				return 'en';
-		}
-	}
-
-	/**
-	 * @param string $locale
-	 * @return bool
-	 */
-	public function localeExists($locale) {
-		if ($locale === 'en') { //english is always available
-			return true;
-		}
-
-		$locales = $this->findAvailableLocales();
-		$userLocale = array_filter($locales, function($value) use ($locale) {
-			return $locale === $value['code'];
-		});
-
-		return !empty($userLocale);
-	}
-
-	/**
-	 * @param string|null $app
-	 * @return string
-	 * @throws LanguageNotFoundException
-	 */
-	private function getLanguageFromRequest($app) {
-		$header = $this->request->getHeader('ACCEPT_LANGUAGE');
-		if ($header !== '') {
-			$available = $this->findAvailableLanguages($app);
-
-			// E.g. make sure that 'de' is before 'de_DE'.
-			sort($available);
-
-			$preferences = preg_split('/,\s*/', strtolower($header));
-			foreach ($preferences as $preference) {
-				list($preferred_language) = explode(';', $preference);
-				$preferred_language = str_replace('-', '_', $preferred_language);
-
-				foreach ($available as $available_language) {
-					if ($preferred_language === strtolower($available_language)) {
-						return $this->respectDefaultLanguage($app, $available_language);
-					}
-				}
-
-				// Fallback from de_De to de
-				foreach ($available as $available_language) {
-					if (substr($preferred_language, 0, 2) === $available_language) {
-						return $available_language;
-					}
-				}
-			}
-		}
-
-		throw new LanguageNotFoundException();
-	}
-
-	/**
-	 * if default language is set to de_DE (formal German) this should be
-	 * preferred to 'de' (non-formal German) if possible
-	 *
-	 * @param string|null $app
-	 * @param string $lang
-	 * @return string
-	 */
-	protected function respectDefaultLanguage($app, $lang) {
-		$result = $lang;
-		$defaultLanguage = $this->config->getSystemValue('default_language', false);
-
-		// use formal version of german ("Sie" instead of "Du") if the default
-		// language is set to 'de_DE' if possible
-		if (is_string($defaultLanguage) &&
-			strtolower($lang) === 'de' &&
-			strtolower($defaultLanguage) === 'de_de' &&
-			$this->languageExists($app, 'de_DE')
-		) {
-			$result = 'de_DE';
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Checks if $sub is a subdirectory of $parent
-	 *
-	 * @param string $sub
-	 * @param string $parent
-	 * @return bool
-	 */
-	private function isSubDirectory($sub, $parent) {
-		// Check whether $sub contains no ".."
-		if (strpos($sub, '..') !== false) {
-			return false;
-		}
-
-		// Check whether $sub is a subdirectory of $parent
-		if (strpos($sub, $parent) === 0) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get a list of language files that should be loaded
-	 *
-	 * @param string $app
-	 * @param string $lang
-	 * @return string[]
-	 */
-	// FIXME This method is only public, until OC_L10N does not need it anymore,
-	// FIXME This is also the reason, why it is not in the public interface
-	public function getL10nFilesForApp($app, $lang) {
-		$languageFiles = [];
-
-		$i18nDir = $this->findL10nDir($app);
-		$transFile = strip_tags($i18nDir) . strip_tags($lang) . '.json';
-
-		if (($this->isSubDirectory($transFile, $this->serverRoot . '/core/l10n/')
-				|| $this->isSubDirectory($transFile, $this->serverRoot . '/lib/l10n/')
-				|| $this->isSubDirectory($transFile, $this->serverRoot . '/settings/l10n/')
-				|| $this->isSubDirectory($transFile, \OC_App::getAppPath($app) . '/l10n/')
-			)
-			&& file_exists($transFile)) {
-			// load the translations file
-			$languageFiles[] = $transFile;
-		}
-
-		// merge with translations from theme
-		$theme = $this->config->getSystemValue('theme');
-		if (!empty($theme)) {
-			$transFile = $this->serverRoot . '/themes/' . $theme . substr($transFile, strlen($this->serverRoot));
-			if (file_exists($transFile)) {
-				$languageFiles[] = $transFile;
-			}
-		}
-
-		return $languageFiles;
-	}
-
-	/**
-	 * find the l10n directory
-	 *
-	 * @param string $app App id or empty string for core
-	 * @return string directory
-	 */
-	protected function findL10nDir($app = null) {
-		if (in_array($app, ['core', 'lib', 'settings'])) {
-			if (file_exists($this->serverRoot . '/' . $app . '/l10n/')) {
-				return $this->serverRoot . '/' . $app . '/l10n/';
-			}
-		} else if ($app && \OC_App::getAppPath($app) !== false) {
-			// Check if the app is in the app folder
-			return \OC_App::getAppPath($app) . '/l10n/';
-		}
-		return $this->serverRoot . '/core/l10n/';
-	}
-
-
-	/**
-	 * Creates a function from the plural string
-	 *
-	 * Parts of the code is copied from Habari:
-	 * https://github.com/habari/system/blob/master/classes/locale.php
-	 * @param string $string
-	 * @return string
-	 */
-	public function createPluralFunction($string) {
-		if (isset($this->pluralFunctions[$string])) {
-			return $this->pluralFunctions[$string];
-		}
-
-		if (preg_match( '/^\s*nplurals\s*=\s*(\d+)\s*;\s*plural=(.*)$/u', $string, $matches)) {
-			// sanitize
-			$nplurals = preg_replace( '/[^0-9]/', '', $matches[1] );
-			$plural = preg_replace( '#[^n0-9:\(\)\?\|\&=!<>+*/\%-]#', '', $matches[2] );
-
-			$body = str_replace(
-				array( 'plural', 'n', '$n$plurals', ),
-				array( '$plural', '$n', '$nplurals', ),
-				'nplurals='. $nplurals . '; plural=' . $plural
-			);
-
-			// add parents
-			// important since PHP's ternary evaluates from left to right
-			$body .= ';';
-			$res = '';
-			$p = 0;
-			$length = strlen($body);
-			for($i = 0; $i < $length; $i++) {
-				$ch = $body[$i];
-				switch ( $ch ) {
-					case '?':
-						$res .= ' ? (';
-						$p++;
-						break;
-					case ':':
-						$res .= ') : (';
-						break;
-					case ';':
-						$res .= str_repeat( ')', $p ) . ';';
-						$p = 0;
-						break;
-					default:
-						$res .= $ch;
-				}
-			}
-
-			$body = $res . 'return ($plural>=$nplurals?$nplurals-1:$plural);';
-			$function = create_function('$n', $body);
-			$this->pluralFunctions[$string] = $function;
-			return $function;
-		} else {
-			// default: one plural form for all cases but n==1 (english)
-			$function = create_function(
-				'$n',
-				'$nplurals=2;$plural=($n==1?0:1);return ($plural>=$nplurals?$nplurals-1:$plural);'
-			);
-			$this->pluralFunctions[$string] = $function;
-			return $function;
-		}
-	}
-
-	/**
-	 * returns the common language and other languages in an
-	 * associative array
-	 *
-	 * @return array
-	 */
-	public function getLanguages() {
-		$forceLanguage = $this->config->getSystemValue('force_language', false);
-		if ($forceLanguage !== false) {
-			return [];
-		}
-
-		$languageCodes = $this->findAvailableLanguages();
-
-		$commonLanguages = [];
-		$languages = [];
-
-		foreach($languageCodes as $lang) {
-			$l = $this->get('lib', $lang);
-			// TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
-			$potentialName = (string) $l->t('__language_name__');
-			if ($l->getLanguageCode() === $lang && $potentialName[0] !== '_') {//first check if the language name is in the translation file
-				$ln = array(
-					'code' => $lang,
-					'name' => $potentialName
-				);
-			} else if ($lang === 'en') {
-				$ln = array(
-					'code' => $lang,
-					'name' => 'English (US)'
-				);
-			} else {//fallback to language code
-				$ln = array(
-					'code' => $lang,
-					'name' => $lang
-				);
-			}
-
-			// put appropriate languages into appropriate arrays, to print them sorted
-			// common languages -> divider -> other languages
-			if (in_array($lang, self::COMMON_LANGUAGE_CODES)) {
-				$commonLanguages[array_search($lang, self::COMMON_LANGUAGE_CODES)] = $ln;
-			} else {
-				$languages[] = $ln;
-			}
-		}
-
-		ksort($commonLanguages);
-
-		// sort now by displayed language not the iso-code
-		usort( $languages, function ($a, $b) {
-			if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
-				// If a doesn't have a name, but b does, list b before a
-				return 1;
-			}
-			if ($a['code'] !== $a['name'] && $b['code'] === $b['name']) {
-				// If a does have a name, but b doesn't, list a before b
-				return -1;
-			}
-			// Otherwise compare the names
-			return strcmp($a['name'], $b['name']);
-		});
-
-		return [
-			// reset indexes
-			'commonlanguages' => array_values($commonLanguages),
-			'languages' => $languages
-		];
-	}
+    /** @var string */
+    protected $requestLanguage = '';
+
+    /**
+     * cached instances
+     * @var array Structure: Lang => App => \OCP\IL10N
+     */
+    protected $instances = [];
+
+    /**
+     * @var array Structure: App => string[]
+     */
+    protected $availableLanguages = [];
+
+    /**
+     * @var array
+     */
+    protected $availableLocales = [];
+
+    /**
+     * @var array Structure: string => callable
+     */
+    protected $pluralFunctions = [];
+
+    const COMMON_LANGUAGE_CODES = [
+        'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it',
+        'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
+    ];
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IRequest */
+    protected $request;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /** @var string */
+    protected $serverRoot;
+
+    /**
+     * @param IConfig $config
+     * @param IRequest $request
+     * @param IUserSession $userSession
+     * @param string $serverRoot
+     */
+    public function __construct(IConfig $config,
+                                IRequest $request,
+                                IUserSession $userSession,
+                                $serverRoot) {
+        $this->config = $config;
+        $this->request = $request;
+        $this->userSession = $userSession;
+        $this->serverRoot = $serverRoot;
+    }
+
+    /**
+     * Get a language instance
+     *
+     * @param string $app
+     * @param string|null $lang
+     * @param string|null $locale
+     * @return \OCP\IL10N
+     */
+    public function get($app, $lang = null, $locale = null) {
+        $app = \OC_App::cleanAppId($app);
+        if ($lang !== null) {
+            $lang = str_replace(array('\0', '/', '\\', '..'), '', (string) $lang);
+        }
+
+        $forceLang = $this->config->getSystemValue('force_language', false);
+        if (is_string($forceLang)) {
+            $lang = $forceLang;
+        }
+
+        $forceLocale = $this->config->getSystemValue('force_locale', false);
+        if (is_string($forceLocale)) {
+            $locale = $forceLocale;
+        }
+
+        if ($lang === null || !$this->languageExists($app, $lang)) {
+            $lang = $this->findLanguage($app);
+        }
+
+        if ($locale === null || !$this->localeExists($locale)) {
+            $locale = $this->findLocale($lang);
+        }
+
+        if (!isset($this->instances[$lang][$app])) {
+            $this->instances[$lang][$app] = new L10N(
+                $this, $app, $lang, $locale,
+                $this->getL10nFilesForApp($app, $lang)
+            );
+        }
+
+        return $this->instances[$lang][$app];
+    }
+
+    /**
+     * Find the best language
+     *
+     * @param string|null $app App id or null for core
+     * @return string language If nothing works it returns 'en'
+     */
+    public function findLanguage($app = null) {
+        $forceLang = $this->config->getSystemValue('force_language', false);
+        if (is_string($forceLang)) {
+            $this->requestLanguage = $forceLang;
+        }
+
+        if ($this->requestLanguage !== '' && $this->languageExists($app, $this->requestLanguage)) {
+            return $this->requestLanguage;
+        }
+
+        /**
+         * At this point Nextcloud might not yet be installed and thus the lookup
+         * in the preferences table might fail. For this reason we need to check
+         * whether the instance has already been installed
+         *
+         * @link https://github.com/owncloud/core/issues/21955
+         */
+        if ($this->config->getSystemValue('installed', false)) {
+            $userId = !is_null($this->userSession->getUser()) ? $this->userSession->getUser()->getUID() :  null;
+            if (!is_null($userId)) {
+                $userLang = $this->config->getUserValue($userId, 'core', 'lang', null);
+            } else {
+                $userLang = null;
+            }
+        } else {
+            $userId = null;
+            $userLang = null;
+        }
+
+        if ($userLang) {
+            $this->requestLanguage = $userLang;
+            if ($this->languageExists($app, $userLang)) {
+                return $userLang;
+            }
+        }
+
+        try {
+            // Try to get the language from the Request
+            $lang = $this->getLanguageFromRequest($app);
+            if ($userId !== null && $app === null && !$userLang) {
+                $this->config->setUserValue($userId, 'core', 'lang', $lang);
+            }
+            return $lang;
+        } catch (LanguageNotFoundException $e) {
+            // Finding language from request failed fall back to default language
+            $defaultLanguage = $this->config->getSystemValue('default_language', false);
+            if ($defaultLanguage !== false && $this->languageExists($app, $defaultLanguage)) {
+                return $defaultLanguage;
+            }
+        }
+
+        // We could not find any language so fall back to english
+        return 'en';
+    }
+
+    /**
+     * find the best locale
+     *
+     * @param string $lang
+     * @return null|string
+     */
+    public function findLocale($lang = null) {
+        $forceLocale = $this->config->getSystemValue('force_locale', false);
+        if (is_string($forceLocale) && $this->localeExists($forceLocale)) {
+            return $forceLocale;
+        }
+
+        if ($this->config->getSystemValue('installed', false)) {
+            $userId = null !== $this->userSession->getUser() ? $this->userSession->getUser()->getUID() :  null;
+            $userLocale = null;
+            if (null !== $userId) {
+                $userLocale = $this->config->getUserValue($userId, 'core', 'locale', null);
+            }
+        } else {
+            $userId = null;
+            $userLocale = null;
+        }
+
+        if ($userLocale && $this->localeExists($userLocale)) {
+            return $userLocale;
+        }
+
+        // Default : use system default locale
+        $defaultLocale = $this->config->getSystemValue('default_locale', false);
+        if ($defaultLocale !== false && $this->localeExists($defaultLocale)) {
+            return $defaultLocale;
+        }
+
+        // If no user locale set, use lang as locale
+        if (null !== $lang && $this->localeExists($lang)) {
+            return $lang;
+        }
+
+        // At last, return USA
+        return 'en_US';
+    }
+
+    /**
+     * Find all available languages for an app
+     *
+     * @param string|null $app App id or null for core
+     * @return array an array of available languages
+     */
+    public function findAvailableLanguages($app = null) {
+        $key = $app;
+        if ($key === null) {
+            $key = 'null';
+        }
+
+        // also works with null as key
+        if (!empty($this->availableLanguages[$key])) {
+            return $this->availableLanguages[$key];
+        }
+
+        $available = ['en']; //english is always available
+        $dir = $this->findL10nDir($app);
+        if (is_dir($dir)) {
+            $files = scandir($dir);
+            if ($files !== false) {
+                foreach ($files as $file) {
+                    if (substr($file, -5) === '.json' && substr($file, 0, 4) !== 'l10n') {
+                        $available[] = substr($file, 0, -5);
+                    }
+                }
+            }
+        }
+
+        // merge with translations from theme
+        $theme = $this->config->getSystemValue('theme');
+        if (!empty($theme)) {
+            $themeDir = $this->serverRoot . '/themes/' . $theme . substr($dir, strlen($this->serverRoot));
+
+            if (is_dir($themeDir)) {
+                $files = scandir($themeDir);
+                if ($files !== false) {
+                    foreach ($files as $file) {
+                        if (substr($file, -5) === '.json' && substr($file, 0, 4) !== 'l10n') {
+                            $available[] = substr($file, 0, -5);
+                        }
+                    }
+                }
+            }
+        }
+
+        $this->availableLanguages[$key] = $available;
+        return $available;
+    }
+
+    /**
+     * @return array|mixed
+     */
+    public function findAvailableLocales() {
+        if (!empty($this->availableLocales)) {
+            return $this->availableLocales;
+        }
+
+        $localeData = file_get_contents(\OC::$SERVERROOT . '/resources/locales.json');
+        $this->availableLocales = \json_decode($localeData, true);
+
+        return $this->availableLocales;
+    }
+
+    /**
+     * @param string|null $app App id or null for core
+     * @param string $lang
+     * @return bool
+     */
+    public function languageExists($app, $lang) {
+        if ($lang === 'en') {//english is always available
+            return true;
+        }
+
+        $languages = $this->findAvailableLanguages($app);
+        return array_search($lang, $languages) !== false;
+    }
+
+    public function iterateLanguage(bool $reset = false): string {
+        static $i = 0;
+        if($reset) {
+            $i = 0;
+        }
+        switch($i) {
+            /** @noinspection PhpMissingBreakStatementInspection */
+            case 0:
+                $i++;
+                $forcedLang = $this->config->getSystemValue('force_language', false);
+                if(is_string($forcedLang)) {
+                    return $forcedLang;
+                }
+            /** @noinspection PhpMissingBreakStatementInspection */
+            case 1:
+                $i++;
+                $user = $this->userSession->getUser();
+                if($user instanceof IUser) {
+                    $userLang = $this->config->getUserValue($user->getUID(), 'core', 'lang', null);
+                    if(is_string($userLang)) {
+                        return $userLang;
+                    }
+                }
+            case 2:
+                $i++;
+                return $this->config->getSystemValue('default_language', 'en');
+            default:
+                return 'en';
+        }
+    }
+
+    /**
+     * @param string $locale
+     * @return bool
+     */
+    public function localeExists($locale) {
+        if ($locale === 'en') { //english is always available
+            return true;
+        }
+
+        $locales = $this->findAvailableLocales();
+        $userLocale = array_filter($locales, function($value) use ($locale) {
+            return $locale === $value['code'];
+        });
+
+        return !empty($userLocale);
+    }
+
+    /**
+     * @param string|null $app
+     * @return string
+     * @throws LanguageNotFoundException
+     */
+    private function getLanguageFromRequest($app) {
+        $header = $this->request->getHeader('ACCEPT_LANGUAGE');
+        if ($header !== '') {
+            $available = $this->findAvailableLanguages($app);
+
+            // E.g. make sure that 'de' is before 'de_DE'.
+            sort($available);
+
+            $preferences = preg_split('/,\s*/', strtolower($header));
+            foreach ($preferences as $preference) {
+                list($preferred_language) = explode(';', $preference);
+                $preferred_language = str_replace('-', '_', $preferred_language);
+
+                foreach ($available as $available_language) {
+                    if ($preferred_language === strtolower($available_language)) {
+                        return $this->respectDefaultLanguage($app, $available_language);
+                    }
+                }
+
+                // Fallback from de_De to de
+                foreach ($available as $available_language) {
+                    if (substr($preferred_language, 0, 2) === $available_language) {
+                        return $available_language;
+                    }
+                }
+            }
+        }
+
+        throw new LanguageNotFoundException();
+    }
+
+    /**
+     * if default language is set to de_DE (formal German) this should be
+     * preferred to 'de' (non-formal German) if possible
+     *
+     * @param string|null $app
+     * @param string $lang
+     * @return string
+     */
+    protected function respectDefaultLanguage($app, $lang) {
+        $result = $lang;
+        $defaultLanguage = $this->config->getSystemValue('default_language', false);
+
+        // use formal version of german ("Sie" instead of "Du") if the default
+        // language is set to 'de_DE' if possible
+        if (is_string($defaultLanguage) &&
+            strtolower($lang) === 'de' &&
+            strtolower($defaultLanguage) === 'de_de' &&
+            $this->languageExists($app, 'de_DE')
+        ) {
+            $result = 'de_DE';
+        }
+
+        return $result;
+    }
+
+    /**
+     * Checks if $sub is a subdirectory of $parent
+     *
+     * @param string $sub
+     * @param string $parent
+     * @return bool
+     */
+    private function isSubDirectory($sub, $parent) {
+        // Check whether $sub contains no ".."
+        if (strpos($sub, '..') !== false) {
+            return false;
+        }
+
+        // Check whether $sub is a subdirectory of $parent
+        if (strpos($sub, $parent) === 0) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get a list of language files that should be loaded
+     *
+     * @param string $app
+     * @param string $lang
+     * @return string[]
+     */
+    // FIXME This method is only public, until OC_L10N does not need it anymore,
+    // FIXME This is also the reason, why it is not in the public interface
+    public function getL10nFilesForApp($app, $lang) {
+        $languageFiles = [];
+
+        $i18nDir = $this->findL10nDir($app);
+        $transFile = strip_tags($i18nDir) . strip_tags($lang) . '.json';
+
+        if (($this->isSubDirectory($transFile, $this->serverRoot . '/core/l10n/')
+                || $this->isSubDirectory($transFile, $this->serverRoot . '/lib/l10n/')
+                || $this->isSubDirectory($transFile, $this->serverRoot . '/settings/l10n/')
+                || $this->isSubDirectory($transFile, \OC_App::getAppPath($app) . '/l10n/')
+            )
+            && file_exists($transFile)) {
+            // load the translations file
+            $languageFiles[] = $transFile;
+        }
+
+        // merge with translations from theme
+        $theme = $this->config->getSystemValue('theme');
+        if (!empty($theme)) {
+            $transFile = $this->serverRoot . '/themes/' . $theme . substr($transFile, strlen($this->serverRoot));
+            if (file_exists($transFile)) {
+                $languageFiles[] = $transFile;
+            }
+        }
+
+        return $languageFiles;
+    }
+
+    /**
+     * find the l10n directory
+     *
+     * @param string $app App id or empty string for core
+     * @return string directory
+     */
+    protected function findL10nDir($app = null) {
+        if (in_array($app, ['core', 'lib', 'settings'])) {
+            if (file_exists($this->serverRoot . '/' . $app . '/l10n/')) {
+                return $this->serverRoot . '/' . $app . '/l10n/';
+            }
+        } else if ($app && \OC_App::getAppPath($app) !== false) {
+            // Check if the app is in the app folder
+            return \OC_App::getAppPath($app) . '/l10n/';
+        }
+        return $this->serverRoot . '/core/l10n/';
+    }
+
+
+    /**
+     * Creates a function from the plural string
+     *
+     * Parts of the code is copied from Habari:
+     * https://github.com/habari/system/blob/master/classes/locale.php
+     * @param string $string
+     * @return string
+     */
+    public function createPluralFunction($string) {
+        if (isset($this->pluralFunctions[$string])) {
+            return $this->pluralFunctions[$string];
+        }
+
+        if (preg_match( '/^\s*nplurals\s*=\s*(\d+)\s*;\s*plural=(.*)$/u', $string, $matches)) {
+            // sanitize
+            $nplurals = preg_replace( '/[^0-9]/', '', $matches[1] );
+            $plural = preg_replace( '#[^n0-9:\(\)\?\|\&=!<>+*/\%-]#', '', $matches[2] );
+
+            $body = str_replace(
+                array( 'plural', 'n', '$n$plurals', ),
+                array( '$plural', '$n', '$nplurals', ),
+                'nplurals='. $nplurals . '; plural=' . $plural
+            );
+
+            // add parents
+            // important since PHP's ternary evaluates from left to right
+            $body .= ';';
+            $res = '';
+            $p = 0;
+            $length = strlen($body);
+            for($i = 0; $i < $length; $i++) {
+                $ch = $body[$i];
+                switch ( $ch ) {
+                    case '?':
+                        $res .= ' ? (';
+                        $p++;
+                        break;
+                    case ':':
+                        $res .= ') : (';
+                        break;
+                    case ';':
+                        $res .= str_repeat( ')', $p ) . ';';
+                        $p = 0;
+                        break;
+                    default:
+                        $res .= $ch;
+                }
+            }
+
+            $body = $res . 'return ($plural>=$nplurals?$nplurals-1:$plural);';
+            $function = create_function('$n', $body);
+            $this->pluralFunctions[$string] = $function;
+            return $function;
+        } else {
+            // default: one plural form for all cases but n==1 (english)
+            $function = create_function(
+                '$n',
+                '$nplurals=2;$plural=($n==1?0:1);return ($plural>=$nplurals?$nplurals-1:$plural);'
+            );
+            $this->pluralFunctions[$string] = $function;
+            return $function;
+        }
+    }
+
+    /**
+     * returns the common language and other languages in an
+     * associative array
+     *
+     * @return array
+     */
+    public function getLanguages() {
+        $forceLanguage = $this->config->getSystemValue('force_language', false);
+        if ($forceLanguage !== false) {
+            return [];
+        }
+
+        $languageCodes = $this->findAvailableLanguages();
+
+        $commonLanguages = [];
+        $languages = [];
+
+        foreach($languageCodes as $lang) {
+            $l = $this->get('lib', $lang);
+            // TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
+            $potentialName = (string) $l->t('__language_name__');
+            if ($l->getLanguageCode() === $lang && $potentialName[0] !== '_') {//first check if the language name is in the translation file
+                $ln = array(
+                    'code' => $lang,
+                    'name' => $potentialName
+                );
+            } else if ($lang === 'en') {
+                $ln = array(
+                    'code' => $lang,
+                    'name' => 'English (US)'
+                );
+            } else {//fallback to language code
+                $ln = array(
+                    'code' => $lang,
+                    'name' => $lang
+                );
+            }
+
+            // put appropriate languages into appropriate arrays, to print them sorted
+            // common languages -> divider -> other languages
+            if (in_array($lang, self::COMMON_LANGUAGE_CODES)) {
+                $commonLanguages[array_search($lang, self::COMMON_LANGUAGE_CODES)] = $ln;
+            } else {
+                $languages[] = $ln;
+            }
+        }
+
+        ksort($commonLanguages);
+
+        // sort now by displayed language not the iso-code
+        usort( $languages, function ($a, $b) {
+            if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
+                // If a doesn't have a name, but b does, list b before a
+                return 1;
+            }
+            if ($a['code'] !== $a['name'] && $b['code'] === $b['name']) {
+                // If a does have a name, but b doesn't, list a before b
+                return -1;
+            }
+            // Otherwise compare the names
+            return strcmp($a['name'], $b['name']);
+        });
+
+        return [
+            // reset indexes
+            'commonlanguages' => array_values($commonLanguages),
+            'languages' => $languages
+        ];
+    }
 }

Spacing +31 added lines, -31 removed lines

@@ -164,7 +164,7 @@ 
 		 * @link https://github.com/owncloud/core/issues/21955
 		 */
 		if ($this->config->getSystemValue('installed', false)) {
-			$userId = !is_null($this->userSession->getUser()) ? $this->userSession->getUser()->getUID() :  null;
+			$userId = !is_null($this->userSession->getUser()) ? $this->userSession->getUser()->getUID() : null;
 			if (!is_null($userId)) {
 				$userLang = $this->config->getUserValue($userId, 'core', 'lang', null);
 			} else {
@@ -214,7 +214,7 @@ 
 		}
 
 		if ($this->config->getSystemValue('installed', false)) {
-			$userId = null !== $this->userSession->getUser() ? $this->userSession->getUser()->getUID() :  null;
+			$userId = null !== $this->userSession->getUser() ? $this->userSession->getUser()->getUID() : null;
 			$userLocale = null;
 			if (null !== $userId) {
 				$userLocale = $this->config->getUserValue($userId, 'core', 'locale', null);
@@ -276,7 +276,7 @@ 
 		// merge with translations from theme
 		$theme = $this->config->getSystemValue('theme');
 		if (!empty($theme)) {
-			$themeDir = $this->serverRoot . '/themes/' . $theme . substr($dir, strlen($this->serverRoot));
+			$themeDir = $this->serverRoot.'/themes/'.$theme.substr($dir, strlen($this->serverRoot));
 
 			if (is_dir($themeDir)) {
 				$files = scandir($themeDir);
@@ -302,7 +302,7 @@ 
 			return $this->availableLocales;
 		}
 
-		$localeData = file_get_contents(\OC::$SERVERROOT . '/resources/locales.json');
+		$localeData = file_get_contents(\OC::$SERVERROOT.'/resources/locales.json');
 		$this->availableLocales = \json_decode($localeData, true);
 
 		return $this->availableLocales;
@@ -324,24 +324,24 @@ 
 
 	public function iterateLanguage(bool $reset = false): string {
 		static $i = 0;
-		if($reset) {
+		if ($reset) {
 			$i = 0;
 		}
-		switch($i) {
+		switch ($i) {
 			/** @noinspection PhpMissingBreakStatementInspection */
 			case 0:
 				$i++;
 				$forcedLang = $this->config->getSystemValue('force_language', false);
-				if(is_string($forcedLang)) {
+				if (is_string($forcedLang)) {
 					return $forcedLang;
 				}
 			/** @noinspection PhpMissingBreakStatementInspection */
 			case 1:
 				$i++;
 				$user = $this->userSession->getUser();
-				if($user instanceof IUser) {
+				if ($user instanceof IUser) {
 					$userLang = $this->config->getUserValue($user->getUID(), 'core', 'lang', null);
-					if(is_string($userLang)) {
+					if (is_string($userLang)) {
 						return $userLang;
 					}
 				}
@@ -465,12 +465,12 @@ 
 		$languageFiles = [];
 
 		$i18nDir = $this->findL10nDir($app);
-		$transFile = strip_tags($i18nDir) . strip_tags($lang) . '.json';
+		$transFile = strip_tags($i18nDir).strip_tags($lang).'.json';
 
-		if (($this->isSubDirectory($transFile, $this->serverRoot . '/core/l10n/')
-				|| $this->isSubDirectory($transFile, $this->serverRoot . '/lib/l10n/')
-				|| $this->isSubDirectory($transFile, $this->serverRoot . '/settings/l10n/')
-				|| $this->isSubDirectory($transFile, \OC_App::getAppPath($app) . '/l10n/')
+		if (($this->isSubDirectory($transFile, $this->serverRoot.'/core/l10n/')
+				|| $this->isSubDirectory($transFile, $this->serverRoot.'/lib/l10n/')
+				|| $this->isSubDirectory($transFile, $this->serverRoot.'/settings/l10n/')
+				|| $this->isSubDirectory($transFile, \OC_App::getAppPath($app).'/l10n/')
 			)
 			&& file_exists($transFile)) {
 			// load the translations file
@@ -480,7 +480,7 @@ 
 		// merge with translations from theme
 		$theme = $this->config->getSystemValue('theme');
 		if (!empty($theme)) {
-			$transFile = $this->serverRoot . '/themes/' . $theme . substr($transFile, strlen($this->serverRoot));
+			$transFile = $this->serverRoot.'/themes/'.$theme.substr($transFile, strlen($this->serverRoot));
 			if (file_exists($transFile)) {
 				$languageFiles[] = $transFile;
 			}
@@ -497,14 +497,14 @@ 
 	 */
 	protected function findL10nDir($app = null) {
 		if (in_array($app, ['core', 'lib', 'settings'])) {
-			if (file_exists($this->serverRoot . '/' . $app . '/l10n/')) {
-				return $this->serverRoot . '/' . $app . '/l10n/';
+			if (file_exists($this->serverRoot.'/'.$app.'/l10n/')) {
+				return $this->serverRoot.'/'.$app.'/l10n/';
 			}
 		} else if ($app && \OC_App::getAppPath($app) !== false) {
 			// Check if the app is in the app folder
-			return \OC_App::getAppPath($app) . '/l10n/';
+			return \OC_App::getAppPath($app).'/l10n/';
 		}
-		return $this->serverRoot . '/core/l10n/';
+		return $this->serverRoot.'/core/l10n/';
 	}
 
 
@@ -521,15 +521,15 @@ 
 			return $this->pluralFunctions[$string];
 		}
 
-		if (preg_match( '/^\s*nplurals\s*=\s*(\d+)\s*;\s*plural=(.*)$/u', $string, $matches)) {
+		if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s*plural=(.*)$/u', $string, $matches)) {
 			// sanitize
-			$nplurals = preg_replace( '/[^0-9]/', '', $matches[1] );
-			$plural = preg_replace( '#[^n0-9:\(\)\?\|\&=!<>+*/\%-]#', '', $matches[2] );
+			$nplurals = preg_replace('/[^0-9]/', '', $matches[1]);
+			$plural = preg_replace('#[^n0-9:\(\)\?\|\&=!<>+*/\%-]#', '', $matches[2]);
 
 			$body = str_replace(
-				array( 'plural', 'n', '$n$plurals', ),
-				array( '$plural', '$n', '$nplurals', ),
-				'nplurals='. $nplurals . '; plural=' . $plural
+				array('plural', 'n', '$n$plurals',),
+				array('$plural', '$n', '$nplurals',),
+				'nplurals='.$nplurals.'; plural='.$plural
 			);
 
 			// add parents
@@ -538,9 +538,9 @@ 
 			$res = '';
 			$p = 0;
 			$length = strlen($body);
-			for($i = 0; $i < $length; $i++) {
+			for ($i = 0; $i < $length; $i++) {
 				$ch = $body[$i];
-				switch ( $ch ) {
+				switch ($ch) {
 					case '?':
 						$res .= ' ? (';
 						$p++;
@@ -549,7 +549,7 @@ 
 						$res .= ') : (';
 						break;
 					case ';':
-						$res .= str_repeat( ')', $p ) . ';';
+						$res .= str_repeat(')', $p).';';
 						$p = 0;
 						break;
 					default:
@@ -557,7 +557,7 @@ 
 				}
 			}
 
-			$body = $res . 'return ($plural>=$nplurals?$nplurals-1:$plural);';
+			$body = $res.'return ($plural>=$nplurals?$nplurals-1:$plural);';
 			$function = create_function('$n', $body);
 			$this->pluralFunctions[$string] = $function;
 			return $function;
@@ -589,7 +589,7 @@ 
 		$commonLanguages = [];
 		$languages = [];
 
-		foreach($languageCodes as $lang) {
+		foreach ($languageCodes as $lang) {
 			$l = $this->get('lib', $lang);
 			// TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
 			$potentialName = (string) $l->t('__language_name__');
@@ -622,7 +622,7 @@ 
 		ksort($commonLanguages);
 
 		// sort now by displayed language not the iso-code
-		usort( $languages, function ($a, $b) {
+		usort($languages, function($a, $b) {
 			if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
 				// If a doesn't have a name, but b does, list b before a
 				return 1;