nextcloud / server

lib/private/Memcache/CASTrait.php

Spacing +3 added lines, -3 removed lines

@@ -41,13 +41,13 @@
 	 */
 	public function cas($key, $old, $new) {
 		//no native cas, emulate with locking
-		if ($this->add($key . '_lock', true)) {
+		if ($this->add($key.'_lock', true)) {
 			if ($this->get($key) === $old) {
 				$this->set($key, $new);
-				$this->remove($key . '_lock');
+				$this->remove($key.'_lock');
 				return true;
 			} else {
-				$this->remove($key . '_lock');
+				$this->remove($key.'_lock');
 				return false;
 			}
 		} else {

lib/private/Memcache/APCu.php

Spacing +14 added lines, -14 removed lines

@@ -37,7 +37,7 @@ 
 	use CADTrait;
 
 	public function get($key) {
-		$result = apcu_fetch($this->getPrefix() . $key, $success);
+		$result = apcu_fetch($this->getPrefix().$key, $success);
 		if (!$success) {
 			return null;
 		}
@@ -45,24 +45,24 @@ 
 	}
 
 	public function set($key, $value, $ttl = 0) {
-		return apcu_store($this->getPrefix() . $key, $value, $ttl);
+		return apcu_store($this->getPrefix().$key, $value, $ttl);
 	}
 
 	public function hasKey($key) {
-		return apcu_exists($this->getPrefix() . $key);
+		return apcu_exists($this->getPrefix().$key);
 	}
 
 	public function remove($key) {
-		return apcu_delete($this->getPrefix() . $key);
+		return apcu_delete($this->getPrefix().$key);
 	}
 
 	public function clear($prefix = '') {
-		$ns = $this->getPrefix() . $prefix;
+		$ns = $this->getPrefix().$prefix;
 		$ns = preg_quote($ns, '/');
-		if(class_exists('\APCIterator')) {
-			$iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
+		if (class_exists('\APCIterator')) {
+			$iter = new \APCIterator('user', '/^'.$ns.'/', APC_ITER_KEY);
 		} else {
-			$iter = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY);
+			$iter = new \APCUIterator('/^'.$ns.'/', APC_ITER_KEY);
 		}
 		return apcu_delete($iter);
 	}
@@ -76,7 +76,7 @@ 
 	 * @return bool
 	 */
 	public function add($key, $value, $ttl = 0) {
-		return apcu_add($this->getPrefix() . $key, $value, $ttl);
+		return apcu_add($this->getPrefix().$key, $value, $ttl);
 	}
 
 	/**
@@ -100,8 +100,8 @@ 
 		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
 		 * for details
 		 */
-		return apcu_exists($this->getPrefix() . $key)
-			? apcu_inc($this->getPrefix() . $key, $step)
+		return apcu_exists($this->getPrefix().$key)
+			? apcu_inc($this->getPrefix().$key, $step)
 			: false;
 	}
 
@@ -125,8 +125,8 @@ 
 		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
 		 * for details
 		 */
-		return apcu_exists($this->getPrefix() . $key)
-			? apcu_dec($this->getPrefix() . $key, $step)
+		return apcu_exists($this->getPrefix().$key)
+			? apcu_dec($this->getPrefix().$key, $step)
 			: false;
 	}
 
@@ -141,7 +141,7 @@ 
 	public function cas($key, $old, $new) {
 		// apc only does cas for ints
 		if (is_int($old) and is_int($new)) {
-			return apcu_cas($this->getPrefix() . $key, $old, $new);
+			return apcu_cas($this->getPrefix().$key, $old, $new);
 		} else {
 			return $this->casEmulated($key, $old, $new);
 		}

lib/private/Memcache/CADTrait.php

Spacing +3 added lines, -3 removed lines

@@ -38,13 +38,13 @@
 	 */
 	public function cad($key, $old) {
 		//no native cas, emulate with locking
-		if ($this->add($key . '_lock', true)) {
+		if ($this->add($key.'_lock', true)) {
 			if ($this->get($key) === $old) {
 				$this->remove($key);
-				$this->remove($key . '_lock');
+				$this->remove($key.'_lock');
 				return true;
 			} else {
-				$this->remove($key . '_lock');
+				$this->remove($key.'_lock');
 				return false;
 			}
 		} else {

lib/private/Memcache/Memcached.php

Spacing +9 added lines, -9 removed lines

@@ -97,7 +97,7 @@ 
 	}
 
 	public function get($key) {
-		$result = self::$cache->get($this->getNamespace() . $key);
+		$result = self::$cache->get($this->getNamespace().$key);
 		if ($result === false and self::$cache->getResultCode() == \Memcached::RES_NOTFOUND) {
 			return null;
 		} else {
@@ -107,9 +107,9 @@ 
 
 	public function set($key, $value, $ttl = 0) {
 		if ($ttl > 0) {
-			$result =  self::$cache->set($this->getNamespace() . $key, $value, $ttl);
+			$result = self::$cache->set($this->getNamespace().$key, $value, $ttl);
 		} else {
-			$result = self::$cache->set($this->getNamespace() . $key, $value);
+			$result = self::$cache->set($this->getNamespace().$key, $value);
 		}
 		if ($result !== true) {
 			$this->verifyReturnCode();
@@ -118,12 +118,12 @@ 
 	}
 
 	public function hasKey($key) {
-		self::$cache->get($this->getNamespace() . $key);
+		self::$cache->get($this->getNamespace().$key);
 		return self::$cache->getResultCode() === \Memcached::RES_SUCCESS;
 	}
 
 	public function remove($key) {
-		$result= self::$cache->delete($this->getNamespace() . $key);
+		$result = self::$cache->delete($this->getNamespace().$key);
 		if (self::$cache->getResultCode() !== \Memcached::RES_NOTFOUND) {
 			$this->verifyReturnCode();
 		}
@@ -131,7 +131,7 @@ 
 	}
 
 	public function clear($prefix = '') {
-		$prefix = $this->getNamespace() . $prefix;
+		$prefix = $this->getNamespace().$prefix;
 		$allKeys = self::$cache->getAllKeys();
 		if ($allKeys === false) {
 			// newer Memcached doesn't like getAllKeys(), flush everything
@@ -165,7 +165,7 @@ 
 	 * @throws \Exception
 	 */
 	public function add($key, $value, $ttl = 0) {
-		$result = self::$cache->add($this->getPrefix() . $key, $value, $ttl);
+		$result = self::$cache->add($this->getPrefix().$key, $value, $ttl);
 		if (self::$cache->getResultCode() !== \Memcached::RES_NOTSTORED) {
 			$this->verifyReturnCode();
 		}
@@ -181,7 +181,7 @@ 
 	 */
 	public function inc($key, $step = 1) {
 		$this->add($key, 0);
-		$result = self::$cache->increment($this->getPrefix() . $key, $step);
+		$result = self::$cache->increment($this->getPrefix().$key, $step);
 
 		if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
 			return false;
@@ -198,7 +198,7 @@ 
 	 * @return int | bool
 	 */
 	public function dec($key, $step = 1) {
-		$result = self::$cache->decrement($this->getPrefix() . $key, $step);
+		$result = self::$cache->decrement($this->getPrefix().$key, $step);
 
 		if (self::$cache->getResultCode() !== \Memcached::RES_SUCCESS) {
 			return false;

lib/private/Memcache/XCache.php

Spacing +8 added lines, -8 removed lines

@@ -47,28 +47,28 @@ 
 	}
 
 	public function get($key) {
-		return xcache_get($this->getNamespace() . $key);
+		return xcache_get($this->getNamespace().$key);
 	}
 
 	public function set($key, $value, $ttl = 0) {
 		if ($ttl > 0) {
-			return xcache_set($this->getNamespace() . $key, $value, $ttl);
+			return xcache_set($this->getNamespace().$key, $value, $ttl);
 		} else {
-			return xcache_set($this->getNamespace() . $key, $value);
+			return xcache_set($this->getNamespace().$key, $value);
 		}
 	}
 
 	public function hasKey($key) {
-		return xcache_isset($this->getNamespace() . $key);
+		return xcache_isset($this->getNamespace().$key);
 	}
 
 	public function remove($key) {
-		return xcache_unset($this->getNamespace() . $key);
+		return xcache_unset($this->getNamespace().$key);
 	}
 
 	public function clear($prefix = '') {
 		if (function_exists('xcache_unset_by_prefix')) {
-			return xcache_unset_by_prefix($this->getNamespace() . $prefix);
+			return xcache_unset_by_prefix($this->getNamespace().$prefix);
 		} else {
 			// Since we can not clear by prefix, we just clear the whole cache.
 			xcache_clear_cache(\XC_TYPE_VAR, 0);
@@ -100,7 +100,7 @@ 
 	 * @return int | bool
 	 */
 	public function inc($key, $step = 1) {
-		return xcache_inc($this->getPrefix() . $key, $step);
+		return xcache_inc($this->getPrefix().$key, $step);
 	}
 
 	/**
@@ -111,7 +111,7 @@ 
 	 * @return int | bool
 	 */
 	public function dec($key, $step = 1) {
-		return xcache_dec($this->getPrefix() . $key, $step);
+		return xcache_dec($this->getPrefix().$key, $step);
 	}
 
 	static public function isAvailable() {

lib/private/OCS/Result.php

Spacing +4 added lines, -4 removed lines

@@ -103,10 +103,10 @@ 
 		$meta['status'] = $this->succeeded() ? 'ok' : 'failure';
 		$meta['statuscode'] = $this->statusCode;
 		$meta['message'] = $this->message;
-		if(isset($this->items)) {
+		if (isset($this->items)) {
 			$meta['totalitems'] = $this->items;
 		}
-		if(isset($this->perPage)) {
+		if (isset($this->perPage)) {
 			$meta['itemsperpage'] = $this->perPage;
 		}
 		return $meta;
@@ -136,11 +136,11 @@ 
 	 * @return $this
 	 */
 	public function addHeader($name, $value) {
-		$name = trim($name);  // always remove leading and trailing whitespace
+		$name = trim($name); // always remove leading and trailing whitespace
 		// to be able to reliably check for security
 		// headers
 
-		if(is_null($value)) {
+		if (is_null($value)) {
 			unset($this->headers[$name]);
 		} else {
 			$this->headers[$name] = $value;

lib/private/OCS/PrivateData.php

Spacing +8 added lines, -8 removed lines

@@ -43,7 +43,7 @@ 
 		$app = addslashes(strip_tags($parameters['app']));
 		$key = isset($parameters['key']) ? addslashes(strip_tags($parameters['key'])) : null;
 		
-		if(empty($key)) {
+		if (empty($key)) {
 			$query = \OCP\DB::prepare('SELECT `key`, `app`, `value`  FROM `*PREFIX*privatedata` WHERE `user` = ? AND `app` = ? ');
 			$result = $query->execute(array($user, $app));
 		} else {
@@ -53,10 +53,10 @@ 
 		
 		$xml = array();
 		while ($row = $result->fetchRow()) {
-			$data=array();
-			$data['key']=$row['key'];
-			$data['app']=$row['app'];
-			$data['value']=$row['value'];
+			$data = array();
+			$data['key'] = $row['key'];
+			$data['app'] = $row['app'];
+			$data['value'] = $row['value'];
 		 	$xml[] = $data;
 		}
 
@@ -73,7 +73,7 @@ 
 		$user = \OC_User::getUser();
 		$app = addslashes(strip_tags($parameters['app']));
 		$key = addslashes(strip_tags($parameters['key']));
-		$value = (string)$_POST['value'];
+		$value = (string) $_POST['value'];
 
 		// update in DB
 		$query = \OCP\DB::prepare('UPDATE `*PREFIX*privatedata` SET `value` = ?  WHERE `user` = ? AND `app` = ? AND `key` = ?');
@@ -81,7 +81,7 @@ 
                 
 		if ($numRows === false || $numRows === 0) {
 			// store in DB
-			$query = \OCP\DB::prepare('INSERT INTO `*PREFIX*privatedata` (`user`, `app`, `key`, `value`)' . ' VALUES(?, ?, ?, ?)');
+			$query = \OCP\DB::prepare('INSERT INTO `*PREFIX*privatedata` (`user`, `app`, `key`, `value`)'.' VALUES(?, ?, ?, ?)');
 			$query->execute(array($user, $app, $key, $value));
 		}
 
@@ -106,7 +106,7 @@ 
 
 		// delete in DB
 		$query = \OCP\DB::prepare('DELETE FROM `*PREFIX*privatedata`  WHERE `user` = ? AND `app` = ? AND `key` = ? ');
-		$query->execute(array($user, $app, $key ));
+		$query->execute(array($user, $app, $key));
 
 		return new Result(null, 100);
 	}

lib/private/Files/Node/Root.php

Spacing +4 added lines, -4 removed lines

@@ -372,12 +372,12 @@
 			\OC\Files\Filesystem::initMountPoints($userId);
 
 			try {
-				$folder = $this->get('/' . $userId . '/files');
+				$folder = $this->get('/'.$userId.'/files');
 			} catch (NotFoundException $e) {
-				if (!$this->nodeExists('/' . $userId)) {
-					$this->newFolder('/' . $userId);
+				if (!$this->nodeExists('/'.$userId)) {
+					$this->newFolder('/'.$userId);
 				}
-				$folder = $this->newFolder('/' . $userId . '/files');
+				$folder = $this->newFolder('/'.$userId.'/files');
 			}
 
 			$this->userFolderCache->set($userId, $folder);

lib/private/Files/Node/Node.php

Spacing +6 added lines, -6 removed lines

@@ -288,7 +288,7 @@ 
 		$path = str_replace('\\', '/', $path);
 		//add leading slash
 		if ($path[0] !== '/') {
-			$path = '/' . $path;
+			$path = '/'.$path;
 		}
 		//remove duplicate slashes
 		while (strpos($path, '//') !== false) {
@@ -308,7 +308,7 @@ 
 	 */
 	public function isValidPath($path) {
 		if (!$path || $path[0] !== '/') {
-			$path = '/' . $path;
+			$path = '/'.$path;
 		}
 		if (strstr($path, '/../') || strrchr($path, '/') === '/..') {
 			return false;
@@ -389,14 +389,14 @@ 
 			$this->root->emit('\OC\Files', 'preCopy', [$this, $nonExisting]);
 			$this->root->emit('\OC\Files', 'preWrite', [$nonExisting]);
 			if (!$this->view->copy($this->path, $targetPath)) {
-				throw new NotPermittedException('Could not copy ' . $this->path . ' to ' . $targetPath);
+				throw new NotPermittedException('Could not copy '.$this->path.' to '.$targetPath);
 			}
 			$targetNode = $this->root->get($targetPath);
 			$this->root->emit('\OC\Files', 'postCopy', [$this, $targetNode]);
 			$this->root->emit('\OC\Files', 'postWrite', [$targetNode]);
 			return $targetNode;
 		} else {
-			throw new NotPermittedException('No permission to copy to path ' . $targetPath);
+			throw new NotPermittedException('No permission to copy to path '.$targetPath);
 		}
 	}
 
@@ -413,7 +413,7 @@ 
 			$this->root->emit('\OC\Files', 'preRename', [$this, $nonExisting]);
 			$this->root->emit('\OC\Files', 'preWrite', [$nonExisting]);
 			if (!$this->view->rename($this->path, $targetPath)) {
-				throw new NotPermittedException('Could not move ' . $this->path . ' to ' . $targetPath);
+				throw new NotPermittedException('Could not move '.$this->path.' to '.$targetPath);
 			}
 			$targetNode = $this->root->get($targetPath);
 			$this->root->emit('\OC\Files', 'postRename', [$this, $targetNode]);
@@ -421,7 +421,7 @@ 
 			$this->path = $targetPath;
 			return $targetNode;
 		} else {
-			throw new NotPermittedException('No permission to move to path ' . $targetPath);
+			throw new NotPermittedException('No permission to move to path '.$targetPath);
 		}
 	}