nextcloud / server

lib/private/OCS/CoreCapabilities.php

Indentation +21 added lines, -21 removed lines

@@ -33,27 +33,27 @@
  */
 class CoreCapabilities implements ICapability {
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * Return this classes capabilities
-	 *
-	 * @return array
-	 */
-	public function getCapabilities() {
-		return [
-			'core' => [
-				'pollinterval' => $this->config->getSystemValue('pollinterval', 60),
-				'webdav-root' => $this->config->getSystemValue('webdav-root', 'remote.php/webdav'),
-			]
-		];
-	}
+    /**
+     * Return this classes capabilities
+     *
+     * @return array
+     */
+    public function getCapabilities() {
+        return [
+            'core' => [
+                'pollinterval' => $this->config->getSystemValue('pollinterval', 60),
+                'webdav-root' => $this->config->getSystemValue('webdav-root', 'remote.php/webdav'),
+            ]
+        ];
+    }
 }

lib/private/Files/Node/NonExistingFolder.php

Indentation +143 added lines, -143 removed lines

@@ -27,147 +27,147 @@
 use OCP\Files\NotFoundException;
 
 class NonExistingFolder extends Folder {
-	/**
-	 * @param string $newPath
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function rename($newPath) {
-		throw new NotFoundException();
-	}
-
-	public function delete() {
-		throw new NotFoundException();
-	}
-
-	public function copy($newPath) {
-		throw new NotFoundException();
-	}
-
-	public function touch($mtime = null) {
-		throw new NotFoundException();
-	}
-
-	public function getId() {
-		if ($this->fileInfo) {
-			return parent::getId();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function stat() {
-		throw new NotFoundException();
-	}
-
-	public function getMTime() {
-		if ($this->fileInfo) {
-			return parent::getMTime();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function getSize() {
-		if ($this->fileInfo) {
-			return parent::getSize();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function getEtag() {
-		if ($this->fileInfo) {
-			return parent::getEtag();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function getPermissions() {
-		if ($this->fileInfo) {
-			return parent::getPermissions();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isReadable() {
-		if ($this->fileInfo) {
-			return parent::isReadable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isUpdateable() {
-		if ($this->fileInfo) {
-			return parent::isUpdateable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isDeletable() {
-		if ($this->fileInfo) {
-			return parent::isDeletable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isShareable() {
-		if ($this->fileInfo) {
-			return parent::isShareable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function get($path) {
-		throw new NotFoundException();
-	}
-
-	public function getDirectoryListing() {
-		throw new NotFoundException();
-	}
-
-	public function nodeExists($path) {
-		return false;
-	}
-
-	public function newFolder($path) {
-		throw new NotFoundException();
-	}
-
-	public function newFile($path) {
-		throw new NotFoundException();
-	}
-
-	public function search($pattern) {
-		throw new NotFoundException();
-	}
-
-	public function searchByMime($mime) {
-		throw new NotFoundException();
-	}
-
-	public function searchByTag($tag, $userId) {
-		throw new NotFoundException();
-	}
-
-	public function getById($id) {
-		throw new NotFoundException();
-	}
-
-	public function getFreeSpace() {
-		throw new NotFoundException();
-	}
-
-	public function isCreatable() {
-		if ($this->fileInfo) {
-			return parent::isCreatable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
+    /**
+     * @param string $newPath
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function rename($newPath) {
+        throw new NotFoundException();
+    }
+
+    public function delete() {
+        throw new NotFoundException();
+    }
+
+    public function copy($newPath) {
+        throw new NotFoundException();
+    }
+
+    public function touch($mtime = null) {
+        throw new NotFoundException();
+    }
+
+    public function getId() {
+        if ($this->fileInfo) {
+            return parent::getId();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function stat() {
+        throw new NotFoundException();
+    }
+
+    public function getMTime() {
+        if ($this->fileInfo) {
+            return parent::getMTime();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function getSize() {
+        if ($this->fileInfo) {
+            return parent::getSize();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function getEtag() {
+        if ($this->fileInfo) {
+            return parent::getEtag();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function getPermissions() {
+        if ($this->fileInfo) {
+            return parent::getPermissions();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isReadable() {
+        if ($this->fileInfo) {
+            return parent::isReadable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isUpdateable() {
+        if ($this->fileInfo) {
+            return parent::isUpdateable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isDeletable() {
+        if ($this->fileInfo) {
+            return parent::isDeletable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isShareable() {
+        if ($this->fileInfo) {
+            return parent::isShareable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function get($path) {
+        throw new NotFoundException();
+    }
+
+    public function getDirectoryListing() {
+        throw new NotFoundException();
+    }
+
+    public function nodeExists($path) {
+        return false;
+    }
+
+    public function newFolder($path) {
+        throw new NotFoundException();
+    }
+
+    public function newFile($path) {
+        throw new NotFoundException();
+    }
+
+    public function search($pattern) {
+        throw new NotFoundException();
+    }
+
+    public function searchByMime($mime) {
+        throw new NotFoundException();
+    }
+
+    public function searchByTag($tag, $userId) {
+        throw new NotFoundException();
+    }
+
+    public function getById($id) {
+        throw new NotFoundException();
+    }
+
+    public function getFreeSpace() {
+        throw new NotFoundException();
+    }
+
+    public function isCreatable() {
+        if ($this->fileInfo) {
+            return parent::isCreatable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
 }

lib/private/Files/Node/HookConnector.php

Indentation +134 added lines, -134 removed lines

@@ -28,138 +28,138 @@
 use OCP\Util;
 
 class HookConnector {
-	/**
-	 * @var Root
-	 */
-	private $root;
-
-	/**
-	 * @var View
-	 */
-	private $view;
-
-	/**
-	 * @var FileInfo[]
-	 */
-	private $deleteMetaCache = [];
-
-	/**
-	 * HookConnector constructor.
-	 *
-	 * @param Root $root
-	 * @param View $view
-	 */
-	public function __construct(Root $root, View $view) {
-		$this->root = $root;
-		$this->view = $view;
-	}
-
-	public function viewToNode() {
-		Util::connectHook('OC_Filesystem', 'write', $this, 'write');
-		Util::connectHook('OC_Filesystem', 'post_write', $this, 'postWrite');
-
-		Util::connectHook('OC_Filesystem', 'create', $this, 'create');
-		Util::connectHook('OC_Filesystem', 'post_create', $this, 'postCreate');
-
-		Util::connectHook('OC_Filesystem', 'delete', $this, 'delete');
-		Util::connectHook('OC_Filesystem', 'post_delete', $this, 'postDelete');
-
-		Util::connectHook('OC_Filesystem', 'rename', $this, 'rename');
-		Util::connectHook('OC_Filesystem', 'post_rename', $this, 'postRename');
-
-		Util::connectHook('OC_Filesystem', 'copy', $this, 'copy');
-		Util::connectHook('OC_Filesystem', 'post_copy', $this, 'postCopy');
-
-		Util::connectHook('OC_Filesystem', 'touch', $this, 'touch');
-		Util::connectHook('OC_Filesystem', 'post_touch', $this, 'postTouch');
-	}
-
-	public function write($arguments) {
-		$node = $this->getNodeForPath($arguments['path']);
-		$this->root->emit('\OC\Files', 'preWrite', [$node]);
-	}
-
-	public function postWrite($arguments) {
-		$node = $this->getNodeForPath($arguments['path']);
-		$this->root->emit('\OC\Files', 'postWrite', [$node]);
-	}
-
-	public function create($arguments) {
-		$node = $this->getNodeForPath($arguments['path']);
-		$this->root->emit('\OC\Files', 'preCreate', [$node]);
-	}
-
-	public function postCreate($arguments) {
-		$node = $this->getNodeForPath($arguments['path']);
-		$this->root->emit('\OC\Files', 'postCreate', [$node]);
-	}
-
-	public function delete($arguments) {
-		$node = $this->getNodeForPath($arguments['path']);
-		$this->deleteMetaCache[$node->getPath()] = $node->getFileInfo();
-		$this->root->emit('\OC\Files', 'preDelete', [$node]);
-	}
-
-	public function postDelete($arguments) {
-		$node = $this->getNodeForPath($arguments['path']);
-		unset($this->deleteMetaCache[$node->getPath()]);
-		$this->root->emit('\OC\Files', 'postDelete', [$node]);
-	}
-
-	public function touch($arguments) {
-		$node = $this->getNodeForPath($arguments['path']);
-		$this->root->emit('\OC\Files', 'preTouch', [$node]);
-	}
-
-	public function postTouch($arguments) {
-		$node = $this->getNodeForPath($arguments['path']);
-		$this->root->emit('\OC\Files', 'postTouch', [$node]);
-	}
-
-	public function rename($arguments) {
-		$source = $this->getNodeForPath($arguments['oldpath']);
-		$target = $this->getNodeForPath($arguments['newpath']);
-		$this->root->emit('\OC\Files', 'preRename', [$source, $target]);
-	}
-
-	public function postRename($arguments) {
-		$source = $this->getNodeForPath($arguments['oldpath']);
-		$target = $this->getNodeForPath($arguments['newpath']);
-		$this->root->emit('\OC\Files', 'postRename', [$source, $target]);
-	}
-
-	public function copy($arguments) {
-		$source = $this->getNodeForPath($arguments['oldpath']);
-		$target = $this->getNodeForPath($arguments['newpath']);
-		$this->root->emit('\OC\Files', 'preCopy', [$source, $target]);
-	}
-
-	public function postCopy($arguments) {
-		$source = $this->getNodeForPath($arguments['oldpath']);
-		$target = $this->getNodeForPath($arguments['newpath']);
-		$this->root->emit('\OC\Files', 'postCopy', [$source, $target]);
-	}
-
-	private function getNodeForPath($path) {
-		$info = Filesystem::getView()->getFileInfo($path);
-		if (!$info) {
-
-			$fullPath = Filesystem::getView()->getAbsolutePath($path);
-			if (isset($this->deleteMetaCache[$fullPath])) {
-				$info = $this->deleteMetaCache[$fullPath];
-			} else {
-				$info = null;
-			}
-			if (Filesystem::is_dir($path)) {
-				return new NonExistingFolder($this->root, $this->view, $fullPath, $info);
-			} else {
-				return new NonExistingFile($this->root, $this->view, $fullPath, $info);
-			}
-		}
-		if ($info->getType() === FileInfo::TYPE_FILE) {
-			return new File($this->root, $this->view, $info->getPath(), $info);
-		} else {
-			return new Folder($this->root, $this->view, $info->getPath(), $info);
-		}
-	}
+    /**
+     * @var Root
+     */
+    private $root;
+
+    /**
+     * @var View
+     */
+    private $view;
+
+    /**
+     * @var FileInfo[]
+     */
+    private $deleteMetaCache = [];
+
+    /**
+     * HookConnector constructor.
+     *
+     * @param Root $root
+     * @param View $view
+     */
+    public function __construct(Root $root, View $view) {
+        $this->root = $root;
+        $this->view = $view;
+    }
+
+    public function viewToNode() {
+        Util::connectHook('OC_Filesystem', 'write', $this, 'write');
+        Util::connectHook('OC_Filesystem', 'post_write', $this, 'postWrite');
+
+        Util::connectHook('OC_Filesystem', 'create', $this, 'create');
+        Util::connectHook('OC_Filesystem', 'post_create', $this, 'postCreate');
+
+        Util::connectHook('OC_Filesystem', 'delete', $this, 'delete');
+        Util::connectHook('OC_Filesystem', 'post_delete', $this, 'postDelete');
+
+        Util::connectHook('OC_Filesystem', 'rename', $this, 'rename');
+        Util::connectHook('OC_Filesystem', 'post_rename', $this, 'postRename');
+
+        Util::connectHook('OC_Filesystem', 'copy', $this, 'copy');
+        Util::connectHook('OC_Filesystem', 'post_copy', $this, 'postCopy');
+
+        Util::connectHook('OC_Filesystem', 'touch', $this, 'touch');
+        Util::connectHook('OC_Filesystem', 'post_touch', $this, 'postTouch');
+    }
+
+    public function write($arguments) {
+        $node = $this->getNodeForPath($arguments['path']);
+        $this->root->emit('\OC\Files', 'preWrite', [$node]);
+    }
+
+    public function postWrite($arguments) {
+        $node = $this->getNodeForPath($arguments['path']);
+        $this->root->emit('\OC\Files', 'postWrite', [$node]);
+    }
+
+    public function create($arguments) {
+        $node = $this->getNodeForPath($arguments['path']);
+        $this->root->emit('\OC\Files', 'preCreate', [$node]);
+    }
+
+    public function postCreate($arguments) {
+        $node = $this->getNodeForPath($arguments['path']);
+        $this->root->emit('\OC\Files', 'postCreate', [$node]);
+    }
+
+    public function delete($arguments) {
+        $node = $this->getNodeForPath($arguments['path']);
+        $this->deleteMetaCache[$node->getPath()] = $node->getFileInfo();
+        $this->root->emit('\OC\Files', 'preDelete', [$node]);
+    }
+
+    public function postDelete($arguments) {
+        $node = $this->getNodeForPath($arguments['path']);
+        unset($this->deleteMetaCache[$node->getPath()]);
+        $this->root->emit('\OC\Files', 'postDelete', [$node]);
+    }
+
+    public function touch($arguments) {
+        $node = $this->getNodeForPath($arguments['path']);
+        $this->root->emit('\OC\Files', 'preTouch', [$node]);
+    }
+
+    public function postTouch($arguments) {
+        $node = $this->getNodeForPath($arguments['path']);
+        $this->root->emit('\OC\Files', 'postTouch', [$node]);
+    }
+
+    public function rename($arguments) {
+        $source = $this->getNodeForPath($arguments['oldpath']);
+        $target = $this->getNodeForPath($arguments['newpath']);
+        $this->root->emit('\OC\Files', 'preRename', [$source, $target]);
+    }
+
+    public function postRename($arguments) {
+        $source = $this->getNodeForPath($arguments['oldpath']);
+        $target = $this->getNodeForPath($arguments['newpath']);
+        $this->root->emit('\OC\Files', 'postRename', [$source, $target]);
+    }
+
+    public function copy($arguments) {
+        $source = $this->getNodeForPath($arguments['oldpath']);
+        $target = $this->getNodeForPath($arguments['newpath']);
+        $this->root->emit('\OC\Files', 'preCopy', [$source, $target]);
+    }
+
+    public function postCopy($arguments) {
+        $source = $this->getNodeForPath($arguments['oldpath']);
+        $target = $this->getNodeForPath($arguments['newpath']);
+        $this->root->emit('\OC\Files', 'postCopy', [$source, $target]);
+    }
+
+    private function getNodeForPath($path) {
+        $info = Filesystem::getView()->getFileInfo($path);
+        if (!$info) {
+
+            $fullPath = Filesystem::getView()->getAbsolutePath($path);
+            if (isset($this->deleteMetaCache[$fullPath])) {
+                $info = $this->deleteMetaCache[$fullPath];
+            } else {
+                $info = null;
+            }
+            if (Filesystem::is_dir($path)) {
+                return new NonExistingFolder($this->root, $this->view, $fullPath, $info);
+            } else {
+                return new NonExistingFile($this->root, $this->view, $fullPath, $info);
+            }
+        }
+        if ($info->getType() === FileInfo::TYPE_FILE) {
+            return new File($this->root, $this->view, $info->getPath(), $info);
+        } else {
+            return new Folder($this->root, $this->view, $info->getPath(), $info);
+        }
+    }
 }

