nextcloud / server

lib/private/Files/ObjectStore/ObjectStoreStorage.php

Spacing +9 added lines, -9 removed lines

@@ -55,9 +55,9 @@ 
 			throw new \Exception('missing IObjectStore instance');
 		}
 		if (isset($params['storageid'])) {
-			$this->id = 'object::store:' . $params['storageid'];
+			$this->id = 'object::store:'.$params['storageid'];
 		} else {
-			$this->id = 'object::store:' . $this->objectStore->getStorageId();
+			$this->id = 'object::store:'.$this->objectStore->getStorageId();
 		}
 		if (isset($params['objectPrefix'])) {
 			$this->objectPrefix = $params['objectPrefix'];
@@ -191,7 +191,7 @@ 
 				if ($ex->getCode() !== 404) {
 					$this->logger->logException($ex, [
 						'app' => 'objectstore',
-						'message' => 'Could not delete object ' . $this->getURN($stat['fileid']) . ' for ' . $path,
+						'message' => 'Could not delete object '.$this->getURN($stat['fileid']).' for '.$path,
 					]);
 					return false;
 				} else {
@@ -224,7 +224,7 @@ 
 	 */
 	protected function getURN($fileId) {
 		if (is_numeric($fileId)) {
-			return $this->objectPrefix . $fileId;
+			return $this->objectPrefix.$fileId;
 		}
 		return null;
 	}
@@ -272,7 +272,7 @@ 
 					} catch (\Exception $ex) {
 						$this->logger->logException($ex, [
 							'app' => 'objectstore',
-							'message' => 'Count not get object ' . $this->getURN($stat['fileid']) . ' for file ' . $path,
+							'message' => 'Count not get object '.$this->getURN($stat['fileid']).' for file '.$path,
 						]);
 						return false;
 					}
@@ -302,7 +302,7 @@ 
 					file_put_contents($tmpFile, $source);
 				}
 				$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);
 				});
 		}
@@ -311,7 +311,7 @@ 
 
 	public function file_exists($path) {
 		$path = $this->normalizePath($path);
-		return (bool)$this->stat($path);
+		return (bool) $this->stat($path);
 	}
 
 	public function rename($source, $target) {
@@ -369,7 +369,7 @@ 
 				$this->getCache()->remove($path);
 				$this->logger->logException($ex, [
 					'app' => 'objectstore',
-					'message' => 'Could not create object ' . $this->getURN($fileId) . ' for ' . $path,
+					'message' => 'Could not create object '.$this->getURN($fileId).' for '.$path,
 				]);
 				return false;
 			}
@@ -401,7 +401,7 @@ 
 			$this->getCache()->remove($path);
 			$this->logger->logException($ex, [
 				'app' => 'objectstore',
-				'message' => 'Could not create object ' . $this->getURN($fileId) . ' for ' . $path,
+				'message' => 'Could not create object '.$this->getURN($fileId).' for '.$path,
 			]);
 			throw $ex; // make this bubble up
 		}

apps/files_trashbin/lib/Trashbin.php

Spacing +73 added lines, -73 removed lines

