nextcloud / server

core/Controller/WhatsNewController.php

Spacing +4 added lines, -4 removed lines

@@ -74,13 +74,13 @@ 
 	 */
 	public function get():DataResponse {
 		$user = $this->userSession->getUser();
-		if($user === null) {
+		if ($user === null) {
 			throw new \RuntimeException("Acting user cannot be resolved");
 		}
 		$lastRead = $this->config->getUserValue($user->getUID(), 'core', 'whatsNewLastRead', 0);
 		$currentVersion = $this->whatsNewService->normalizeVersion($this->config->getSystemValue('version'));
 
-		if(version_compare($lastRead, $currentVersion, '>=')) {
+		if (version_compare($lastRead, $currentVersion, '>=')) {
 			return new DataResponse([], Http::STATUS_NO_CONTENT);
 		}
 
@@ -94,7 +94,7 @@ 
 			];
 			do {
 				$lang = $iterator->current();
-				if(isset($whatsNew['whatsNew'][$lang])) {
+				if (isset($whatsNew['whatsNew'][$lang])) {
 					$resultData['whatsNew'] = $whatsNew['whatsNew'][$lang];
 					break;
 				}
@@ -114,7 +114,7 @@ 
 	 */
 	public function dismiss(string $version):DataResponse {
 		$user = $this->userSession->getUser();
-		if($user === null) {
+		if ($user === null) {
 			throw new \RuntimeException("Acting user cannot be resolved");
 		}
 		$version = $this->whatsNewService->normalizeVersion($version);

lib/private/L10N/Factory.php

Spacing +27 added lines, -27 removed lines

@@ -165,7 +165,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 {
@@ -215,7 +215,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);
@@ -277,7 +277,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);
@@ -303,7 +303,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;
@@ -325,7 +325,7 @@ 
 
 	public function getLanguageIterator(IUser $user = null): ILanguageIterator {
 		$user = $user ?? $this->userSession->getUser();
-		if($user === null) {
+		if ($user === null) {
 			throw new \RuntimeException('Failed to get an IUser instance');
 		}
 		return new LanguageIterator($user, $this->config);
@@ -443,12 +443,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
@@ -458,7 +458,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;
 			}
@@ -475,14 +475,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/';
 	}
 
 
@@ -499,15 +499,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
@@ -516,9 +516,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++;
@@ -527,7 +527,7 @@ 
 						$res .= ') : (';
 						break;
 					case ';':
-						$res .= str_repeat( ')', $p ) . ';';
+						$res .= str_repeat(')', $p).';';
 						$p = 0;
 						break;
 					default:
@@ -535,7 +535,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;
@@ -567,7 +567,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__');
@@ -600,7 +600,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;

lib/private/L10N/LanguageIterator.php

Spacing +7 added lines, -7 removed lines

@@ -53,18 +53,18 @@ 
 	 * @since 14.0.0
 	 */
 	public function current(): string {
-		switch($this->i) {
+		switch ($this->i) {
 			/** @noinspection PhpMissingBreakStatementInspection */
 			case 0:
 				$forcedLang = $this->config->getSystemValue('force_language', false);
-				if(is_string($forcedLang)) {
+				if (is_string($forcedLang)) {
 					return $forcedLang;
 				}
 				$this->next();
 			/** @noinspection PhpMissingBreakStatementInspection */
 			case 1:
 				$forcedLang = $this->config->getSystemValue('force_language', false);
-				if(is_string($forcedLang)
+				if (is_string($forcedLang)
 					&& ($truncated = $this->getTruncatedLanguage($forcedLang)) !== $forcedLang
 				) {
 					return $truncated;
@@ -73,14 +73,14 @@ 
 			/** @noinspection PhpMissingBreakStatementInspection */
 			case 2:
 				$userLang = $this->config->getUserValue($this->user->getUID(), 'core', 'lang', null);
-				if(is_string($userLang)) {
+				if (is_string($userLang)) {
 					return $userLang;
 				}
 				$this->next();
 			/** @noinspection PhpMissingBreakStatementInspection */
 			case 3:
 				$userLang = $this->config->getUserValue($this->user->getUID(), 'core', 'lang', null);
-				if(is_string($userLang)
+				if (is_string($userLang)
 					&& ($truncated = $this->getTruncatedLanguage($userLang)) !== $userLang
 				) {
 					return $truncated;
@@ -91,7 +91,7 @@ 
 			/** @noinspection PhpMissingBreakStatementInspection */
 			case 5:
 				$defaultLang = $this->config->getSystemValue('default_language', 'en');
-				if(($truncated = $this->getTruncatedLanguage($defaultLang)) !== $defaultLang) {
+				if (($truncated = $this->getTruncatedLanguage($defaultLang)) !== $defaultLang) {
 					return $truncated;
 				}
 				$this->next();
@@ -129,7 +129,7 @@ 
 
 	protected function getTruncatedLanguage(string $lang):string {
 		$pos = strpos($lang, '_');
-		if($pos !== false) {
+		if ($pos !== false) {
 			$lang = substr($lang, 0, $pos);
 		}
 		return $lang;

lib/private/Updater/ChangesCheck.php

Spacing +13 added lines, -13 removed lines

@@ -63,7 +63,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) {
@@ -72,7 +72,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:
@@ -89,11 +89,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', [
@@ -104,7 +104,7 @@ 
 	}
 
 	protected function cacheResult(ChangesResult $entry, string $version) {
-		if($entry->getVersion() === $version) {
+		if ($entry->getVersion() === $version) {
 			$this->mapper->update($entry);
 		} else {
 			$entry->setVersion($version);
@@ -117,7 +117,7 @@ 
 	 */
 	protected function queryChangesServer(string $uri, ChangesResult $entry): IResponse {
 		$headers = [];
-		if($entry->getEtag() !== '') {
+		if ($entry->getEtag() !== '') {
 			$headers['If-None-Match'] = [$entry->getEtag()];
 		}
 
@@ -135,12 +135,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 {
@@ -157,7 +157,7 @@ 
 	public 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;
 		}

apps/updatenotification/lib/Settings/Admin.php

Spacing +4 added lines, -4 removed lines

@@ -116,21 +116,21 @@
 
 	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;
 		}
 
 		$iterator = $this->l10nFactory->getLanguageIterator();
 		do {
 			$lang = $iterator->current();
-			if(isset($changes['whatsNew'][$lang])) {
+			if (isset($changes['whatsNew'][$lang])) {
 				return $filtered['whatsNew'][$lang];
 			}
 			$iterator->next();
-		} while($lang !== 'en' && $iterator->valid());
+		} while ($lang !== 'en' && $iterator->valid());
 
 		return $filtered;
 	}