nextcloud / server

lib/private/Config.php

Spacing +9 added lines, -9 removed lines

@@ -85,7 +85,7 @@ 
 	 * @return mixed the value or $default
 	 */
 	public function getValue($key, $default = null) {
-		$envValue = getenv(self::ENV_PREFIX . $key);
+		$envValue = getenv(self::ENV_PREFIX.$key);
 		if ($envValue !== false) {
 			return $envValue;
 		}
@@ -197,7 +197,7 @@ 
 		foreach ($configFiles as $file) {
 			$fileExistsAndIsReadable = file_exists($file) && is_readable($file);
 			$filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false;
-			if($file === $this->configFilePath &&
+			if ($file === $this->configFilePath &&
 				$filePointer === false) {
 				// Opening the main config might not be possible, e.g. if the wrong
 				// permissions are set (likely on a new installation)
@@ -205,13 +205,13 @@ 
 			}
 
 			// Try to acquire a file lock
-			if(!flock($filePointer, LOCK_SH)) {
+			if (!flock($filePointer, LOCK_SH)) {
 				throw new \Exception(sprintf('Could not acquire a shared lock on the config file %s', $file));
 			}
 
 			unset($CONFIG);
 			include $file;
-			if(isset($CONFIG) && is_array($CONFIG)) {
+			if (isset($CONFIG) && is_array($CONFIG)) {
 				$this->cache = array_merge($this->cache, $CONFIG);
 			}
 
@@ -236,29 +236,29 @@ 
 		$content .= var_export($this->cache, true);
 		$content .= ";\n";
 
-		touch ($this->configFilePath);
+		touch($this->configFilePath);
 		$filePointer = fopen($this->configFilePath, 'r+');
 
 		// Prevent others not to read the config
 		chmod($this->configFilePath, 0640);
 
 		// File does not exist, this can happen when doing a fresh install
-		if(!is_resource ($filePointer)) {
+		if (!is_resource($filePointer)) {
 			// TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order
 			// currently this breaks app routes but also could have other side effects especially during setup and exception handling
 			$url = \OC::$server->getURLGenerator()->linkToDocs('admin-dir_permissions');
 			throw new HintException(
 				"Can't write into config directory!",
-				'This can usually be fixed by giving the webserver write access to the config directory. See ' . $url);
+				'This can usually be fixed by giving the webserver write access to the config directory. See '.$url);
 		}
 
 		// Try to acquire a file lock
-		if(!flock($filePointer, LOCK_EX)) {
+		if (!flock($filePointer, LOCK_EX)) {
 			throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath));
 		}
 
 		// Write the config and release the lock
-		ftruncate ($filePointer, 0);
+		ftruncate($filePointer, 0);
 		fwrite($filePointer, $content);
 		fflush($filePointer);
 		flock($filePointer, LOCK_UN);

lib/private/App/CodeChecker/LanguageParseChecker.php

Spacing +3 added lines, -3 removed lines

@@ -35,12 +35,12 @@ 
 			throw new \RuntimeException("No app with given id <$appId> known.");
 		}
 
-		if (!is_dir($appPath . '/l10n/')) {
+		if (!is_dir($appPath.'/l10n/')) {
 			return [];
 		}
 
 		$errors = [];
-		$directory = new \DirectoryIterator($appPath . '/l10n/');
+		$directory = new \DirectoryIterator($appPath.'/l10n/');
 
 		foreach ($directory as $file) {
 			if ($file->getExtension() !== 'json') {
@@ -51,7 +51,7 @@ 
 			json_decode($content, true);
 
 			if (json_last_error() !== JSON_ERROR_NONE) {
-				$errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg();
+				$errors[] = 'Invalid language file found: l10n/'.$file->getFilename().': '.json_last_error_msg();
 			}
 		}
 

core/Application.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
 		$container = $this->getContainer();
 
-		$container->registerService('defaultMailAddress', function () {
+		$container->registerService('defaultMailAddress', function() {
 			return Util::getDefaultEmailAddress('lostpassword-noreply');
 		});
 	}

settings/Application.php

Spacing +6 added lines, -6 removed lines

@@ -52,7 +52,7 @@ 
 	/**
 	 * @param array $urlParams
 	 */
-	public function __construct(array $urlParams=[]){
+	public function __construct(array $urlParams = []) {
 		parent::__construct('settings', $urlParams);
 
 		$container = $this->getContainer();
@@ -72,7 +72,7 @@ 
 		$container->registerService('isSubAdmin', function(IContainer $c) {
 			$userObject = \OC::$server->getUserSession()->getUser();
 			$isSubAdmin = false;
-			if($userObject !== null) {
+			if ($userObject !== null) {
 				$isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject);
 			}
 			return $isSubAdmin;
@@ -80,17 +80,17 @@ 
 		$container->registerService('userCertificateManager', function(IContainer $c) {
 			return $c->query('ServerContainer')->getCertificateManager();
 		}, false);
-		$container->registerService('systemCertificateManager', function (IContainer $c) {
+		$container->registerService('systemCertificateManager', function(IContainer $c) {
 			return $c->query('ServerContainer')->getCertificateManager(null);
 		}, false);
-		$container->registerService(IProvider::class, function (IContainer $c) {
+		$container->registerService(IProvider::class, function(IContainer $c) {
 			return $c->query('ServerContainer')->query(IProvider::class);
 		});
-		$container->registerService(IManager::class, function (IContainer $c) {
+		$container->registerService(IManager::class, function(IContainer $c) {
 			return $c->query('ServerContainer')->getSettingsManager();
 		});
 
-		$container->registerService(NewUserMailHelper::class, function (IContainer $c) {
+		$container->registerService(NewUserMailHelper::class, function(IContainer $c) {
 			/** @var Server $server */
 			$server = $c->query('ServerContainer');
 			/** @var Defaults $defaults */

lib/private/App/CodeChecker/DatabaseSchemaChecker.php

Spacing +11 added lines, -11 removed lines

@@ -35,13 +35,13 @@ 
 			throw new \RuntimeException("No app with given id <$appId> known.");
 		}
 
-		if (!file_exists($appPath . '/appinfo/database.xml')) {
+		if (!file_exists($appPath.'/appinfo/database.xml')) {
 			return ['errors' => [], 'warnings' => []];
 		}
 
 		libxml_use_internal_errors(true);
 		$loadEntities = libxml_disable_entity_loader(false);
-		$xml = simplexml_load_file($appPath . '/appinfo/database.xml');
+		$xml = simplexml_load_file($appPath.'/appinfo/database.xml');
 		libxml_disable_entity_loader($loadEntities);
 
 
@@ -50,15 +50,15 @@ 
 		foreach ($xml->table as $table) {
 			// Table names
 			if (strpos($table->name, '*dbprefix*') !== 0) {
-				$errors[] = 'Database schema error: name of table ' . $table->name . ' does not start with *dbprefix*';
+				$errors[] = 'Database schema error: name of table '.$table->name.' does not start with *dbprefix*';
 			}
 			$tableName = substr($table->name, strlen('*dbprefix*'));
 			if (strpos($tableName, '*dbprefix*') !== false) {
-				$warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table ' . $table->name;
+				$warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table '.$table->name;
 			}
 
 			if (strlen($tableName) > 27) {
-				$errors[] = 'Database schema error: Name of table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
+				$errors[] = 'Database schema error: Name of table '.$table->name.' is too long ('.strlen($tableName).'), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
 			}
 
 			$hasAutoIncrement = false;
@@ -66,20 +66,20 @@ 
 			// Column names
 			foreach ($table->declaration->field as $column) {
 				if (strpos($column->name, '*dbprefix*') !== false) {
-					$warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column ' . $column->name . ' on table ' . $table->name;
+					$warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column '.$column->name.' on table '.$table->name;
 				}
 
 				if (strlen($column->name) > 30) {
-					$errors[] = 'Database schema error: Name of column ' . $column->name . ' on table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 30 characters allowed';
+					$errors[] = 'Database schema error: Name of column '.$column->name.' on table '.$table->name.' is too long ('.strlen($tableName).'), max. 30 characters allowed';
 				}
 
 				if ($column->autoincrement) {
 					if ($hasAutoIncrement) {
-						$errors[] = 'Database schema error: Table ' . $table->name . ' has multiple autoincrement columns';
+						$errors[] = 'Database schema error: Table '.$table->name.' has multiple autoincrement columns';
 					}
 
 					if (strlen($tableName) > 21) {
-						$errors[] = 'Database schema error: Name of table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
+						$errors[] = 'Database schema error: Name of table '.$table->name.' is too long ('.strlen($tableName).'), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
 					}
 
 					$hasAutoIncrement = true;
@@ -90,12 +90,12 @@ 
 			foreach ($table->declaration->index as $index) {
 				$hasPrefix = strpos($index->name, '*dbprefix*');
 				if ($hasPrefix !== false && $hasPrefix !== 0) {
-					$warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index ' . $index->name . ' on table ' . $table->name;
+					$warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index '.$index->name.' on table '.$table->name;
 				}
 
 				$indexName = $hasPrefix === 0 ? substr($index->name, strlen('*dbprefix*')) : $index->name;
 				if (strlen($indexName) > 27) {
-					$errors[] = 'Database schema error: Name of index ' . $index->name . ' on table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters + *dbprefix* allowed';
+					$errors[] = 'Database schema error: Name of index '.$index->name.' on table '.$table->name.' is too long ('.strlen($tableName).'), max. 27 characters + *dbprefix* allowed';
 				}
 			}
 		}

apps/files_external/lib/Lib/Storage/FTP.php

Spacing +20 added lines, -20 removed lines

@@ -36,28 +36,28 @@ 
 use Icewind\Streams\CallbackWrapper;
 use Icewind\Streams\RetryWrapper;
 
-class FTP extends StreamWrapper{
+class FTP extends StreamWrapper {
 	private $password;
 	private $user;
 	private $host;
 	private $secure;
 	private $root;
 
-	private static $tempFiles=array();
+	private static $tempFiles = array();
 
 	public function __construct($params) {
 		if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
-			$this->host=$params['host'];
-			$this->user=$params['user'];
-			$this->password=$params['password'];
+			$this->host = $params['host'];
+			$this->user = $params['user'];
+			$this->password = $params['password'];
 			if (isset($params['secure'])) {
 				$this->secure = $params['secure'];
 			} else {
 				$this->secure = false;
 			}
-			$this->root=isset($params['root'])?$params['root']:'/';
-			if ( ! $this->root || $this->root[0]!=='/') {
-				$this->root='/'.$this->root;
+			$this->root = isset($params['root']) ? $params['root'] : '/';
+			if (!$this->root || $this->root[0] !== '/') {
+				$this->root = '/'.$this->root;
 			}
 			if (substr($this->root, -1) !== '/') {
 				$this->root .= '/';
@@ -68,8 +68,8 @@ 
 		
 	}
 
-	public function getId(){
-		return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root;
+	public function getId() {
+		return 'ftp::'.$this->user.'@'.$this->host.'/'.$this->root;
 	}
 
 	/**
@@ -78,11 +78,11 @@ 
 	 * @return string
 	 */
 	public function constructUrl($path) {
-		$url='ftp';
+		$url = 'ftp';
 		if ($this->secure) {
-			$url.='s';
+			$url .= 's';
 		}
-		$url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path;
+		$url .= '://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path;
 		return $url;
 	}
 
@@ -101,8 +101,8 @@ 
 			return $result;
 		}
 	}
-	public function fopen($path,$mode) {
-		switch($mode) {
+	public function fopen($path, $mode) {
+		switch ($mode) {
 			case 'r':
 			case 'rb':
 			case 'w':
@@ -122,17 +122,17 @@ 
 			case 'c':
 			case 'c+':
 				//emulate these
-				if (strrpos($path, '.')!==false) {
-					$ext=substr($path, strrpos($path, '.'));
+				if (strrpos($path, '.') !== false) {
+					$ext = substr($path, strrpos($path, '.'));
 				} else {
-					$ext='';
+					$ext = '';
 				}
-				$tmpFile=\OCP\Files::tmpFile($ext);
+				$tmpFile = \OCP\Files::tmpFile($ext);
 				if ($this->file_exists($path)) {
 					$this->getFile($path, $tmpFile);
 				}
 				$handle = fopen($tmpFile, $mode);
-				return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+				return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) {
 					$this->writeBack($tmpFile, $path);
 				});
 		}

apps/files_external/lib/Lib/Storage/SFTP.php

Spacing +19 added lines, -19 removed lines

@@ -61,11 +61,11 @@ 
 		$input = $host;
 		if (strpos($host, '://') === false) {
 			// add a protocol to fix parse_url behavior with ipv6
-			$host = 'http://' . $host;
+			$host = 'http://'.$host;
 		}
 
 		$parsed = parse_url($host);
-		if(is_array($parsed) && isset($parsed['port'])) {
+		if (is_array($parsed) && isset($parsed['port'])) {
 			return [$parsed['host'], $parsed['port']];
 		} else if (is_array($parsed)) {
 			return [$parsed['host'], 22];
@@ -81,7 +81,7 @@ 
 		// Register sftp://
 		Stream::register();
 
-		$parsedHost =  $this->splitHost($params['host']);
+		$parsedHost = $this->splitHost($params['host']);
 
 		$this->host = $parsedHost[0];
 		$this->port = $parsedHost[1];
@@ -103,7 +103,7 @@ 
 			= isset($params['root']) ? $this->cleanPath($params['root']) : '/';
 
 		if ($this->root[0] !== '/') {
-			 $this->root = '/' . $this->root;
+			 $this->root = '/'.$this->root;
 		}
 
 		if (substr($this->root, -1, 1) !== '/') {
@@ -158,15 +158,15 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function getId(){
-		$id = 'sftp::' . $this->user . '@' . $this->host;
+	public function getId() {
+		$id = 'sftp::'.$this->user.'@'.$this->host;
 		if ($this->port !== 22) {
-			$id .= ':' . $this->port;
+			$id .= ':'.$this->port;
 		}
 		// note: this will double the root slash,
 		// we should not change it to keep compatible with
 		// old storage ids
-		$id .= '/' . $this->root;
+		$id .= '/'.$this->root;
 		return $id;
 	}
 
@@ -196,7 +196,7 @@ 
 	 * @return string
 	 */
 	private function absPath($path) {
-		return $this->root . $this->cleanPath($path);
+		return $this->root.$this->cleanPath($path);
 	}
 
 	/**
@@ -206,8 +206,8 @@ 
 		try {
 			$storage_view = \OCP\Files::getStorage('files_external');
 			if ($storage_view) {
-				return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') .
-					$storage_view->getAbsolutePath('') .
+				return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').
+					$storage_view->getAbsolutePath('').
 					'ssh_hostKeys';
 			}
 		} catch (\Exception $e) {
@@ -225,7 +225,7 @@ 
 			if ($keyPath && file_exists($keyPath)) {
 				$fp = fopen($keyPath, 'w');
 				foreach ($keys as $host => $key) {
-					fwrite($fp, $host . '::' . $key . "\n");
+					fwrite($fp, $host.'::'.$key."\n");
 				}
 				fclose($fp);
 				return true;
@@ -297,15 +297,15 @@ 
 				return false;
 			}
 
-			$id = md5('sftp:' . $path);
+			$id = md5('sftp:'.$path);
 			$dirStream = array();
-			foreach($list as $file) {
+			foreach ($list as $file) {
 				if ($file !== '.' && $file !== '..') {
 					$dirStream[] = $file;
 				}
 			}
 			return IteratorDirectory::wrap($dirStream);
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			return false;
 		}
 	}
@@ -357,10 +357,10 @@ 
 	public function fopen($path, $mode) {
 		try {
 			$absPath = $this->absPath($path);
-			switch($mode) {
+			switch ($mode) {
 				case 'r':
 				case 'rb':
-					if ( !$this->file_exists($path)) {
+					if (!$this->file_exists($path)) {
 						return false;
 					}
 				case 'w':
@@ -387,7 +387,7 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function touch($path, $mtime=null) {
+	public function touch($path, $mtime = null) {
 		try {
 			if (!is_null($mtime)) {
 				return false;
@@ -462,7 +462,7 @@ 
 		// Do not pass the password here. We want to use the Net_SFTP object
 		// supplied via stream context or fail. We only supply username and
 		// hostname because this might show up in logs (they are not used).
-		$url = 'sftp://' . urlencode($this->user) . '@' . $this->host . ':' . $this->port . $this->root . $path;
+		$url = 'sftp://'.urlencode($this->user).'@'.$this->host.':'.$this->port.$this->root.$path;
 		return $url;
 	}
 }

apps/files_external/lib/Command/Import.php

Spacing +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
 			$json = file_get_contents('php://stdin');
 		} else {
 			if (!file_exists($path)) {
-				$output->writeln('<error>File not found: ' . $path . '</error>');
+				$output->writeln('<error>File not found: '.$path.'</error>');
 				return 1;
 			}
 			$json = file_get_contents($path);
@@ -164,7 +164,7 @@ 
 					$existingMount->getApplicableUsers() === $mount->getApplicableUsers() &&
 					$existingMount->getBackendOptions() === $mount->getBackendOptions()
 				) {
-					$output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
+					$output->writeln("<error>Duplicate mount (".$mount->getMountPoint().")</error>");
 					return 1;
 				}
 			}

apps/files/ajax/download.php

Spacing +4 added lines, -4 removed lines

@@ -31,8 +31,8 @@ 
 OCP\User::checkLoggedIn();
 \OC::$server->getSession()->close();
 
-$files = isset($_GET['files']) ? (string)$_GET['files'] : '';
-$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : '';
+$files = isset($_GET['files']) ? (string) $_GET['files'] : '';
+$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : '';
 
 $files_list = json_decode($files);
 // in case we get only a single file
@@ -45,13 +45,13 @@ 
  * the content must not be longer than 32 characters and must only contain
  * alphanumeric characters
  */
-if(isset($_GET['downloadStartSecret'])
+if (isset($_GET['downloadStartSecret'])
 	&& !isset($_GET['downloadStartSecret'][32])
 	&& preg_match('!^[a-zA-Z0-9]+$!', $_GET['downloadStartSecret']) === 1) {
 	setcookie('ocDownloadStarted', $_GET['downloadStartSecret'], time() + 20, '/');
 }
 
-$server_params = array( 'head' => \OC::$server->getRequest()->getMethod() === 'HEAD' );
+$server_params = array('head' => \OC::$server->getRequest()->getMethod() === 'HEAD');
 
 /**
  * Http range requests support