@@ -95,7 +95,7 @@ 
 		Filesystem::initMountPoints($uid);
 		if ($uid != User::getUser()) {
 			$info = Filesystem::getFileInfo($filename);
-			$ownerView = new View('/' . $uid . '/files');
+			$ownerView = new View('/'.$uid.'/files');
 			try {
 				$filename = $ownerView->getPath($info['fileid']);
 			} catch (NotFoundException $e) {
@@ -146,7 +146,7 @@ 
 	}
 
 	private static function setUpTrash($user) {
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 		if (!$view->is_dir('files_trashbin')) {
 			$view->mkdir('files_trashbin');
 		}
@@ -181,8 +181,8 @@ 
 
 		$view = new View('/');
 
-		$target = $user . '/files_trashbin/files/' . $targetFilename . '.d' . $timestamp;
-		$source = $owner . '/files_trashbin/files/' . $sourceFilename . '.d' . $timestamp;
+		$target = $user.'/files_trashbin/files/'.$targetFilename.'.d'.$timestamp;
+		$source = $owner.'/files_trashbin/files/'.$sourceFilename.'.d'.$timestamp;
 		self::copy_recursive($source, $target, $view);
 
 
@@ -216,9 +216,9 @@ 
 			$ownerPath = $file_path;
 		}
 
-		$ownerView = new View('/' . $owner);
+		$ownerView = new View('/'.$owner);
 		// file has been deleted in between
-		if (is_null($ownerPath) || $ownerPath === '' || !$ownerView->file_exists('/files/' . $ownerPath)) {
+		if (is_null($ownerPath) || $ownerPath === '' || !$ownerView->file_exists('/files/'.$ownerPath)) {
 			return true;
 		}
 
@@ -235,12 +235,12 @@ 
 		$timestamp = time();
 
 		// disable proxy to prevent recursive calls
-		$trashPath = '/files_trashbin/files/' . $filename . '.d' . $timestamp;
+		$trashPath = '/files_trashbin/files/'.$filename.'.d'.$timestamp;
 
 		/** @var \OC\Files\Storage\Storage $trashStorage */
 		list($trashStorage, $trashInternalPath) = $ownerView->resolvePath($trashPath);
 		/** @var \OC\Files\Storage\Storage $sourceStorage */
-		list($sourceStorage, $sourceInternalPath) = $ownerView->resolvePath('/files/' . $ownerPath);
+		list($sourceStorage, $sourceInternalPath) = $ownerView->resolvePath('/files/'.$ownerPath);
 		try {
 			$moveSuccessful = true;
 			if ($trashStorage->file_exists($trashInternalPath)) {
@@ -252,7 +252,7 @@ 
 			if ($trashStorage->file_exists($trashInternalPath)) {
 				$trashStorage->unlink($trashInternalPath);
 			}
-			\OCP\Util::writeLog('files_trashbin', 'Couldn\'t move ' . $file_path . ' to the trash bin', \OCP\Util::ERROR);
+			\OCP\Util::writeLog('files_trashbin', 'Couldn\'t move '.$file_path.' to the trash bin', \OCP\Util::ERROR);
 		}
 
 		if ($sourceStorage->file_exists($sourceInternalPath)) { // failed to delete the original file, abort
@@ -273,7 +273,7 @@ 
 				\OCP\Util::writeLog('files_trashbin', 'trash bin database couldn\'t be updated', \OCP\Util::ERROR);
 			}
 			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash', array('filePath' => Filesystem::normalizePath($file_path),
-				'trashPath' => Filesystem::normalizePath($filename . '.d' . $timestamp)));
+				'trashPath' => Filesystem::normalizePath($filename.'.d'.$timestamp)));
 
 			self::retainVersions($filename, $owner, $ownerPath, $timestamp);
 
@@ -307,18 +307,18 @@ 
 			$user = User::getUser();
 			$rootView = new View('/');
 