lib/private/Files/Node/NonExistingFile.php

Indentation +115 added lines, -115 removed lines

@@ -26,119 +26,119 @@
 use OCP\Files\NotFoundException;
 
 class NonExistingFile extends File {
-	/**
-	 * @param string $newPath
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function rename($newPath) {
-		throw new NotFoundException();
-	}
-
-	public function delete() {
-		throw new NotFoundException();
-	}
-
-	public function copy($newPath) {
-		throw new NotFoundException();
-	}
-
-	public function touch($mtime = null) {
-		throw new NotFoundException();
-	}
-
-	public function getId() {
-		if ($this->fileInfo) {
-			return parent::getId();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function stat() {
-		throw new NotFoundException();
-	}
-
-	public function getMTime() {
-		if ($this->fileInfo) {
-			return parent::getMTime();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function getSize() {
-		if ($this->fileInfo) {
-			return parent::getSize();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function getEtag() {
-		if ($this->fileInfo) {
-			return parent::getEtag();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function getPermissions() {
-		if ($this->fileInfo) {
-			return parent::getPermissions();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isReadable() {
-		if ($this->fileInfo) {
-			return parent::isReadable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isUpdateable() {
-		if ($this->fileInfo) {
-			return parent::isUpdateable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isDeletable() {
-		if ($this->fileInfo) {
-			return parent::isDeletable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isShareable() {
-		if ($this->fileInfo) {
-			return parent::isShareable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function getContent() {
-		throw new NotFoundException();
-	}
-
-	public function putContent($data) {
-		throw new NotFoundException();
-	}
-
-	public function getMimeType() {
-		if ($this->fileInfo) {
-			return parent::getMimeType();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function fopen($mode) {
-		throw new NotFoundException();
-	}
+    /**
+     * @param string $newPath
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function rename($newPath) {
+        throw new NotFoundException();
+    }
+
+    public function delete() {
+        throw new NotFoundException();
+    }
+
+    public function copy($newPath) {
+        throw new NotFoundException();
+    }
+
+    public function touch($mtime = null) {
+        throw new NotFoundException();
+    }
+
+    public function getId() {
+        if ($this->fileInfo) {
+            return parent::getId();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function stat() {
+        throw new NotFoundException();
+    }
+
+    public function getMTime() {
+        if ($this->fileInfo) {
+            return parent::getMTime();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function getSize() {
+        if ($this->fileInfo) {
+            return parent::getSize();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function getEtag() {
+        if ($this->fileInfo) {
+            return parent::getEtag();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function getPermissions() {
+        if ($this->fileInfo) {
+            return parent::getPermissions();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isReadable() {
+        if ($this->fileInfo) {
+            return parent::isReadable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isUpdateable() {
+        if ($this->fileInfo) {
+            return parent::isUpdateable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isDeletable() {
+        if ($this->fileInfo) {
+            return parent::isDeletable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isShareable() {
+        if ($this->fileInfo) {
+            return parent::isShareable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function getContent() {
+        throw new NotFoundException();
+    }
+
+    public function putContent($data) {
+        throw new NotFoundException();
+    }
+
+    public function getMimeType() {
+        if ($this->fileInfo) {
+            return parent::getMimeType();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function fopen($mode) {
+        throw new NotFoundException();
+    }
 }

lib/private/Files/Mount/CacheMountProvider.php

Indentation +33 added lines, -33 removed lines

@@ -31,40 +31,40 @@
  * Mount provider for custom cache storages
  */
 class CacheMountProvider implements IMountProvider {
-	/**
-	 * @var IConfig
-	 */
-	private $config;
+    /**
+     * @var IConfig
+     */
+    private $config;
 
-	/**
-	 * ObjectStoreHomeMountProvider constructor.
-	 *
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * ObjectStoreHomeMountProvider constructor.
+     *
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * Get the cache mount for a user
-	 *
-	 * @param IUser $user
-	 * @param IStorageFactory $loader
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 */
-	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
-		$cacheBaseDir = $this->config->getSystemValue('cache_path', '');
-		if ($cacheBaseDir !== '') {
-			$cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID();
-			if (!file_exists($cacheDir)) {
-				mkdir($cacheDir, 0770, true);
-			}
+    /**
+     * Get the cache mount for a user
+     *
+     * @param IUser $user
+     * @param IStorageFactory $loader
+     * @return \OCP\Files\Mount\IMountPoint[]
+     */
+    public function getMountsForUser(IUser $user, IStorageFactory $loader) {
+        $cacheBaseDir = $this->config->getSystemValue('cache_path', '');
+        if ($cacheBaseDir !== '') {
+            $cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID();
+            if (!file_exists($cacheDir)) {
+                mkdir($cacheDir, 0770, true);
+            }
 
-			return [
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir, $loader])
-			];
-		} else {
-			return [];
-		}
-	}
+            return [
+                new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir, $loader])
+            ];
+        } else {
+            return [];
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -55,13 +55,13 @@
 	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
 		$cacheBaseDir = $this->config->getSystemValue('cache_path', '');
 		if ($cacheBaseDir !== '') {
-			$cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID();
+			$cacheDir = rtrim($cacheBaseDir, '/').'/'.$user->getUID();
 			if (!file_exists($cacheDir)) {
 				mkdir($cacheDir, 0770, true);
 			}
 
 			return [
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir, $loader])
+				new MountPoint('\OC\Files\Storage\Local', '/'.$user->getUID().'/cache', ['datadir' => $cacheDir, $loader])
 			];
 		} else {
 			return [];

lib/private/Files/Mount/ObjectHomeMountProvider.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 			return null;
 		}
 
