nextcloud / server

apps/settings/composer/composer/ClassLoader.php

Spacing +8 added lines, -8 removed lines

@@ -370,18 +370,18 @@ 
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        if (file_exists($file = $dir.$pathEnd)) {
                             return $file;
                         }
                     }
@@ -391,7 +391,7 @@ 
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -403,14 +403,14 @@ 
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -420,7 +420,7 @@ 
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }

apps/settings/composer/composer/autoload_psr4.php

Spacing +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Settings\\' => array($baseDir . '/../lib'),
+    'OCA\\Settings\\' => array($baseDir.'/../lib'),
 );

apps/settings/composer/composer/autoload_real.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
     public static function loadClassLoader($class)
     {
         if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
+            require __DIR__.'/ClassLoader.php';
         }
     }
 
@@ -25,11 +25,11 @@ 
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+            require_once __DIR__.'/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInitSettings::getInitializer($loader));
         } else {
-            $classMap = require __DIR__ . '/autoload_classmap.php';
+            $classMap = require __DIR__.'/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }

apps/files_trashbin/lib/Sabre/PropfindPlugin.php

Spacing +11 added lines, -11 removed lines

@@ -63,49 +63,49 @@
 			return;
 		}
 
-		$propFind->handle(self::TRASHBIN_FILENAME, function () use ($node) {
+		$propFind->handle(self::TRASHBIN_FILENAME, function() use ($node) {
 			return $node->getFilename();
 		});
 
-		$propFind->handle(self::TRASHBIN_ORIGINAL_LOCATION, function () use ($node) {
+		$propFind->handle(self::TRASHBIN_ORIGINAL_LOCATION, function() use ($node) {
 			return $node->getOriginalLocation();
 		});
 
-		$propFind->handle(self::TRASHBIN_TITLE, function () use ($node) {
+		$propFind->handle(self::TRASHBIN_TITLE, function() use ($node) {
 			return $node->getTitle();
 		});
 
-		$propFind->handle(self::TRASHBIN_DELETION_TIME, function () use ($node) {
+		$propFind->handle(self::TRASHBIN_DELETION_TIME, function() use ($node) {
 			return $node->getDeletionTime();
 		});
 
-		$propFind->handle(FilesPlugin::SIZE_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(FilesPlugin::SIZE_PROPERTYNAME, function() use ($node) {
 			return $node->getSize();
 		});
 
-		$propFind->handle(FilesPlugin::FILEID_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(FilesPlugin::FILEID_PROPERTYNAME, function() use ($node) {
 			return $node->getFileId();
 		});
 
-		$propFind->handle(FilesPlugin::PERMISSIONS_PROPERTYNAME, function () {
+		$propFind->handle(FilesPlugin::PERMISSIONS_PROPERTYNAME, function() {
 			return 'GD'; // read + delete
 		});
 
-		$propFind->handle(FilesPlugin::GETETAG_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(FilesPlugin::GETETAG_PROPERTYNAME, function() use ($node) {
 			// add fake etag, it is only needed to identify the preview image
 			return $node->getLastModified();
 		});
 
-		$propFind->handle(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, function() use ($node) {
 			// add fake etag, it is only needed to identify the preview image
 			return $node->getFileId();
 		});
 
-		$propFind->handle(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, function() use ($node) {
 			return $this->previewManager->isAvailable($node->getFileInfo());
 		});
 
-		$propFind->handle(FilesPlugin::MOUNT_TYPE_PROPERTYNAME, function () {
+		$propFind->handle(FilesPlugin::MOUNT_TYPE_PROPERTYNAME, function() {
 			return '';
 		});
 	}

lib/private/Authentication/Token/PublicKeyTokenProvider.php

Spacing +8 added lines, -8 removed lines

@@ -100,7 +100,7 @@ 
 			}
 		}
 
-		if ((int)$token->getExpires() !== 0 && $token->getExpires() < $this->time->getTime()) {
+		if ((int) $token->getExpires() !== 0 && $token->getExpires() < $this->time->getTime()) {
 			throw new ExpiredTokenException($token);
 		}
 
@@ -118,7 +118,7 @@ 
 			throw new InvalidTokenException();
 		}
 
-		if ((int)$token->getExpires() !== 0 && $token->getExpires() < $this->time->getTime()) {
+		if ((int) $token->getExpires() !== 0 && $token->getExpires() < $this->time->getTime()) {
 			throw new ExpiredTokenException($token);
 		}
 
@@ -173,10 +173,10 @@ 
 		$this->cache->clear();
 
 		$olderThan = $this->time->getTime() - (int) $this->config->getSystemValue('session_lifetime', 60 * 60 * 24);
-		$this->logger->debug('Invalidating session tokens older than ' . date('c', $olderThan), ['app' => 'cron']);
+		$this->logger->debug('Invalidating session tokens older than '.date('c', $olderThan), ['app' => 'cron']);
 		$this->mapper->invalidateOld($olderThan, IToken::DO_NOT_REMEMBER);
 		$rememberThreshold = $this->time->getTime() - (int) $this->config->getSystemValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
-		$this->logger->debug('Invalidating remembered session tokens older than ' . date('c', $rememberThreshold), ['app' => 'cron']);
+		$this->logger->debug('Invalidating remembered session tokens older than '.date('c', $rememberThreshold), ['app' => 'cron']);
 		$this->mapper->invalidateOld($rememberThreshold, IToken::REMEMBER);
 	}
 
@@ -263,7 +263,7 @@ 
 
 	private function encrypt(string $plaintext, string $token): string {
 		$secret = $this->config->getSystemValue('secret');
-		return $this->crypto->encrypt($plaintext, $token . $secret);
+		return $this->crypto->encrypt($plaintext, $token.$secret);
 	}
 
 	/**
@@ -272,7 +272,7 @@ 
 	private function decrypt(string $cipherText, string $token): string {
 		$secret = $this->config->getSystemValue('secret');
 		try {
-			return $this->crypto->decrypt($cipherText, $token . $secret);
+			return $this->crypto->decrypt($cipherText, $token.$secret);
 		} catch (\Exception $ex) {
 			// Delete the invalid token
 			$this->invalidateToken($token);
@@ -296,7 +296,7 @@ 
 
 	private function hashToken(string $token): string {
 		$secret = $this->config->getSystemValue('secret');
-		return hash('sha512', $token . $secret);
+		return hash('sha512', $token.$secret);
 	}
 
 	/**
@@ -409,6 +409,6 @@ 
 		while ($error = openssl_error_string()) {
 			$errors[] = $error;
 		}
-		$this->logger->critical('Something is wrong with your openssl setup: ' . implode(', ', $errors));
+		$this->logger->critical('Something is wrong with your openssl setup: '.implode(', ', $errors));
 	}
 }

lib/private/Files/Cache/Storage.php

Spacing +6 added lines, -6 removed lines

@@ -71,17 +71,17 @@ 
 		$this->storageId = self::adjustStorageId($this->storageId);
 
 		if ($row = self::getStorageById($this->storageId)) {
-			$this->numericId = (int)$row['numeric_id'];
+			$this->numericId = (int) $row['numeric_id'];
 		} else {
 			$connection = \OC::$server->getDatabaseConnection();
 			$available = $isAvailable ? 1 : 0;
 			if ($connection->insertIfNotExist('*PREFIX*storages', ['id' => $this->storageId, 'available' => $available])) {
-				$this->numericId = (int)$connection->lastInsertId('*PREFIX*storages');
+				$this->numericId = (int) $connection->lastInsertId('*PREFIX*storages');
 			} else {
 				if ($row = self::getStorageById($this->storageId)) {
-					$this->numericId = (int)$row['numeric_id'];
+					$this->numericId = (int) $row['numeric_id'];
 				} else {
-					throw new \RuntimeException('Storage could neither be inserted nor be selected from the database: ' . $this->storageId);
+					throw new \RuntimeException('Storage could neither be inserted nor be selected from the database: '.$this->storageId);
 				}
 			}
 		}
@@ -144,7 +144,7 @@ 
 		$storageId = self::adjustStorageId($storageId);
 
 		if ($row = self::getStorageById($storageId)) {
-			return (int)$row['numeric_id'];
+			return (int) $row['numeric_id'];
 		} else {
 			return null;
 		}
@@ -156,7 +156,7 @@ 
 	public function getAvailability() {
 		if ($row = self::getStorageById($this->storageId)) {
 			return [
-				'available' => (int)$row['available'] === 1,
+				'available' => (int) $row['available'] === 1,
 				'last_checked' => $row['last_checked']
 			];
 		} else {

lib/private/Template/SCSSCacher.php

Spacing +31 added lines, -31 removed lines

@@ -116,9 +116,9 @@ 
 		$this->defaults     = $defaults;
 		$this->serverRoot   = $serverRoot;
 		$this->cacheFactory = $cacheFactory;
-		$this->depsCache    = $cacheFactory->createDistributed('SCSS-deps-' . md5($this->urlGenerator->getBaseUrl()));
-		$this->isCachedCache = $cacheFactory->createDistributed('SCSS-cached-' . md5($this->urlGenerator->getBaseUrl()));
-		$lockingCache = $cacheFactory->createDistributed('SCSS-locks-' . md5($this->urlGenerator->getBaseUrl()));
+		$this->depsCache    = $cacheFactory->createDistributed('SCSS-deps-'.md5($this->urlGenerator->getBaseUrl()));
+		$this->isCachedCache = $cacheFactory->createDistributed('SCSS-cached-'.md5($this->urlGenerator->getBaseUrl()));
+		$lockingCache = $cacheFactory->createDistributed('SCSS-locks-'.md5($this->urlGenerator->getBaseUrl()));
 		if (!($lockingCache instanceof IMemcache)) {
 			$lockingCache = new NullCache();
 		}
@@ -137,7 +137,7 @@ 
 	 * @throws NotPermittedException
 	 */
 	public function process(string $root, string $file, string $app): bool {
-		$path = explode('/', $root . '/' . $file);
+		$path = explode('/', $root.'/'.$file);
 
 		$fileNameSCSS = array_pop($path);
 		$fileNameCSS  = $this->prependVersionPrefix($this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileNameSCSS)), $app);
@@ -157,7 +157,7 @@ 
 			$folder = $this->appData->newFolder($app);
 		}
 
-		$lockKey = $webDir . '/' . $fileNameSCSS;
+		$lockKey = $webDir.'/'.$fileNameSCSS;
 
 		if (!$this->lockingCache->add($lockKey, 'locked!', 120)) {
 			$retry = 0;
@@ -166,7 +166,7 @@ 
 				if (!$this->variablesChanged() && $this->isCached($fileNameCSS, $app)) {
 					// Inject icons vars css if any
 					$this->lockingCache->remove($lockKey);
-					$this->logger->debug('SCSSCacher: ' .$lockKey.' is now available after '.$retry.'s. Moving on...', ['app' => 'core']);
+					$this->logger->debug('SCSSCacher: '.$lockKey.' is now available after '.$retry.'s. Moving on...', ['app' => 'core']);
 					return $this->injectCssVariablesIfAny();
 				}
 				$this->logger->debug('SCSSCacher: scss cache file locked for '.$lockKey, ['app' => 'core']);
@@ -214,7 +214,7 @@ 
 	 * @return boolean
 	 */
 	private function isCached(string $fileNameCSS, string $app) {
-		$key = $this->config->getSystemValue('version') . '/' . $app . '/' . $fileNameCSS;
+		$key = $this->config->getSystemValue('version').'/'.$app.'/'.$fileNameCSS;
 
 		// If the file mtime is more recent than our cached one,
 		// let's consider the file is properly cached
@@ -236,13 +236,13 @@ 
 		try {
 			$cachedFile = $folder->getFile($fileNameCSS);
 			if ($cachedFile->getSize() > 0) {
-				$depFileName = $fileNameCSS . '.deps';
-				$deps        = $this->depsCache->get($folder->getName() . '-' . $depFileName);
+				$depFileName = $fileNameCSS.'.deps';
+				$deps        = $this->depsCache->get($folder->getName().'-'.$depFileName);
 				if ($deps === null) {
 					$depFile = $folder->getFile($depFileName);
 					$deps    = $depFile->getContent();
 					// Set to memcache for next run
-					$this->depsCache->set($folder->getName() . '-' . $depFileName, $deps);
+					$this->depsCache->set($folder->getName().'-'.$depFileName, $deps);
 				}
 				$deps = json_decode($deps, true);
 
@@ -291,7 +291,7 @@ 
 		$scss = new Compiler();
 		$scss->setImportPaths([
 			$path,
-			$this->serverRoot . '/core/css/'
+			$this->serverRoot.'/core/css/'
 		]);
 
 		// Continue after throw
@@ -311,7 +311,7 @@ 
 			$cachedfile = $folder->newFile($fileNameCSS);
 		}
 
-		$depFileName = $fileNameCSS . '.deps';
+		$depFileName = $fileNameCSS.'.deps';
 		try {
 			$depFile = $folder->getFile($depFileName);
 		} catch (NotFoundException $e) {
@@ -321,11 +321,11 @@ 
 		// Compile
 		try {
 			$compiledScss = $scss->compile(
-				'$webroot: \'' . $this->getRoutePrefix() . '\';' .
-				$this->getInjectedVariables() .
-				'@import "variables.scss";' .
-				'@import "functions.scss";' .
-				'@import "' . $fileNameSCSS . '";');
+				'$webroot: \''.$this->getRoutePrefix().'\';'.
+				$this->getInjectedVariables().
+				'@import "variables.scss";'.
+				'@import "functions.scss";'.
+				'@import "'.$fileNameSCSS.'";');
 		} catch (ParserException $e) {
 			$this->logger->logException($e, ['app' => 'core']);
 
@@ -337,9 +337,9 @@ 
 
 		// Gzip file
 		try {
-			$gzipFile = $folder->getFile($fileNameCSS . '.gzip'); # Safari doesn't like .gz
+			$gzipFile = $folder->getFile($fileNameCSS.'.gzip'); # Safari doesn't like .gz
 		} catch (NotFoundException $e) {
-			$gzipFile = $folder->newFile($fileNameCSS . '.gzip'); # Safari doesn't like .gz
+			$gzipFile = $folder->newFile($fileNameCSS.'.gzip'); # Safari doesn't like .gz
 		}
 
 		try {
@@ -347,13 +347,13 @@ 
 			$cachedfile->putContent($data);
 			$deps = json_encode($scss->getParsedFiles());
 			$depFile->putContent($deps);
-			$this->depsCache->set($folder->getName() . '-' . $depFileName, $deps);
+			$this->depsCache->set($folder->getName().'-'.$depFileName, $deps);
 			$gzipFile->putContent(gzencode($data, 9));
-			$this->logger->debug('SCSSCacher: ' . $webDir . '/' . $fileNameSCSS . ' compiled and successfully cached', ['app' => 'core']);
+			$this->logger->debug('SCSSCacher: '.$webDir.'/'.$fileNameSCSS.' compiled and successfully cached', ['app' => 'core']);
 
 			return true;
 		} catch (NotPermittedException $e) {
-			$this->logger->error('SCSSCacher: unable to cache: ' . $fileNameSCSS);
+			$this->logger->error('SCSSCacher: unable to cache: '.$fileNameSCSS);
 
 			return false;
 		}
@@ -379,7 +379,7 @@ 
 				try {
 					$file->delete();
 				} catch (NotPermittedException $e) {
-					$this->logger->logException($e, ['message' => 'SCSSCacher: unable to delete file: ' . $file->getName()]);
+					$this->logger->logException($e, ['message' => 'SCSSCacher: unable to delete file: '.$file->getName()]);
 				}
 			}
 		}
@@ -396,7 +396,7 @@ 
 		}
 		$variables = '';
 		foreach ($this->defaults->getScssVariables() as $key => $value) {
-			$variables .= '$' . $key . ': ' . $value . ' !default;';
+			$variables .= '$'.$key.': '.$value.' !default;';
 		}
 
 		// check for valid variables / otherwise fall back to defaults
@@ -419,7 +419,7 @@ 
 	 */
 	private function rebaseUrls(string $css, string $webDir): string {
 		$re    = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x';
-		$subst = 'url(\'' . $webDir . '/$1\')';
+		$subst = 'url(\''.$webDir.'/$1\')';
 
 		return preg_replace($re, $subst, $css);
 	}
@@ -448,12 +448,12 @@ 
 	 * @return string
 	 */
 	private function prependBaseurlPrefix(string $cssFile): string {
-		return substr(md5($this->urlGenerator->getBaseUrl() . $this->getRoutePrefix()), 0, 4) . '-' . $cssFile;
+		return substr(md5($this->urlGenerator->getBaseUrl().$this->getRoutePrefix()), 0, 4).'-'.$cssFile;
 	}
 
 	private function getRoutePrefix() {
 		$frontControllerActive = ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
-		$prefix = \OC::$WEBROOT . '/index.php';
+		$prefix = \OC::$WEBROOT.'/index.php';
 		if ($frontControllerActive) {
 			$prefix = \OC::$WEBROOT;
 		}
@@ -469,11 +469,11 @@ 
 	private function prependVersionPrefix(string $cssFile, string $appId): string {
 		$appVersion = \OC_App::getAppVersion($appId);
 		if ($appVersion !== '0') {
-			return substr(md5($appVersion), 0, 4) . '-' . $cssFile;
+			return substr(md5($appVersion), 0, 4).'-'.$cssFile;
 		}
 		$coreVersion = \OC_Util::getVersionString();
 
-		return substr(md5($coreVersion), 0, 4) . '-' . $cssFile;
+		return substr(md5($coreVersion), 0, 4).'-'.$cssFile;
 	}
 
 	/**
@@ -491,10 +491,10 @@ 
 			$appDirectoryPath = explode($appName, $path)[1];
 			// Remove the webroot
 
-			return str_replace($webRoot, '', $appWebPath . $appDirectoryPath);
+			return str_replace($webRoot, '', $appWebPath.$appDirectoryPath);
 		}
 
-		return $webRoot . substr($path, strlen($serverRoot));
+		return $webRoot.substr($path, strlen($serverRoot));
 	}
 
 	/**

core/Command/User/ListCommand.php

Spacing +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$users = $this->userManager->search('', (int) $input->getOption('limit'), (int) $input->getOption('offset'));
 
-		$this->writeArrayInOutputFormat($input, $output, $this->formatUsers($users, (bool)$input->getOption('info')));
+		$this->writeArrayInOutputFormat($input, $output, $this->formatUsers($users, (bool) $input->getOption('info')));
 	}
 
 	/**
@@ -94,11 +94,11 @@ 
 	 * @return array
 	 */
 	private function formatUsers(array $users, bool $detailed = false) {
-		$keys = array_map(function (IUser $user) {
+		$keys = array_map(function(IUser $user) {
 			return $user->getUID();
 		}, $users);
 	
-		$values = array_map(function (IUser $user) use ($detailed) {
+		$values = array_map(function(IUser $user) use ($detailed) {
 			if ($detailed) {
 				$groups = $this->groupManager->getUserGroupIds($user);
 				return [

apps/settings/templates/settings/admin/security.php

Spacing +3 added lines, -3 removed lines

@@ -29,15 +29,15 @@
 ?>
 
 <div id="two-factor-auth" class="section">
-	<h2><?php p($l->t('Two-Factor Authentication'));?></h2>
-	<a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation'));?>" href="<?php p(link_to_docs('admin-2fa')); ?>"></a>
+	<h2><?php p($l->t('Two-Factor Authentication')); ?></h2>
+	<a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation')); ?>" href="<?php p(link_to_docs('admin-2fa')); ?>"></a>
 	<div id="two-factor-auth-settings"></div>
 </div>
 
 <div class="section" id='encryptionAPI'>
 	<h2><?php p($l->t('Server-side encryption')); ?></h2>
 	<a target="_blank" rel="noreferrer noopener" class="icon-info"
-	   title="<?php p($l->t('Open documentation'));?>"
+	   title="<?php p($l->t('Open documentation')); ?>"
 	   href="<?php p(link_to_docs('admin-encryption')); ?>"></a>
 	<p class="settings-hint"><?php p($l->t('Server-side encryption makes it possible to encrypt files which are uploaded to this server. This comes with limitations like a performance penalty, so enable this only if needed.')); ?></p>
 	<p id="enable">