nextcloud / server

lib/private/Updater/ChangesCheck.php

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/VersionCheck.php

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/L10N/Factory.php

Spacing +29 added lines, -29 removed lines

@@ -149,7 +149,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 {
@@ -219,7 +219,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);
@@ -253,24 +253,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;
 					}
 				}
@@ -377,12 +377,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
@@ -392,7 +392,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;
 			}
@@ -409,14 +409,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/';
 	}
 
 
@@ -433,15 +433,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
@@ -450,9 +450,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++;
@@ -461,7 +461,7 @@ 
 						$res .= ') : (';
 						break;
 					case ';':
-						$res .= str_repeat( ')', $p ) . ';';
+						$res .= str_repeat(')', $p).';';
 						$p = 0;
 						break;
 					default:
@@ -469,7 +469,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;
@@ -501,7 +501,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__');
@@ -534,7 +534,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;

apps/updatenotification/lib/Settings/Admin.php

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

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,