-		return new MountPoint('\OC\Files\ObjectStore\HomeObjectStoreStorage', '/' . $user->getUID(), $config['arguments'], $loader);
+		return new MountPoint('\OC\Files\ObjectStore\HomeObjectStoreStorage', '/'.$user->getUID(), $config['arguments'], $loader);
 	}
 
 	/**

Indentation +98 added lines, -98 removed lines

@@ -32,105 +32,105 @@
  * Mount provider for object store home storages
  */
 class ObjectHomeMountProvider implements IHomeMountProvider {
-	/**
-	 * @var IConfig
-	 */
-	private $config;
-
-	/**
-	 * ObjectStoreHomeMountProvider constructor.
-	 *
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
-
-	/**
-	 * Get the cache mount for a user
-	 *
-	 * @param IUser $user
-	 * @param IStorageFactory $loader
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 */
-	public function getHomeMountForUser(IUser $user, IStorageFactory $loader) {
-
-		$config = $this->getMultiBucketObjectStoreConfig($user);
-		if ($config === null) {
-			$config = $this->getSingleBucketObjectStoreConfig($user);
-		}
-
-		if ($config === null) {
-			return null;
-		}
-
-		return new MountPoint('\OC\Files\ObjectStore\HomeObjectStoreStorage', '/' . $user->getUID(), $config['arguments'], $loader);
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return array|null
-	 */
-	private function getSingleBucketObjectStoreConfig(IUser $user) {
-		$config = $this->config->getSystemValue('objectstore');
-		if (!is_array($config)) {
-			return null;
-		}
-
-		// sanity checks
-		if (empty($config['class'])) {
-			\OCP\Util::writeLog('files', 'No class given for objectstore', \OCP\Util::ERROR);
-		}
-		if (!isset($config['arguments'])) {
-			$config['arguments'] = [];
-		}
-		$config['arguments']['user'] = $user;
-		// instantiate object store implementation
-		$config['arguments']['objectstore'] = new $config['class']($config['arguments']);
-
-		return $config;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return array|null
-	 */
-	private function getMultiBucketObjectStoreConfig(IUser $user) {
-		$config = $this->config->getSystemValue('objectstore_multibucket');
-		if (!is_array($config)) {
-			return null;
-		}
-
-		// sanity checks
-		if (empty($config['class'])) {
-			\OCP\Util::writeLog('files', 'No class given for objectstore', \OCP\Util::ERROR);
-		}
-		if (!isset($config['arguments'])) {
-			$config['arguments'] = [];
-		}
-		$config['arguments']['user'] = $user;
-
-		$bucket = $this->config->getUserValue($user->getUID(), 'homeobjectstore', 'bucket', null);
-
-		if ($bucket === null) {
-			/*
+    /**
+     * @var IConfig
+     */
+    private $config;
+
+    /**
+     * ObjectStoreHomeMountProvider constructor.
+     *
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
+
+    /**
+     * Get the cache mount for a user
+     *
+     * @param IUser $user
+     * @param IStorageFactory $loader
+     * @return \OCP\Files\Mount\IMountPoint[]
+     */
+    public function getHomeMountForUser(IUser $user, IStorageFactory $loader) {
+
+        $config = $this->getMultiBucketObjectStoreConfig($user);
+        if ($config === null) {
+            $config = $this->getSingleBucketObjectStoreConfig($user);
+        }
+
+        if ($config === null) {
+            return null;
+        }
+
+        return new MountPoint('\OC\Files\ObjectStore\HomeObjectStoreStorage', '/' . $user->getUID(), $config['arguments'], $loader);
+    }
+
+    /**
+     * @param IUser $user
+     * @return array|null
+     */
+    private function getSingleBucketObjectStoreConfig(IUser $user) {
+        $config = $this->config->getSystemValue('objectstore');
+        if (!is_array($config)) {
+            return null;
+        }
+
+        // sanity checks
+        if (empty($config['class'])) {
+            \OCP\Util::writeLog('files', 'No class given for objectstore', \OCP\Util::ERROR);
+        }
+        if (!isset($config['arguments'])) {
+            $config['arguments'] = [];
+        }
+        $config['arguments']['user'] = $user;
+        // instantiate object store implementation
+        $config['arguments']['objectstore'] = new $config['class']($config['arguments']);
+
+        return $config;
+    }
+
+    /**
+     * @param IUser $user
+     * @return array|null
+     */
+    private function getMultiBucketObjectStoreConfig(IUser $user) {
+        $config = $this->config->getSystemValue('objectstore_multibucket');
+        if (!is_array($config)) {
+            return null;
+        }
+
+        // sanity checks
+        if (empty($config['class'])) {
+            \OCP\Util::writeLog('files', 'No class given for objectstore', \OCP\Util::ERROR);
+        }
+        if (!isset($config['arguments'])) {
+            $config['arguments'] = [];
+        }
+        $config['arguments']['user'] = $user;
+
+        $bucket = $this->config->getUserValue($user->getUID(), 'homeobjectstore', 'bucket', null);
+
+        if ($bucket === null) {
+            /*
 			 * Use any provided bucket argument as prefix
 			 * and add the mapping from username => bucket
 			 */
-			if (!isset($config['arguments']['bucket'])) {
-				$config['arguments']['bucket'] = '';
-			}
-			$mapper = new \OC\Files\ObjectStore\Mapper($user);
-			$config['arguments']['bucket'] .= $mapper->getBucket();
-
-			$this->config->setUserValue($user->getUID(), 'homeobjectstore', 'bucket', $config['arguments']['bucket']);
-		} else {
-			$config['arguments']['bucket'] = $bucket;
-		}
-
-		// instantiate object store implementation
-		$config['arguments']['objectstore'] = new $config['class']($config['arguments']);
-
-		return $config;
-	}
+            if (!isset($config['arguments']['bucket'])) {
+                $config['arguments']['bucket'] = '';
+            }
+            $mapper = new \OC\Files\ObjectStore\Mapper($user);
+            $config['arguments']['bucket'] .= $mapper->getBucket();
+
+            $this->config->setUserValue($user->getUID(), 'homeobjectstore', 'bucket', $config['arguments']['bucket']);
+        } else {
+            $config['arguments']['bucket'] = $bucket;
+        }
+
+        // instantiate object store implementation
+        $config['arguments']['objectstore'] = new $config['class']($config['arguments']);
+
+        return $config;
+    }
 }

lib/private/Files/Mount/MoveableMount.php

Indentation +14 added lines, -14 removed lines

@@ -27,19 +27,19 @@
  * Defines the mount point to be (re)moved by the user
  */
 interface MoveableMount {
-	/**
-	 * Move the mount point to $target
-	 *
-	 * @param string $target the target mount point
-	 * @return bool
-	 */
-	public function moveMount($target);
+    /**
+     * Move the mount point to $target
+     *
+     * @param string $target the target mount point
+     * @return bool
+     */
+    public function moveMount($target);
 
-	/**
-	 * Remove the mount points
-	 *
-	 * @return mixed
-	 * @return bool
-	 */
-	public function removeMount();
+    /**
+     * Remove the mount points
+     *
+     * @return mixed
+     * @return bool
+     */
+    public function removeMount();
 }

lib/private/Files/Mount/Manager.php

Indentation +122 added lines, -122 removed lines

@@ -30,137 +30,137 @@
 use OCP\Files\Mount\IMountPoint;
 
 class Manager implements IMountManager {
-	/**
-	 * @var MountPoint[]
-	 */
-	private $mounts = array();
+    /**
+     * @var MountPoint[]
+     */
+    private $mounts = array();
 
-	/**
-	 * @param IMountPoint $mount
-	 */
-	public function addMount(IMountPoint $mount) {
-		$this->mounts[$mount->getMountPoint()] = $mount;
-	}
+    /**
+     * @param IMountPoint $mount
+     */
+    public function addMount(IMountPoint $mount) {
+        $this->mounts[$mount->getMountPoint()] = $mount;
+    }
 
-	/**
-	 * @param string $mountPoint
-	 */
-	public function removeMount($mountPoint) {
-		$mountPoint = Filesystem::normalizePath($mountPoint);
-		if (strlen($mountPoint) > 1) {
-			$mountPoint .= '/';
-		}
-		unset($this->mounts[$mountPoint]);
-	}
+    /**
+     * @param string $mountPoint
+     */
+    public function removeMount($mountPoint) {
+        $mountPoint = Filesystem::normalizePath($mountPoint);
+        if (strlen($mountPoint) > 1) {
+            $mountPoint .= '/';
+        }
+        unset($this->mounts[$mountPoint]);
+    }
 
-	/**
-	 * @param string $mountPoint
-	 * @param string $target
-	 */
-	public function moveMount($mountPoint, $target){
-		$this->mounts[$target] = $this->mounts[$mountPoint];
-		unset($this->mounts[$mountPoint]);
-	}
+    /**
+     * @param string $mountPoint
+     * @param string $target
+     */
+    public function moveMount($mountPoint, $target){
+        $this->mounts[$target] = $this->mounts[$mountPoint];
+        unset($this->mounts[$mountPoint]);
+    }
 
-	/**
-	 * Find the mount for $path
-	 *
-	 * @param string $path
-	 * @return MountPoint
-	 */
-	public function find($path) {
-		\OC_Util::setupFS();
-		$path = $this->formatPath($path);
-		if (isset($this->mounts[$path])) {
-			return $this->mounts[$path];
-		}
+    /**
+     * Find the mount for $path
+     *
+     * @param string $path
+     * @return MountPoint
+     */
+    public function find($path) {
+        \OC_Util::setupFS();
+        $path = $this->formatPath($path);
+        if (isset($this->mounts[$path])) {
+            return $this->mounts[$path];
+        }
 
-		\OC_Hook::emit('OC_Filesystem', 'get_mountpoint', array('path' => $path));
-		$foundMountPoint = '';
-		$mountPoints = array_keys($this->mounts);
-		foreach ($mountPoints as $mountpoint) {
-			if (strpos($path, $mountpoint) === 0 and strlen($mountpoint) > strlen($foundMountPoint)) {
-				$foundMountPoint = $mountpoint;
-			}
-		}
-		if (isset($this->mounts[$foundMountPoint])) {
-			return $this->mounts[$foundMountPoint];
-		} else {
-			return null;
-		}
-	}
+        \OC_Hook::emit('OC_Filesystem', 'get_mountpoint', array('path' => $path));
+        $foundMountPoint = '';
+        $mountPoints = array_keys($this->mounts);
+        foreach ($mountPoints as $mountpoint) {
+            if (strpos($path, $mountpoint) === 0 and strlen($mountpoint) > strlen($foundMountPoint)) {
+                $foundMountPoint = $mountpoint;
+            }
+        }
+        if (isset($this->mounts[$foundMountPoint])) {
+            return $this->mounts[$foundMountPoint];
+        } else {
+            return null;
+        }
+    }
 
-	/**
-	 * Find all mounts in $path
-	 *
-	 * @param string $path
-	 * @return MountPoint[]
-	 */
-	public function findIn($path) {
-		\OC_Util::setupFS();
-		$path = $this->formatPath($path);
-		$result = array();
-		$pathLength = strlen($path);
-		$mountPoints = array_keys($this->mounts);
-		foreach ($mountPoints as $mountPoint) {
-			if (substr($mountPoint, 0, $pathLength) === $path and strlen($mountPoint) > $pathLength) {
-				$result[] = $this->mounts[$mountPoint];
-			}
-		}
-		return $result;
-	}
+    /**
+     * Find all mounts in $path
+     *
+     * @param string $path
+     * @return MountPoint[]
+     */
+    public function findIn($path) {
+        \OC_Util::setupFS();
+        $path = $this->formatPath($path);
+        $result = array();
+        $pathLength = strlen($path);
+        $mountPoints = array_keys($this->mounts);
+        foreach ($mountPoints as $mountPoint) {
+            if (substr($mountPoint, 0, $pathLength) === $path and strlen($mountPoint) > $pathLength) {
+                $result[] = $this->mounts[$mountPoint];
+            }
+        }
+        return $result;
+    }
 
-	public function clear() {
-		$this->mounts = array();
-	}
+    public function clear() {
+        $this->mounts = array();
+    }
 
-	/**
-	 * Find mounts by storage id
-	 *
-	 * @param string $id
-	 * @return MountPoint[]
-	 */
-	public function findByStorageId($id) {
-		\OC_Util::setupFS();
-		if (strlen($id) > 64) {
-			$id = md5($id);
-		}
-		$result = array();
-		foreach ($this->mounts as $mount) {
-			if ($mount->getStorageId() === $id) {
-				$result[] = $mount;
-			}
-		}
-		return $result;
-	}
+    /**
+     * Find mounts by storage id
+     *
+     * @param string $id
+     * @return MountPoint[]
+     */
+    public function findByStorageId($id) {
+        \OC_Util::setupFS();
+        if (strlen($id) > 64) {
+            $id = md5($id);
+        }
+        $result = array();
+        foreach ($this->mounts as $mount) {
+            if ($mount->getStorageId() === $id) {
+                $result[] = $mount;
+            }
+        }
+        return $result;
+    }
 
-	/**
-	 * @return MountPoint[]
-	 */
-	public function getAll() {
-		return $this->mounts;
-	}
+    /**
+     * @return MountPoint[]
+     */
+    public function getAll() {
+        return $this->mounts;
+    }
 
-	/**
-	 * Find mounts by numeric storage id
-	 *
-	 * @param int $id
-	 * @return MountPoint[]
-	 */
-	public function findByNumericId($id) {
-		$storageId = \OC\Files\Cache\Storage::getStorageId($id);
-		return $this->findByStorageId($storageId);
-	}
+    /**
+     * Find mounts by numeric storage id
+     *
+     * @param int $id
+     * @return MountPoint[]
+     */
+    public function findByNumericId($id) {
+        $storageId = \OC\Files\Cache\Storage::getStorageId($id);
+        return $this->findByStorageId($storageId);
+    }
 
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	private function formatPath($path) {
-		$path = Filesystem::normalizePath($path);
-		if (strlen($path) > 1) {
-			$path .= '/';
-		}
-		return $path;
-	}
+    /**
+     * @param string $path
+     * @return string
+     */
+    private function formatPath($path) {
+        $path = Filesystem::normalizePath($path);
+        if (strlen($path) > 1) {
+            $path .= '/';
+        }
+        return $path;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 	 * @param string $mountPoint
 	 * @param string $target
 	 */
-	public function moveMount($mountPoint, $target){
+	public function moveMount($mountPoint, $target) {
 		$this->mounts[$target] = $this->mounts[$mountPoint];
 		unset($this->mounts[$mountPoint]);
 	}

lib/private/Files/Stream/Encryption.php

Indentation +465 added lines, -465 removed lines

@@ -32,470 +32,470 @@
 
 class Encryption extends Wrapper {
 
-	/** @var \OC\Encryption\Util */
-	protected $util;
-
-	/** @var \OC\Encryption\File */
-	protected $file;
-
-	/** @var \OCP\Encryption\IEncryptionModule */
-	protected $encryptionModule;
-
-	/** @var \OC\Files\Storage\Storage */
-	protected $storage;
-
-	/** @var \OC\Files\Storage\Wrapper\Encryption */
-	protected $encryptionStorage;
-
-	/** @var string */
-	protected $internalPath;
-
-	/** @var string */
-	protected $cache;
-
-	/** @var integer */
-	protected $size;
-
-	/** @var integer */
-	protected $position;
-
-	/** @var integer */
-	protected $unencryptedSize;
-
-	/** @var integer */
-	protected $headerSize;
-
-	/** @var integer */
-	protected $unencryptedBlockSize;
-
-	/** @var array */
-	protected $header;
-
-	/** @var string */
-	protected $fullPath;
-
-	/** @var  bool */
-	protected $signed;
-
-	/**
-	 * header data returned by the encryption module, will be written to the file
-	 * in case of a write operation
-	 *
-	 * @var array
-	 */
-	protected $newHeader;
-
-	/**
-	 * user who perform the read/write operation null for public access
-	 *
-	 * @var string
-	 */
-	protected $uid;
-
-	/** @var bool */
-	protected $readOnly;
-
-	/** @var bool */
-	protected $writeFlag;
-
-	/** @var array */
-	protected $expectedContextProperties;
-
-	public function __construct() {
-		$this->expectedContextProperties = array(
-			'source',
-			'storage',
-			'internalPath',
-			'fullPath',
-			'encryptionModule',
-			'header',
-			'uid',
-			'file',
-			'util',
-			'size',
-			'unencryptedSize',
-			'encryptionStorage',
-			'headerSize',
-			'signed'
-		);
-	}
-
-
-	/**
-	 * Wraps a stream with the provided callbacks
-	 *
-	 * @param resource $source
-	 * @param string $internalPath relative to mount point
-	 * @param string $fullPath relative to data/
-	 * @param array $header
-	 * @param string $uid
-	 * @param \OCP\Encryption\IEncryptionModule $encryptionModule
-	 * @param \OC\Files\Storage\Storage $storage
-	 * @param \OC\Files\Storage\Wrapper\Encryption $encStorage
-	 * @param \OC\Encryption\Util $util
-	 * @param \OC\Encryption\File $file
-	 * @param string $mode
-	 * @param int $size
-	 * @param int $unencryptedSize
-	 * @param int $headerSize
-	 * @param bool $signed
-	 * @param string $wrapper stream wrapper class
-	 * @return resource
-	 *
-	 * @throws \BadMethodCallException
-	 */
-	public static function wrap($source, $internalPath, $fullPath, array $header,
-								$uid,
-								\OCP\Encryption\IEncryptionModule $encryptionModule,
-								\OC\Files\Storage\Storage $storage,
-								\OC\Files\Storage\Wrapper\Encryption $encStorage,
-								\OC\Encryption\Util $util,
-								 \OC\Encryption\File $file,
-								$mode,
-								$size,
-								$unencryptedSize,
-								$headerSize,
-								$signed,
-								$wrapper =  'OC\Files\Stream\Encryption') {
-
-		$context = stream_context_create(array(
-			'ocencryption' => array(
-				'source' => $source,
-				'storage' => $storage,
-				'internalPath' => $internalPath,
-				'fullPath' => $fullPath,
-				'encryptionModule' => $encryptionModule,
-				'header' => $header,
-				'uid' => $uid,
-				'util' => $util,
-				'file' => $file,
-				'size' => $size,
-				'unencryptedSize' => $unencryptedSize,
-				'encryptionStorage' => $encStorage,
-				'headerSize' => $headerSize,
-				'signed' => $signed
-			)
-		));
-
-		return self::wrapSource($source, $context, 'ocencryption', $wrapper, $mode);
-	}
-
-	/**
-	 * add stream wrapper
-	 *
-	 * @param resource $source
-	 * @param string $mode
-	 * @param resource $context
-	 * @param string $protocol
-	 * @param string $class
-	 * @return resource
-	 * @throws \BadMethodCallException
-	 */
-	protected static function wrapSource($source, $context, $protocol, $class, $mode = 'r+') {
-		try {
-			stream_wrapper_register($protocol, $class);
-			if (@rewinddir($source) === false) {
-				$wrapped = fopen($protocol . '://', $mode, false, $context);
-			} else {
-				$wrapped = opendir($protocol . '://', $context);
-			}
-		} catch (\BadMethodCallException $e) {
-			stream_wrapper_unregister($protocol);
-			throw $e;
-		}
-		stream_wrapper_unregister($protocol);
-		return $wrapped;
-	}
-
-	/**
-	 * Load the source from the stream context and return the context options
-	 *
-	 * @param string $name
-	 * @return array
-	 * @throws \BadMethodCallException
-	 */
-	protected function loadContext($name) {
-		$context = parent::loadContext($name);
-
-		foreach ($this->expectedContextProperties as $property) {
-			if (array_key_exists($property, $context)) {
-				$this->{$property} = $context[$property];
-			} else {
-				throw new \BadMethodCallException('Invalid context, "' . $property . '" options not set');
-			}
-		}
-		return $context;
-
-	}
-
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		$this->loadContext('ocencryption');
-
-		$this->position = 0;
-		$this->cache = '';
-		$this->writeFlag = false;
-		$this->unencryptedBlockSize = $this->encryptionModule->getUnencryptedBlockSize($this->signed);
-
-		if (
-			$mode === 'w'
-			|| $mode === 'w+'
-			|| $mode === 'wb'
-			|| $mode === 'wb+'
-			|| $mode === 'r+'
-			|| $mode === 'rb+'
-		) {
-			$this->readOnly = false;
-		} else {
-			$this->readOnly = true;
-		}
-
-		$sharePath = $this->fullPath;
-		if (!$this->storage->file_exists($this->internalPath)) {
-			$sharePath = dirname($sharePath);
-		}
-
-		$accessList = $this->file->getAccessList($sharePath);
-		$this->newHeader = $this->encryptionModule->begin($this->fullPath, $this->uid, $mode, $this->header, $accessList);
-
-		if (
-			$mode === 'w'
-			|| $mode === 'w+'
-			|| $mode === 'wb'
-			|| $mode === 'wb+'
-		) {
-			// We're writing a new file so start write counter with 0 bytes
-			$this->unencryptedSize = 0;
-			$this->writeHeader();
-			$this->headerSize = $this->util->getHeaderSize();
-			$this->size = $this->headerSize;
-		} else {
-			$this->skipHeader();
-		}
-
-		return true;
-
-	}
-
-	public function stream_eof() {
-		return $this->position >= $this->unencryptedSize;
-	}
-
-	public function stream_read($count) {
-
-		$result = '';
-
-		$count = min($count, $this->unencryptedSize - $this->position);
-		while ($count > 0) {
-			$remainingLength = $count;
-			// update the cache of the current block
-			$this->readCache();
-			// determine the relative position in the current block
-			$blockPosition = ($this->position % $this->unencryptedBlockSize);
-			// if entire read inside current block then only position needs to be updated
-			if ($remainingLength < ($this->unencryptedBlockSize - $blockPosition)) {
-				$result .= substr($this->cache, $blockPosition, $remainingLength);
-				$this->position += $remainingLength;
-				$count = 0;
-				// otherwise remainder of current block is fetched, the block is flushed and the position updated
-			} else {
-				$result .= substr($this->cache, $blockPosition);
-				$this->flush();
-				$this->position += ($this->unencryptedBlockSize - $blockPosition);
-				$count -= ($this->unencryptedBlockSize - $blockPosition);
-			}
-		}
-		return $result;
-
-	}
-
-	public function stream_write($data) {
-
-		$length = 0;
-		// loop over $data to fit it in 6126 sized unencrypted blocks
-		while (isset($data[0])) {
-			$remainingLength = strlen($data);
-
-			// set the cache to the current 6126 block
-			$this->readCache();
-
-			// for seekable streams the pointer is moved back to the beginning of the encrypted block
-			// flush will start writing there when the position moves to another block
-			$positionInFile = (int)floor($this->position / $this->unencryptedBlockSize) *
-				$this->util->getBlockSize() + $this->headerSize;
-			$resultFseek = $this->parentStreamSeek($positionInFile);
-
-			// only allow writes on seekable streams, or at the end of the encrypted stream
-			if (!($this->readOnly) && ($resultFseek || $positionInFile === $this->size)) {
-
-				// switch the writeFlag so flush() will write the block
-				$this->writeFlag = true;
-
-				// determine the relative position in the current block
-				$blockPosition = ($this->position % $this->unencryptedBlockSize);
-				// check if $data fits in current block
-				// if so, overwrite existing data (if any)
-				// update position and liberate $data
-				if ($remainingLength < ($this->unencryptedBlockSize - $blockPosition)) {
-					$this->cache = substr($this->cache, 0, $blockPosition)
-						. $data . substr($this->cache, $blockPosition + $remainingLength);
-					$this->position += $remainingLength;
-					$length += $remainingLength;
-					$data = '';
-					// if $data doesn't fit the current block, the fill the current block and reiterate
-					// after the block is filled, it is flushed and $data is updatedxxx
-				} else {
-					$this->cache = substr($this->cache, 0, $blockPosition) .
-						substr($data, 0, $this->unencryptedBlockSize - $blockPosition);
-					$this->flush();
-					$this->position += ($this->unencryptedBlockSize - $blockPosition);
-					$length += ($this->unencryptedBlockSize - $blockPosition);
-					$data = substr($data, $this->unencryptedBlockSize - $blockPosition);
-				}
-			} else {
-				$data = '';
-			}
-			$this->unencryptedSize = max($this->unencryptedSize, $this->position);
-		}
-		return $length;
-	}
-
-	public function stream_tell() {
-		return $this->position;
-	}
-
-	public function stream_seek($offset, $whence = SEEK_SET) {
-
-		$return = false;
-
-		switch ($whence) {
-			case SEEK_SET:
-				$newPosition = $offset;
-				break;
-			case SEEK_CUR:
-				$newPosition = $this->position + $offset;
-				break;
-			case SEEK_END:
-				$newPosition = $this->unencryptedSize + $offset;
-				break;
-			default:
-				return $return;
-		}
-
-		if ($newPosition > $this->unencryptedSize || $newPosition < 0) {
-			return $return;
-		}
-
-		$newFilePosition = floor($newPosition / $this->unencryptedBlockSize)
-			* $this->util->getBlockSize() + $this->headerSize;
-
-		$oldFilePosition = parent::stream_tell();
-		if ($this->parentStreamSeek($newFilePosition)) {
-			$this->parentStreamSeek($oldFilePosition);
-			$this->flush();
-			$this->parentStreamSeek($newFilePosition);
-			$this->position = $newPosition;
-			$return = true;
-		}
-		return $return;
-
-	}
-
-	public function stream_close() {
-		$this->flush('end');
-		$position = (int)floor($this->position/$this->unencryptedBlockSize);
-		$remainingData = $this->encryptionModule->end($this->fullPath, $position . 'end');
-		if ($this->readOnly === false) {
-			if(!empty($remainingData)) {
-				parent::stream_write($remainingData);
-			}
-			$this->encryptionStorage->updateUnencryptedSize($this->fullPath, $this->unencryptedSize);
-		}
-		return parent::stream_close();
-	}
-
-	/**
-	 * write block to file
-	 * @param string $positionPrefix
-	 */
-	protected function flush($positionPrefix = '') {
-		// write to disk only when writeFlag was set to 1
-		if ($this->writeFlag) {
-			// Disable the file proxies so that encryption is not
-			// automatically attempted when the file is written to disk -
-			// we are handling that separately here and we don't want to
-			// get into an infinite loop
-			$position = (int)floor($this->position/$this->unencryptedBlockSize);
-			$encrypted = $this->encryptionModule->encrypt($this->cache, $position . $positionPrefix);
-			$bytesWritten = parent::stream_write($encrypted);
-			$this->writeFlag = false;
-			// Check whether the write concerns the last block
-			// If so then update the encrypted filesize
-			// Note that the unencrypted pointer and filesize are NOT yet updated when flush() is called
-			// We recalculate the encrypted filesize as we do not know the context of calling flush()
-			$completeBlocksInFile=(int)floor($this->unencryptedSize/$this->unencryptedBlockSize);
-			if ($completeBlocksInFile === (int)floor($this->position/$this->unencryptedBlockSize)) {
-				$this->size = $this->util->getBlockSize() * $completeBlocksInFile;
-				$this->size += $bytesWritten;
-				$this->size += $this->headerSize;
-			}
-		}
-		// always empty the cache (otherwise readCache() will not fill it with the new block)
-		$this->cache = '';
-	}
-
-	/**
-	 * read block to file
-	 */
-	protected function readCache() {
-		// cache should always be empty string when this function is called
-		// don't try to fill the cache when trying to write at the end of the unencrypted file when it coincides with new block
-		if ($this->cache === '' && !($this->position === $this->unencryptedSize && ($this->position % $this->unencryptedBlockSize) === 0)) {
-			// Get the data from the file handle
-			$data = parent::stream_read($this->util->getBlockSize());
-			$position = (int)floor($this->position/$this->unencryptedBlockSize);
-			$numberOfChunks = (int)($this->unencryptedSize / $this->unencryptedBlockSize);
-			if($numberOfChunks === $position) {
-				$position .= 'end';
-			}
-			$this->cache = $this->encryptionModule->decrypt($data, $position);
-		}
-	}
-
-	/**
-	 * write header at beginning of encrypted file
-	 *
-	 * @return integer
-	 * @throws EncryptionHeaderKeyExistsException if header key is already in use
-	 */
-	protected function writeHeader() {
-		$header = $this->util->createHeader($this->newHeader, $this->encryptionModule);
-		return parent::stream_write($header);
-	}
-
-	/**
-	 * read first block to skip the header
-	 */
-	protected function skipHeader() {
-		parent::stream_read($this->headerSize);
-	}
-
-	/**
-	 * call stream_seek() from parent class
-	 *
-	 * @param integer $position
-	 * @return bool
-	 */
-	protected function parentStreamSeek($position) {
-		return parent::stream_seek($position);
-	}
-
-	/**
-	 * @param string $path
-	 * @param array $options
-	 * @return bool
-	 */
-	public function dir_opendir($path, $options) {
-		return false;
-	}
+    /** @var \OC\Encryption\Util */
+    protected $util;
+
+    /** @var \OC\Encryption\File */
+    protected $file;
+
+    /** @var \OCP\Encryption\IEncryptionModule */
+    protected $encryptionModule;
+
+    /** @var \OC\Files\Storage\Storage */
+    protected $storage;
+
+    /** @var \OC\Files\Storage\Wrapper\Encryption */
+    protected $encryptionStorage;
+
+    /** @var string */
+    protected $internalPath;
+
+    /** @var string */
+    protected $cache;
+
+    /** @var integer */
+    protected $size;
+
+    /** @var integer */
+    protected $position;
+
+    /** @var integer */
+    protected $unencryptedSize;
+
+    /** @var integer */
+    protected $headerSize;
+
+    /** @var integer */
+    protected $unencryptedBlockSize;
+
+    /** @var array */
+    protected $header;
+
+    /** @var string */
+    protected $fullPath;
+
+    /** @var  bool */
+    protected $signed;
+
+    /**
+     * header data returned by the encryption module, will be written to the file
+     * in case of a write operation
+     *
+     * @var array
+     */
+    protected $newHeader;
+
+    /**
+     * user who perform the read/write operation null for public access
+     *
+     * @var string
+     */
+    protected $uid;
+
+    /** @var bool */
+    protected $readOnly;
+
+    /** @var bool */
+    protected $writeFlag;
+
+    /** @var array */
+    protected $expectedContextProperties;
+
+    public function __construct() {
+        $this->expectedContextProperties = array(
+            'source',
+            'storage',
+            'internalPath',
+            'fullPath',
+            'encryptionModule',
+            'header',
+            'uid',
+            'file',
+            'util',
+            'size',
+            'unencryptedSize',
+            'encryptionStorage',
+            'headerSize',
+            'signed'
+        );
+    }
+
+
+    /**
+     * Wraps a stream with the provided callbacks
+     *
+     * @param resource $source
+     * @param string $internalPath relative to mount point
+     * @param string $fullPath relative to data/
+     * @param array $header
+     * @param string $uid
+     * @param \OCP\Encryption\IEncryptionModule $encryptionModule
+     * @param \OC\Files\Storage\Storage $storage
+     * @param \OC\Files\Storage\Wrapper\Encryption $encStorage
+     * @param \OC\Encryption\Util $util
+     * @param \OC\Encryption\File $file
+     * @param string $mode
+     * @param int $size
+     * @param int $unencryptedSize
+     * @param int $headerSize
+     * @param bool $signed
+     * @param string $wrapper stream wrapper class
+     * @return resource
+     *
+     * @throws \BadMethodCallException
+     */
+    public static function wrap($source, $internalPath, $fullPath, array $header,
+                                $uid,
+                                \OCP\Encryption\IEncryptionModule $encryptionModule,
+                                \OC\Files\Storage\Storage $storage,
+                                \OC\Files\Storage\Wrapper\Encryption $encStorage,
+                                \OC\Encryption\Util $util,
+                                    \OC\Encryption\File $file,
+                                $mode,
+                                $size,
+                                $unencryptedSize,
+                                $headerSize,
+                                $signed,
+                                $wrapper =  'OC\Files\Stream\Encryption') {
+
+        $context = stream_context_create(array(
+            'ocencryption' => array(
+                'source' => $source,
+                'storage' => $storage,
+                'internalPath' => $internalPath,
+                'fullPath' => $fullPath,
+                'encryptionModule' => $encryptionModule,
+                'header' => $header,
+                'uid' => $uid,
+                'util' => $util,
+                'file' => $file,
+                'size' => $size,
+                'unencryptedSize' => $unencryptedSize,
+                'encryptionStorage' => $encStorage,
+                'headerSize' => $headerSize,
+                'signed' => $signed
+            )
+        ));
+
+        return self::wrapSource($source, $context, 'ocencryption', $wrapper, $mode);
+    }
+
+    /**
+     * add stream wrapper
+     *
+     * @param resource $source
+     * @param string $mode
+     * @param resource $context
+     * @param string $protocol
+     * @param string $class
+     * @return resource
+     * @throws \BadMethodCallException
+     */
+    protected static function wrapSource($source, $context, $protocol, $class, $mode = 'r+') {
+        try {
+            stream_wrapper_register($protocol, $class);
+            if (@rewinddir($source) === false) {
+                $wrapped = fopen($protocol . '://', $mode, false, $context);
+            } else {
+                $wrapped = opendir($protocol . '://', $context);
+            }
+        } catch (\BadMethodCallException $e) {
+            stream_wrapper_unregister($protocol);
+            throw $e;
+        }
+        stream_wrapper_unregister($protocol);
+        return $wrapped;
+    }
+
+    /**
+     * Load the source from the stream context and return the context options
+     *
+     * @param string $name
+     * @return array
+     * @throws \BadMethodCallException
+     */
+    protected function loadContext($name) {
+        $context = parent::loadContext($name);
+
+        foreach ($this->expectedContextProperties as $property) {
+            if (array_key_exists($property, $context)) {
+                $this->{$property} = $context[$property];
+            } else {
+                throw new \BadMethodCallException('Invalid context, "' . $property . '" options not set');
+            }
+        }
+        return $context;
+
+    }
+
+    public function stream_open($path, $mode, $options, &$opened_path) {
+        $this->loadContext('ocencryption');
+
+        $this->position = 0;
+        $this->cache = '';
+        $this->writeFlag = false;
+        $this->unencryptedBlockSize = $this->encryptionModule->getUnencryptedBlockSize($this->signed);
+
+        if (
+            $mode === 'w'
+            || $mode === 'w+'
+            || $mode === 'wb'
+            || $mode === 'wb+'
+            || $mode === 'r+'
+            || $mode === 'rb+'
+        ) {
+            $this->readOnly = false;
+        } else {
+            $this->readOnly = true;
+        }
+
+        $sharePath = $this->fullPath;
+        if (!$this->storage->file_exists($this->internalPath)) {
+            $sharePath = dirname($sharePath);
+        }
+
+        $accessList = $this->file->getAccessList($sharePath);
+        $this->newHeader = $this->encryptionModule->begin($this->fullPath, $this->uid, $mode, $this->header, $accessList);
+
+        if (
+            $mode === 'w'
+            || $mode === 'w+'
+            || $mode === 'wb'
+            || $mode === 'wb+'
+        ) {
+            // We're writing a new file so start write counter with 0 bytes
+            $this->unencryptedSize = 0;
+            $this->writeHeader();
+            $this->headerSize = $this->util->getHeaderSize();
+            $this->size = $this->headerSize;
+        } else {
+            $this->skipHeader();
+        }
+
+        return true;
+
+    }
+
+    public function stream_eof() {
+        return $this->position >= $this->unencryptedSize;
+    }
+
+    public function stream_read($count) {
+
+        $result = '';
+
+        $count = min($count, $this->unencryptedSize - $this->position);
+        while ($count > 0) {
+            $remainingLength = $count;
+            // update the cache of the current block
+            $this->readCache();
+            // determine the relative position in the current block
+            $blockPosition = ($this->position % $this->unencryptedBlockSize);
+            // if entire read inside current block then only position needs to be updated
+            if ($remainingLength < ($this->unencryptedBlockSize - $blockPosition)) {
+                $result .= substr($this->cache, $blockPosition, $remainingLength);
+                $this->position += $remainingLength;
+                $count = 0;
+                // otherwise remainder of current block is fetched, the block is flushed and the position updated
+            } else {
+                $result .= substr($this->cache, $blockPosition);
+                $this->flush();
+                $this->position += ($this->unencryptedBlockSize - $blockPosition);
+                $count -= ($this->unencryptedBlockSize - $blockPosition);
+            }
+        }
+        return $result;
+
+    }
+
+    public function stream_write($data) {
+
+        $length = 0;
+        // loop over $data to fit it in 6126 sized unencrypted blocks
+        while (isset($data[0])) {
+            $remainingLength = strlen($data);
+
+            // set the cache to the current 6126 block
+            $this->readCache();
+
+            // for seekable streams the pointer is moved back to the beginning of the encrypted block
+            // flush will start writing there when the position moves to another block
+            $positionInFile = (int)floor($this->position / $this->unencryptedBlockSize) *
+                $this->util->getBlockSize() + $this->headerSize;
+            $resultFseek = $this->parentStreamSeek($positionInFile);
+
+            // only allow writes on seekable streams, or at the end of the encrypted stream
+            if (!($this->readOnly) && ($resultFseek || $positionInFile === $this->size)) {
+
+                // switch the writeFlag so flush() will write the block
+                $this->writeFlag = true;
+
+                // determine the relative position in the current block
+                $blockPosition = ($this->position % $this->unencryptedBlockSize);
+                // check if $data fits in current block
+                // if so, overwrite existing data (if any)
+                // update position and liberate $data
+                if ($remainingLength < ($this->unencryptedBlockSize - $blockPosition)) {
+                    $this->cache = substr($this->cache, 0, $blockPosition)
+                        . $data . substr($this->cache, $blockPosition + $remainingLength);
+                    $this->position += $remainingLength;
+                    $length += $remainingLength;
+                    $data = '';
+                    // if $data doesn't fit the current block, the fill the current block and reiterate
+                    // after the block is filled, it is flushed and $data is updatedxxx
+                } else {
+                    $this->cache = substr($this->cache, 0, $blockPosition) .
+                        substr($data, 0, $this->unencryptedBlockSize - $blockPosition);
+                    $this->flush();
+                    $this->position += ($this->unencryptedBlockSize - $blockPosition);
+                    $length += ($this->unencryptedBlockSize - $blockPosition);
+                    $data = substr($data, $this->unencryptedBlockSize - $blockPosition);
+                }
+            } else {
+                $data = '';
+            }
+            $this->unencryptedSize = max($this->unencryptedSize, $this->position);
+        }
+        return $length;
+    }
+
+    public function stream_tell() {
+        return $this->position;
+    }
+
+    public function stream_seek($offset, $whence = SEEK_SET) {
+
+        $return = false;
+
+        switch ($whence) {
+            case SEEK_SET:
+                $newPosition = $offset;
+                break;
+            case SEEK_CUR:
+                $newPosition = $this->position + $offset;
+                break;
+            case SEEK_END:
+                $newPosition = $this->unencryptedSize + $offset;
+                break;
+            default:
+                return $return;
+        }
+
+        if ($newPosition > $this->unencryptedSize || $newPosition < 0) {
+            return $return;
+        }
+
+        $newFilePosition = floor($newPosition / $this->unencryptedBlockSize)
+            * $this->util->getBlockSize() + $this->headerSize;
+
+        $oldFilePosition = parent::stream_tell();
+        if ($this->parentStreamSeek($newFilePosition)) {
+            $this->parentStreamSeek($oldFilePosition);
+            $this->flush();
+            $this->parentStreamSeek($newFilePosition);
+            $this->position = $newPosition;
+            $return = true;
+        }
+        return $return;
+
+    }
+
+    public function stream_close() {
+        $this->flush('end');
+        $position = (int)floor($this->position/$this->unencryptedBlockSize);
+        $remainingData = $this->encryptionModule->end($this->fullPath, $position . 'end');
+        if ($this->readOnly === false) {
+            if(!empty($remainingData)) {
+                parent::stream_write($remainingData);
+            }
+            $this->encryptionStorage->updateUnencryptedSize($this->fullPath, $this->unencryptedSize);
+        }
+        return parent::stream_close();
+    }
+
+    /**
+     * write block to file
+     * @param string $positionPrefix
+     */
+    protected function flush($positionPrefix = '') {
+        // write to disk only when writeFlag was set to 1
+        if ($this->writeFlag) {
+            // Disable the file proxies so that encryption is not
+            // automatically attempted when the file is written to disk -
+            // we are handling that separately here and we don't want to
+            // get into an infinite loop
+            $position = (int)floor($this->position/$this->unencryptedBlockSize);
+            $encrypted = $this->encryptionModule->encrypt($this->cache, $position . $positionPrefix);
+            $bytesWritten = parent::stream_write($encrypted);
+            $this->writeFlag = false;
+            // Check whether the write concerns the last block
+            // If so then update the encrypted filesize
+            // Note that the unencrypted pointer and filesize are NOT yet updated when flush() is called
+            // We recalculate the encrypted filesize as we do not know the context of calling flush()
+            $completeBlocksInFile=(int)floor($this->unencryptedSize/$this->unencryptedBlockSize);
+            if ($completeBlocksInFile === (int)floor($this->position/$this->unencryptedBlockSize)) {
+                $this->size = $this->util->getBlockSize() * $completeBlocksInFile;
+                $this->size += $bytesWritten;
+                $this->size += $this->headerSize;
+            }
+        }
+        // always empty the cache (otherwise readCache() will not fill it with the new block)
+        $this->cache = '';
+    }
+
+    /**
+     * read block to file
+     */
+    protected function readCache() {
+        // cache should always be empty string when this function is called
+        // don't try to fill the cache when trying to write at the end of the unencrypted file when it coincides with new block
+        if ($this->cache === '' && !($this->position === $this->unencryptedSize && ($this->position % $this->unencryptedBlockSize) === 0)) {
+            // Get the data from the file handle
+            $data = parent::stream_read($this->util->getBlockSize());
+            $position = (int)floor($this->position/$this->unencryptedBlockSize);
+            $numberOfChunks = (int)($this->unencryptedSize / $this->unencryptedBlockSize);
+            if($numberOfChunks === $position) {
+                $position .= 'end';
+            }
+            $this->cache = $this->encryptionModule->decrypt($data, $position);
+        }
+    }
+
+    /**
+     * write header at beginning of encrypted file
+     *
+     * @return integer
+     * @throws EncryptionHeaderKeyExistsException if header key is already in use
+     */
+    protected function writeHeader() {
+        $header = $this->util->createHeader($this->newHeader, $this->encryptionModule);
+        return parent::stream_write($header);
+    }
+
+    /**
+     * read first block to skip the header
+     */
+    protected function skipHeader() {
+        parent::stream_read($this->headerSize);
+    }
+
+    /**
+     * call stream_seek() from parent class
+     *
+     * @param integer $position
+     * @return bool
+     */
+    protected function parentStreamSeek($position) {
+        return parent::stream_seek($position);
+    }
+
+    /**
+     * @param string $path
+     * @param array $options
+     * @return bool
+     */
+    public function dir_opendir($path, $options) {
+        return false;
+    }
 
 }

Spacing +17 added lines, -17 removed lines

@@ -156,7 +156,7 @@ 
 								$unencryptedSize,
 								$headerSize,
 								$signed,
-								$wrapper =  'OC\Files\Stream\Encryption') {
+								$wrapper = 'OC\Files\Stream\Encryption') {
 
 		$context = stream_context_create(array(
 			'ocencryption' => array(
@@ -195,9 +195,9 @@ 
 		try {
 			stream_wrapper_register($protocol, $class);
 			if (@rewinddir($source) === false) {
-				$wrapped = fopen($protocol . '://', $mode, false, $context);
+				$wrapped = fopen($protocol.'://', $mode, false, $context);
 			} else {
-				$wrapped = opendir($protocol . '://', $context);
+				$wrapped = opendir($protocol.'://', $context);
 			}
 		} catch (\BadMethodCallException $e) {
 			stream_wrapper_unregister($protocol);
@@ -221,7 +221,7 @@ 
 			if (array_key_exists($property, $context)) {
 				$this->{$property} = $context[$property];
 			} else {
-				throw new \BadMethodCallException('Invalid context, "' . $property . '" options not set');
+				throw new \BadMethodCallException('Invalid context, "'.$property.'" options not set');
 			}
 		}
 		return $context;
@@ -320,7 +320,7 @@ 
 
 			// for seekable streams the pointer is moved back to the beginning of the encrypted block
 			// flush will start writing there when the position moves to another block
-			$positionInFile = (int)floor($this->position / $this->unencryptedBlockSize) *
+			$positionInFile = (int) floor($this->position / $this->unencryptedBlockSize) *
 				$this->util->getBlockSize() + $this->headerSize;
 			$resultFseek = $this->parentStreamSeek($positionInFile);
 
@@ -337,14 +337,14 @@ 
 				// update position and liberate $data
 				if ($remainingLength < ($this->unencryptedBlockSize - $blockPosition)) {
 					$this->cache = substr($this->cache, 0, $blockPosition)
-						. $data . substr($this->cache, $blockPosition + $remainingLength);
+						. $data.substr($this->cache, $blockPosition + $remainingLength);
 					$this->position += $remainingLength;
 					$length += $remainingLength;
 					$data = '';
 					// if $data doesn't fit the current block, the fill the current block and reiterate
 					// after the block is filled, it is flushed and $data is updatedxxx
 				} else {
-					$this->cache = substr($this->cache, 0, $blockPosition) .
+					$this->cache = substr($this->cache, 0, $blockPosition).
 						substr($data, 0, $this->unencryptedBlockSize - $blockPosition);
 					$this->flush();
 					$this->position += ($this->unencryptedBlockSize - $blockPosition);
@@ -402,10 +402,10 @@ 
 
 	public function stream_close() {
 		$this->flush('end');
-		$position = (int)floor($this->position/$this->unencryptedBlockSize);
-		$remainingData = $this->encryptionModule->end($this->fullPath, $position . 'end');
+		$position = (int) floor($this->position / $this->unencryptedBlockSize);
+		$remainingData = $this->encryptionModule->end($this->fullPath, $position.'end');
 		if ($this->readOnly === false) {
-			if(!empty($remainingData)) {
+			if (!empty($remainingData)) {
 				parent::stream_write($remainingData);
 			}
 			$this->encryptionStorage->updateUnencryptedSize($this->fullPath, $this->unencryptedSize);
@@ -424,16 +424,16 @@ 
 			// automatically attempted when the file is written to disk -
 			// we are handling that separately here and we don't want to
 			// get into an infinite loop
-			$position = (int)floor($this->position/$this->unencryptedBlockSize);
-			$encrypted = $this->encryptionModule->encrypt($this->cache, $position . $positionPrefix);
+			$position = (int) floor($this->position / $this->unencryptedBlockSize);
+			$encrypted = $this->encryptionModule->encrypt($this->cache, $position.$positionPrefix);
 			$bytesWritten = parent::stream_write($encrypted);
 			$this->writeFlag = false;
 			// Check whether the write concerns the last block
 			// If so then update the encrypted filesize
 			// Note that the unencrypted pointer and filesize are NOT yet updated when flush() is called
 			// We recalculate the encrypted filesize as we do not know the context of calling flush()
-			$completeBlocksInFile=(int)floor($this->unencryptedSize/$this->unencryptedBlockSize);
-			if ($completeBlocksInFile === (int)floor($this->position/$this->unencryptedBlockSize)) {
+			$completeBlocksInFile = (int) floor($this->unencryptedSize / $this->unencryptedBlockSize);
+			if ($completeBlocksInFile === (int) floor($this->position / $this->unencryptedBlockSize)) {
 				$this->size = $this->util->getBlockSize() * $completeBlocksInFile;
 				$this->size += $bytesWritten;
 				$this->size += $this->headerSize;
@@ -452,9 +452,9 @@ 
 		if ($this->cache === '' && !($this->position === $this->unencryptedSize && ($this->position % $this->unencryptedBlockSize) === 0)) {
 			// Get the data from the file handle
 			$data = parent::stream_read($this->util->getBlockSize());
-			$position = (int)floor($this->position/$this->unencryptedBlockSize);
-			$numberOfChunks = (int)($this->unencryptedSize / $this->unencryptedBlockSize);
-			if($numberOfChunks === $position) {
+			$position = (int) floor($this->position / $this->unencryptedBlockSize);
+			$numberOfChunks = (int) ($this->unencryptedSize / $this->unencryptedBlockSize);
+			if ($numberOfChunks === $position) {
 				$position .= 'end';
 			}
 			$this->cache = $this->encryptionModule->decrypt($data, $position);