-			if ($rootView->is_dir($owner . '/files_versions/' . $ownerPath)) {
+			if ($rootView->is_dir($owner.'/files_versions/'.$ownerPath)) {
 				if ($owner !== $user) {
-					self::copy_recursive($owner . '/files_versions/' . $ownerPath, $owner . '/files_trashbin/versions/' . basename($ownerPath) . '.d' . $timestamp, $rootView);
+					self::copy_recursive($owner.'/files_versions/'.$ownerPath, $owner.'/files_trashbin/versions/'.basename($ownerPath).'.d'.$timestamp, $rootView);
 				}
-				self::move($rootView, $owner . '/files_versions/' . $ownerPath, $user . '/files_trashbin/versions/' . $filename . '.d' . $timestamp);
+				self::move($rootView, $owner.'/files_versions/'.$ownerPath, $user.'/files_trashbin/versions/'.$filename.'.d'.$timestamp);
 			} else if ($versions = \OCA\Files_Versions\Storage::getVersions($owner, $ownerPath)) {
 
 				foreach ($versions as $v) {
 					if ($owner !== $user) {
-						self::copy($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $owner . '/files_trashbin/versions/' . $v['name'] . '.v' . $v['version'] . '.d' . $timestamp);
+						self::copy($rootView, $owner.'/files_versions'.$v['path'].'.v'.$v['version'], $owner.'/files_trashbin/versions/'.$v['name'].'.v'.$v['version'].'.d'.$timestamp);
 					}
-					self::move($rootView, $owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $user . '/files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp);
+					self::move($rootView, $owner.'/files_versions'.$v['path'].'.v'.$v['version'], $user.'/files_trashbin/versions/'.$filename.'.v'.$v['version'].'.d'.$timestamp);
 				}
 			}
 		}
@@ -380,18 +380,18 @@ 
 	 */
 	public static function restore($file, $filename, $timestamp) {
 		$user = User::getUser();
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 
 		$location = '';
 		if ($timestamp) {
 			$location = self::getLocation($user, $filename, $timestamp);
 			if ($location === false) {
-				\OCP\Util::writeLog('files_trashbin', 'trash bin database inconsistent! ($user: ' . $user . ' $filename: ' . $filename . ', $timestamp: ' . $timestamp . ')', \OCP\Util::ERROR);
+				\OCP\Util::writeLog('files_trashbin', 'trash bin database inconsistent! ($user: '.$user.' $filename: '.$filename.', $timestamp: '.$timestamp.')', \OCP\Util::ERROR);
 			} else {
 				// if location no longer exists, restore file in the root directory
 				if ($location !== '/' &&
-					(!$view->is_dir('files/' . $location) ||
-						!$view->isCreatable('files/' . $location))
+					(!$view->is_dir('files/'.$location) ||
+						!$view->isCreatable('files/'.$location))
 				) {
 					$location = '';
 				}
@@ -401,8 +401,8 @@ 
 		// we need a  extension in case a file/dir with the same name already exists
 		$uniqueFilename = self::getUniqueFilename($location, $filename, $view);
 
-		$source = Filesystem::normalizePath('files_trashbin/files/' . $file);
-		$target = Filesystem::normalizePath('files/' . $location . '/' . $uniqueFilename);
+		$source = Filesystem::normalizePath('files_trashbin/files/'.$file);
+		$target = Filesystem::normalizePath('files/'.$location.'/'.$uniqueFilename);
 		if (!$view->file_exists($source)) {
 			return false;
 		}
@@ -414,10 +414,10 @@ 
 		// handle the restore result
 		if ($restoreResult) {
 			$fakeRoot = $view->getRoot();
-			$view->chroot('/' . $user . '/files');
-			$view->touch('/' . $location . '/' . $uniqueFilename, $mtime);
+			$view->chroot('/'.$user.'/files');
+			$view->touch('/'.$location.'/'.$uniqueFilename, $mtime);
 			$view->chroot($fakeRoot);
-			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', array('filePath' => Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename),
+			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', array('filePath' => Filesystem::normalizePath('/'.$location.'/'.$uniqueFilename),
 				'trashPath' => Filesystem::normalizePath($file)));
 
 			self::restoreVersions($view, $file, $filename, $uniqueFilename, $location, $timestamp);
@@ -451,7 +451,7 @@ 
 			$user = User::getUser();
 			$rootView = new View('/');
 
-			$target = Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename);
+			$target = Filesystem::normalizePath('/'.$location.'/'.$uniqueFilename);
 
 			list($owner, $ownerPath) = self::getUidAndFilename($target);
 
@@ -466,14 +466,14 @@ 
 				$versionedFile = $file;
 			}
 
-			if ($view->is_dir('/files_trashbin/versions/' . $file)) {
-				$rootView->rename(Filesystem::normalizePath($user . '/files_trashbin/versions/' . $file), Filesystem::normalizePath($owner . '/files_versions/' . $ownerPath));
+			if ($view->is_dir('/files_trashbin/versions/'.$file)) {
+				$rootView->rename(Filesystem::normalizePath($user.'/files_trashbin/versions/'.$file), Filesystem::normalizePath($owner.'/files_versions/'.$ownerPath));
 			} else if ($versions = self::getVersionsFromTrash($versionedFile, $timestamp, $user)) {
 				foreach ($versions as $v) {
 					if ($timestamp) {
-						$rootView->rename($user . '/files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp, $owner . '/files_versions/' . $ownerPath . '.v' . $v);
+						$rootView->rename($user.'/files_trashbin/versions/'.$versionedFile.'.v'.$v.'.d'.$timestamp, $owner.'/files_versions/'.$ownerPath.'.v'.$v);
 					} else {
-						$rootView->rename($user . '/files_trashbin/versions/' . $versionedFile . '.v' . $v, $owner . '/files_versions/' . $ownerPath . '.v' . $v);
+						$rootView->rename($user.'/files_trashbin/versions/'.$versionedFile.'.v'.$v, $owner.'/files_versions/'.$ownerPath.'.v'.$v);
 					}
 				}
 			}
@@ -485,12 +485,12 @@ 
 	 */
 	public static function deleteAll() {
 		$user = User::getUser();
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 		$fileInfos = $view->getDirectoryContent('files_trashbin/files');
 
 		// Array to store the relative path in (after the file is deleted, the view won't be able to relativise the path anymore)
 		$filePaths = array();
-		foreach($fileInfos as $fileInfo){
+		foreach ($fileInfos as $fileInfo) {
 			$filePaths[] = $view->getRelativePath($fileInfo->getPath());
 		}
 		unset($fileInfos); // save memory
@@ -499,7 +499,7 @@ 
 		\OC_Hook::emit('\OCP\Trashbin', 'preDeleteAll', array('paths' => $filePaths));
 
 		// Single-File Hooks
-		foreach($filePaths as $path){
+		foreach ($filePaths as $path) {
 			self::emitTrashbinPreDelete($path);
 		}
 
@@ -512,7 +512,7 @@ 
 		\OC_Hook::emit('\OCP\Trashbin', 'deleteAll', array('paths' => $filePaths));
 
 		// Single-File Hooks
-		foreach($filePaths as $path){
+		foreach ($filePaths as $path) {
 			self::emitTrashbinPostDelete($path);
 		}
 
@@ -526,7 +526,7 @@ 
 	 * wrapper function to emit the 'preDelete' hook of \OCP\Trashbin before a file is deleted
 	 * @param string $path
 	 */
-	protected static function emitTrashbinPreDelete($path){
+	protected static function emitTrashbinPreDelete($path) {
 		\OC_Hook::emit('\OCP\Trashbin', 'preDelete', array('path' => $path));
 	}
 
@@ -534,7 +534,7 @@ 
 	 * wrapper function to emit the 'delete' hook of \OCP\Trashbin after a file has been deleted
 	 * @param string $path
 	 */
-	protected static function emitTrashbinPostDelete($path){
+	protected static function emitTrashbinPostDelete($path) {
 		\OC_Hook::emit('\OCP\Trashbin', 'delete', array('path' => $path));
 	}
 
@@ -548,27 +548,27 @@ 
 	 * @return int size of deleted files
 	 */
 	public static function delete($filename, $user, $timestamp = null) {
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 		$size = 0;
 
 		if ($timestamp) {
 			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=? AND `id`=? AND `timestamp`=?');
 			$query->execute(array($user, $filename, $timestamp));
-			$file = $filename . '.d' . $timestamp;
+			$file = $filename.'.d'.$timestamp;
 		} else {
 			$file = $filename;
 		}
 
 		$size += self::deleteVersions($view, $file, $filename, $timestamp, $user);
 
-		if ($view->is_dir('/files_trashbin/files/' . $file)) {
-			$size += self::calculateSize(new View('/' . $user . '/files_trashbin/files/' . $file));
+		if ($view->is_dir('/files_trashbin/files/'.$file)) {
+			$size += self::calculateSize(new View('/'.$user.'/files_trashbin/files/'.$file));
 		} else {
-			$size += $view->filesize('/files_trashbin/files/' . $file);
+			$size += $view->filesize('/files_trashbin/files/'.$file);
 		}
-		self::emitTrashbinPreDelete('/files_trashbin/files/' . $file);
-		$view->unlink('/files_trashbin/files/' . $file);
-		self::emitTrashbinPostDelete('/files_trashbin/files/' . $file);
+		self::emitTrashbinPreDelete('/files_trashbin/files/'.$file);
+		$view->unlink('/files_trashbin/files/'.$file);
+		self::emitTrashbinPostDelete('/files_trashbin/files/'.$file);
 
 		return $size;
 	}
@@ -584,17 +584,17 @@ 
 	private static function deleteVersions(View $view, $file, $filename, $timestamp, $user) {
 		$size = 0;
 		if (\OCP\App::isEnabled('files_versions')) {
-			if ($view->is_dir('files_trashbin/versions/' . $file)) {
-				$size += self::calculateSize(new View('/' . $user . '/files_trashbin/versions/' . $file));
-				$view->unlink('files_trashbin/versions/' . $file);
+			if ($view->is_dir('files_trashbin/versions/'.$file)) {
+				$size += self::calculateSize(new View('/'.$user.'/files_trashbin/versions/'.$file));
+				$view->unlink('files_trashbin/versions/'.$file);
 			} else if ($versions = self::getVersionsFromTrash($filename, $timestamp, $user)) {
 				foreach ($versions as $v) {
 					if ($timestamp) {
-						$size += $view->filesize('/files_trashbin/versions/' . $filename . '.v' . $v . '.d' . $timestamp);
-						$view->unlink('/files_trashbin/versions/' . $filename . '.v' . $v . '.d' . $timestamp);
+						$size += $view->filesize('/files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp);
+						$view->unlink('/files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp);
 					} else {
-						$size += $view->filesize('/files_trashbin/versions/' . $filename . '.v' . $v);
-						$view->unlink('/files_trashbin/versions/' . $filename . '.v' . $v);
+						$size += $view->filesize('/files_trashbin/versions/'.$filename.'.v'.$v);
+						$view->unlink('/files_trashbin/versions/'.$filename.'.v'.$v);
 					}
 				}
 			}
@@ -611,15 +611,15 @@ 
 	 */
 	public static function file_exists($filename, $timestamp = null) {
 		$user = User::getUser();
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 
 		if ($timestamp) {
-			$filename = $filename . '.d' . $timestamp;
+			$filename = $filename.'.d'.$timestamp;
 		} else {
 			$filename = $filename;
 		}
 
-		$target = Filesystem::normalizePath('files_trashbin/files/' . $filename);
+		$target = Filesystem::normalizePath('files_trashbin/files/'.$filename);
 		return $view->file_exists($target);
 	}
 
@@ -644,7 +644,7 @@ 
 	private static function calculateFreeSpace($trashbinSize, $user) {
 		$softQuota = true;
 		$userObject = \OC::$server->getUserManager()->get($user);
-		if(is_null($userObject)) {
+		if (is_null($userObject)) {
 			return 0;
 		}
 		$quota = $userObject->getQuota();
@@ -663,7 +663,7 @@ 
 		// subtract size of files and current trash bin size from quota
 		if ($softQuota) {
 			$userFolder = \OC::$server->getUserFolder($user);
-			if(is_null($userFolder)) {
+			if (is_null($userFolder)) {
 				return 0;
 			}
 			$free = $quota - $userFolder->getSize(); // remaining free space for user
@@ -745,7 +745,7 @@ 
 			foreach ($files as $file) {
 				if ($availableSpace < 0 && $expiration->isExpired($file['mtime'], true)) {
 					$tmp = self::delete($file['name'], $user, $file['mtime']);
-					\OCP\Util::writeLog('files_trashbin', 'remove "' . $file['name'] . '" (' . $tmp . 'B) to meet the limit of trash bin size (50% of available quota)', \OCP\Util::INFO);
+					\OCP\Util::writeLog('files_trashbin', 'remove "'.$file['name'].'" ('.$tmp.'B) to meet the limit of trash bin size (50% of available quota)', \OCP\Util::INFO);
 					$availableSpace += $tmp;
 					$size += $tmp;
 				} else {
@@ -775,7 +775,7 @@ 
 				$count++;
 				$size += self::delete($filename, $user, $timestamp);
 				\OC::$server->getLogger()->info(
-					'Remove "' . $filename . '" from trashbin because it exceeds max retention obligation term.',
+					'Remove "'.$filename.'" from trashbin because it exceeds max retention obligation term.',
 					['app' => 'files_trashbin']
 				);
 			} else {
@@ -801,16 +801,16 @@ 
 			$view->mkdir($destination);
 			$view->touch($destination, $view->filemtime($source));
 			foreach ($view->getDirectoryContent($source) as $i) {
-				$pathDir = $source . '/' . $i['name'];
+				$pathDir = $source.'/'.$i['name'];
 				if ($view->is_dir($pathDir)) {
-					$size += self::copy_recursive($pathDir, $destination . '/' . $i['name'], $view);
+					$size += self::copy_recursive($pathDir, $destination.'/'.$i['name'], $view);
 				} else {
 					$size += $view->filesize($pathDir);
-					$result = $view->copy($pathDir, $destination . '/' . $i['name']);
+					$result = $view->copy($pathDir, $destination.'/'.$i['name']);
 					if (!$result) {
 						throw new \OCA\Files_Trashbin\Exceptions\CopyRecursiveException();
 					}
-					$view->touch($destination . '/' . $i['name'], $view->filemtime($pathDir));
+					$view->touch($destination.'/'.$i['name'], $view->filemtime($pathDir));
 				}
 			}
 		} else {
@@ -832,7 +832,7 @@ 
 	 * @return array
 	 */
 	private static function getVersionsFromTrash($filename, $timestamp, $user) {
-		$view = new View('/' . $user . '/files_trashbin/versions');
+		$view = new View('/'.$user.'/files_trashbin/versions');
 		$versions = array();
 
 		//force rescan of versions, local storage may not have updated the cache
@@ -845,10 +845,10 @@ 
 
 		if ($timestamp) {
 			// fetch for old versions
-			$matches = $view->searchRaw($filename . '.v%.d' . $timestamp);
+			$matches = $view->searchRaw($filename.'.v%.d'.$timestamp);
 			$offset = -strlen($timestamp) - 2;
 		} else {
-			$matches = $view->searchRaw($filename . '.v%');
+			$matches = $view->searchRaw($filename.'.v%');
 		}
 
 		if (is_array($matches)) {
@@ -878,18 +878,18 @@ 
 		$name = pathinfo($filename, PATHINFO_FILENAME);
 		$l = \OC::$server->getL10N('files_trashbin');
 
-		$location = '/' . trim($location, '/');
+		$location = '/'.trim($location, '/');
 
 		// if extension is not empty we set a dot in front of it
 		if ($ext !== '') {
-			$ext = '.' . $ext;
+			$ext = '.'.$ext;
 		}
 
-		if ($view->file_exists('files' . $location . '/' . $filename)) {
+		if ($view->file_exists('files'.$location.'/'.$filename)) {
 			$i = 2;
-			$uniqueName = $name . " (" . $l->t("restored") . ")" . $ext;
-			while ($view->file_exists('files' . $location . '/' . $uniqueName)) {
-				$uniqueName = $name . " (" . $l->t("restored") . " " . $i . ")" . $ext;
+			$uniqueName = $name." (".$l->t("restored").")".$ext;
+			while ($view->file_exists('files'.$location.'/'.$uniqueName)) {
+				$uniqueName = $name." (".$l->t("restored")." ".$i.")".$ext;
 				$i++;
 			}
 
@@ -906,7 +906,7 @@ 
 	 * @return integer size of the folder
 	 */
 	private static function calculateSize($view) {
-		$root = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . $view->getAbsolutePath('');
+		$root = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').$view->getAbsolutePath('');
 		if (!file_exists($root)) {
 			return 0;
 		}
@@ -937,7 +937,7 @@ 
 	 * @return integer trash bin size
 	 */
 	private static function getTrashbinSize($user) {
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 		$fileInfo = $view->getFileInfo('/files_trashbin');
 		return isset($fileInfo['size']) ? $fileInfo['size'] : 0;
 	}
@@ -966,7 +966,7 @@ 
 	 */
 	public static function isEmpty($user) {
 
-		$view = new View('/' . $user . '/files_trashbin');
+		$view = new View('/'.$user.'/files_trashbin');
 		if ($view->is_dir('/files') && $dh = $view->opendir('/files')) {
 			while ($file = readdir($dh)) {
 				if (!Filesystem::isIgnoredDir($file)) {