nextcloud / server

lib/private/Streamer.php

Braces +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 				$fh = \OC\Files\Filesystem::fopen($file, 'r');
 				$this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
 				fclose($fh);
-			}elseif(\OC\Files\Filesystem::is_dir($file)) {
+			} elseif(\OC\Files\Filesystem::is_dir($file)) {
 				$this->addDirRecursive($file, $internalDir);
 			}
 		}

Indentation +121 added lines, -121 removed lines

@@ -29,135 +29,135 @@
 use ZipStreamer\ZipStreamer;
 
 class Streamer {
-	// array of regexp. Matching user agents will get tar instead of zip
-	private $preferTarFor = [ '/macintosh|mac os x/i' ];
+    // array of regexp. Matching user agents will get tar instead of zip
+    private $preferTarFor = [ '/macintosh|mac os x/i' ];
 
-	// streamer instance
-	private $streamerInstance;
+    // streamer instance
+    private $streamerInstance;
 
-	/**
-	 * Streamer constructor.
-	 *
-	 * @param IRequest $request
-	 * @param int $size The size of the files in bytes
-	 * @param int $numberOfFiles The number of files (and directories) that will
-	 *        be included in the streamed file
-	 */
-	public function __construct(IRequest $request, int $size, int $numberOfFiles){
+    /**
+     * Streamer constructor.
+     *
+     * @param IRequest $request
+     * @param int $size The size of the files in bytes
+     * @param int $numberOfFiles The number of files (and directories) that will
+     *        be included in the streamed file
+     */
+    public function __construct(IRequest $request, int $size, int $numberOfFiles){
 
-		/**
-		 * zip32 constraints for a basic (without compression, volumes nor
-		 * encryption) zip file according to the Zip specification:
-		 * - No file size is larger than 4 bytes (file size < 4294967296); see
-		 *   4.4.9 uncompressed size
-		 * - The size of all files plus their local headers is not larger than
-		 *   4 bytes; see 4.4.16 relative offset of local header and 4.4.24
-		 *   offset of start of central directory with respect to the starting
-		 *   disk number
-		 * - The total number of entries (files and directories) in the zip file
-		 *   is not larger than 2 bytes (number of entries < 65536); see 4.4.22
-		 *   total number of entries in the central dir
-		 * - The size of the central directory is not larger than 4 bytes; see
-		 *   4.4.23 size of the central directory
-		 *
-		 * Due to all that, zip32 is used if the size is below 4GB and there are
-		 * less than 65536 files; the margin between 4*1000^3 and 4*1024^3
-		 * should give enough room for the extra zip metadata. Technically, it
-		 * would still be possible to create an invalid zip32 file (for example,
-		 * a zip file from files smaller than 4GB with a central directory
-		 * larger than 4GiB), but it should not happen in the real world.
-		 */
-		if ($size < 4 * 1000 * 1000 * 1000 && $numberOfFiles < 65536) {
-			$this->streamerInstance = new ZipStreamer(['zip64' => false]);
-		} else if ($request->isUserAgent($this->preferTarFor)) {
-			$this->streamerInstance = new TarStreamer();
-		} else {
-			$this->streamerInstance = new ZipStreamer(['zip64' => PHP_INT_SIZE !== 4]);
-		}
-	}
+        /**
+         * zip32 constraints for a basic (without compression, volumes nor
+         * encryption) zip file according to the Zip specification:
+         * - No file size is larger than 4 bytes (file size < 4294967296); see
+         *   4.4.9 uncompressed size
+         * - The size of all files plus their local headers is not larger than
+         *   4 bytes; see 4.4.16 relative offset of local header and 4.4.24
+         *   offset of start of central directory with respect to the starting
+         *   disk number
+         * - The total number of entries (files and directories) in the zip file
+         *   is not larger than 2 bytes (number of entries < 65536); see 4.4.22
+         *   total number of entries in the central dir
+         * - The size of the central directory is not larger than 4 bytes; see
+         *   4.4.23 size of the central directory
+         *
+         * Due to all that, zip32 is used if the size is below 4GB and there are
+         * less than 65536 files; the margin between 4*1000^3 and 4*1024^3
+         * should give enough room for the extra zip metadata. Technically, it
+         * would still be possible to create an invalid zip32 file (for example,
+         * a zip file from files smaller than 4GB with a central directory
+         * larger than 4GiB), but it should not happen in the real world.
+         */
+        if ($size < 4 * 1000 * 1000 * 1000 && $numberOfFiles < 65536) {
+            $this->streamerInstance = new ZipStreamer(['zip64' => false]);
+        } else if ($request->isUserAgent($this->preferTarFor)) {
+            $this->streamerInstance = new TarStreamer();
+        } else {
+            $this->streamerInstance = new ZipStreamer(['zip64' => PHP_INT_SIZE !== 4]);
+        }
+    }
 	
-	/**
-	 * Send HTTP headers
-	 * @param string $name 
-	 */
-	public function sendHeaders($name){
-		$extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
-		$fullName = $name . $extension;
-		$this->streamerInstance->sendHeaders($fullName);
-	}
+    /**
+     * Send HTTP headers
+     * @param string $name 
+     */
+    public function sendHeaders($name){
+        $extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
+        $fullName = $name . $extension;
+        $this->streamerInstance->sendHeaders($fullName);
+    }
 	
-	/**
-	 * Stream directory recursively
-	 * @param string $dir
-	 * @param string $internalDir
-	 */
-	public function addDirRecursive($dir, $internalDir='') {
-		$dirname = basename($dir);
-		$rootDir = $internalDir . $dirname;
-		if (!empty($rootDir)) {
-			$this->streamerInstance->addEmptyDir($rootDir);
-		}
-		$internalDir .= $dirname . '/';
-		// prevent absolute dirs
-		$internalDir = ltrim($internalDir, '/');
+    /**
+     * Stream directory recursively
+     * @param string $dir
+     * @param string $internalDir
+     */
+    public function addDirRecursive($dir, $internalDir='') {
+        $dirname = basename($dir);
+        $rootDir = $internalDir . $dirname;
+        if (!empty($rootDir)) {
+            $this->streamerInstance->addEmptyDir($rootDir);
+        }
+        $internalDir .= $dirname . '/';
+        // prevent absolute dirs
+        $internalDir = ltrim($internalDir, '/');
 
-		$files= \OC\Files\Filesystem::getDirectoryContent($dir);
-		foreach($files as $file) {
-			$filename = $file['name'];
-			$file = $dir . '/' . $filename;
-			if(\OC\Files\Filesystem::is_file($file)) {
-				$filesize = \OC\Files\Filesystem::filesize($file);
-				$fileTime = \OC\Files\Filesystem::filemtime($file);
-				$fh = \OC\Files\Filesystem::fopen($file, 'r');
-				$this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
-				fclose($fh);
-			}elseif(\OC\Files\Filesystem::is_dir($file)) {
-				$this->addDirRecursive($file, $internalDir);
-			}
-		}
-	}
+        $files= \OC\Files\Filesystem::getDirectoryContent($dir);
+        foreach($files as $file) {
+            $filename = $file['name'];
+            $file = $dir . '/' . $filename;
+            if(\OC\Files\Filesystem::is_file($file)) {
+                $filesize = \OC\Files\Filesystem::filesize($file);
+                $fileTime = \OC\Files\Filesystem::filemtime($file);
+                $fh = \OC\Files\Filesystem::fopen($file, 'r');
+                $this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
+                fclose($fh);
+            }elseif(\OC\Files\Filesystem::is_dir($file)) {
+                $this->addDirRecursive($file, $internalDir);
+            }
+        }
+    }
 	
-	/**
-	 * Add a file to the archive at the specified location and file name.
-	 *
-	 * @param string $stream Stream to read data from
-	 * @param string $internalName Filepath and name to be used in the archive.
-	 * @param int $size Filesize
-	 * @param int|bool $time File mtime as int, or false
-	 * @return bool $success
-	 */
-	public function addFileFromStream($stream, $internalName, $size, $time) {
-		$options = [];
-		if ($time) {
-			$options = [
-				'timestamp' => $time
-			];
-		}
+    /**
+     * Add a file to the archive at the specified location and file name.
+     *
+     * @param string $stream Stream to read data from
+     * @param string $internalName Filepath and name to be used in the archive.
+     * @param int $size Filesize
+     * @param int|bool $time File mtime as int, or false
+     * @return bool $success
+     */
+    public function addFileFromStream($stream, $internalName, $size, $time) {
+        $options = [];
+        if ($time) {
+            $options = [
+                'timestamp' => $time
+            ];
+        }
 
-		if ($this->streamerInstance instanceof ZipStreamer) {
-			return $this->streamerInstance->addFileFromStream($stream, $internalName, $options);
-		} else {
-			return $this->streamerInstance->addFileFromStream($stream, $internalName, $size, $options);
-		}
-	}
+        if ($this->streamerInstance instanceof ZipStreamer) {
+            return $this->streamerInstance->addFileFromStream($stream, $internalName, $options);
+        } else {
+            return $this->streamerInstance->addFileFromStream($stream, $internalName, $size, $options);
+        }
+    }
 
-	/**
-	 * Add an empty directory entry to the archive.
-	 *
-	 * @param string $dirName Directory Path and name to be added to the archive.
-	 * @return bool $success
-	 */
-	public function addEmptyDir($dirName){
-		return $this->streamerInstance->addEmptyDir($dirName);
-	}
+    /**
+     * Add an empty directory entry to the archive.
+     *
+     * @param string $dirName Directory Path and name to be added to the archive.
+     * @return bool $success
+     */
+    public function addEmptyDir($dirName){
+        return $this->streamerInstance->addEmptyDir($dirName);
+    }
 
-	/**
-	 * Close the archive.
-	 * A closed archive can no longer have new files added to it. After
-	 * closing, the file is completely written to the output stream.
-	 * @return bool $success
-	 */
-	public function finalize(){
-		return $this->streamerInstance->finalize();
-	}
+    /**
+     * Close the archive.
+     * A closed archive can no longer have new files added to it. After
+     * closing, the file is completely written to the output stream.
+     * @return bool $success
+     */
+    public function finalize(){
+        return $this->streamerInstance->finalize();
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -30,7 +30,7 @@ 
 
 class Streamer {
 	// array of regexp. Matching user agents will get tar instead of zip
-	private $preferTarFor = [ '/macintosh|mac os x/i' ];
+	private $preferTarFor = ['/macintosh|mac os x/i'];
 
 	// streamer instance
 	private $streamerInstance;
@@ -43,7 +43,7 @@ 
 	 * @param int $numberOfFiles The number of files (and directories) that will
 	 *        be included in the streamed file
 	 */
-	public function __construct(IRequest $request, int $size, int $numberOfFiles){
+	public function __construct(IRequest $request, int $size, int $numberOfFiles) {
 
 		/**
 		 * zip32 constraints for a basic (without compression, volumes nor
@@ -80,9 +80,9 @@ 
 	 * Send HTTP headers
 	 * @param string $name 
 	 */
-	public function sendHeaders($name){
+	public function sendHeaders($name) {
 		$extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
-		$fullName = $name . $extension;
+		$fullName = $name.$extension;
 		$this->streamerInstance->sendHeaders($fullName);
 	}
 	
@@ -91,27 +91,27 @@ 
 	 * @param string $dir
 	 * @param string $internalDir
 	 */
-	public function addDirRecursive($dir, $internalDir='') {
+	public function addDirRecursive($dir, $internalDir = '') {
 		$dirname = basename($dir);
-		$rootDir = $internalDir . $dirname;
+		$rootDir = $internalDir.$dirname;
 		if (!empty($rootDir)) {
 			$this->streamerInstance->addEmptyDir($rootDir);
 		}
-		$internalDir .= $dirname . '/';
+		$internalDir .= $dirname.'/';
 		// prevent absolute dirs
 		$internalDir = ltrim($internalDir, '/');
 
-		$files= \OC\Files\Filesystem::getDirectoryContent($dir);
-		foreach($files as $file) {
+		$files = \OC\Files\Filesystem::getDirectoryContent($dir);
+		foreach ($files as $file) {
 			$filename = $file['name'];
-			$file = $dir . '/' . $filename;
-			if(\OC\Files\Filesystem::is_file($file)) {
+			$file = $dir.'/'.$filename;
+			if (\OC\Files\Filesystem::is_file($file)) {
 				$filesize = \OC\Files\Filesystem::filesize($file);
 				$fileTime = \OC\Files\Filesystem::filemtime($file);
 				$fh = \OC\Files\Filesystem::fopen($file, 'r');
-				$this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
+				$this->addFileFromStream($fh, $internalDir.$filename, $filesize, $fileTime);
 				fclose($fh);
-			}elseif(\OC\Files\Filesystem::is_dir($file)) {
+			}elseif (\OC\Files\Filesystem::is_dir($file)) {
 				$this->addDirRecursive($file, $internalDir);
 			}
 		}
@@ -147,7 +147,7 @@ 
 	 * @param string $dirName Directory Path and name to be added to the archive.
 	 * @return bool $success
 	 */
-	public function addEmptyDir($dirName){
+	public function addEmptyDir($dirName) {
 		return $this->streamerInstance->addEmptyDir($dirName);
 	}
 
@@ -157,7 +157,7 @@ 
 	 * closing, the file is completely written to the output stream.
 	 * @return bool $success
 	 */
-	public function finalize(){
+	public function finalize() {
 		return $this->streamerInstance->finalize();
 	}
 }

lib/private/Memcache/CASTrait.php

Indentation +27 added lines, -27 removed lines

@@ -23,35 +23,35 @@
 namespace OC\Memcache;
 
 trait CASTrait {
-	abstract public function get($key);
+    abstract public function get($key);
 
-	abstract public function set($key, $value, $ttl = 0);
+    abstract public function set($key, $value, $ttl = 0);
 
-	abstract public function remove($key);
+    abstract public function remove($key);
 
-	abstract public function add($key, $value, $ttl = 0);
+    abstract public function add($key, $value, $ttl = 0);
 
-	/**
-	 * Compare and set
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @param mixed $new
-	 * @return bool
-	 */
-	public function cas($key, $old, $new) {
-		//no native cas, emulate with locking
-		if ($this->add($key . '_lock', true)) {
-			if ($this->get($key) === $old) {
-				$this->set($key, $new);
-				$this->remove($key . '_lock');
-				return true;
-			} else {
-				$this->remove($key . '_lock');
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Compare and set
+     *
+     * @param string $key
+     * @param mixed $old
+     * @param mixed $new
+     * @return bool
+     */
+    public function cas($key, $old, $new) {
+        //no native cas, emulate with locking
+        if ($this->add($key . '_lock', true)) {
+            if ($this->get($key) === $old) {
+                $this->set($key, $new);
+                $this->remove($key . '_lock');
+                return true;
+            } else {
+                $this->remove($key . '_lock');
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

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

lib/private/Memcache/Cache.php

Indentation +56 added lines, -56 removed lines

@@ -26,72 +26,72 @@
 namespace OC\Memcache;
 
 abstract class Cache implements \ArrayAccess, \OCP\ICache {
-	/**
-	 * @var string $prefix
-	 */
-	protected $prefix;
+    /**
+     * @var string $prefix
+     */
+    protected $prefix;
 
-	/**
-	 * @param string $prefix
-	 */
-	public function __construct($prefix = '') {
-		$this->prefix = $prefix;
-	}
+    /**
+     * @param string $prefix
+     */
+    public function __construct($prefix = '') {
+        $this->prefix = $prefix;
+    }
 
-	/**
-	 * @return string Prefix used for caching purposes
-	 */
-	public function getPrefix() {
-		return $this->prefix;
-	}
+    /**
+     * @return string Prefix used for caching purposes
+     */
+    public function getPrefix() {
+        return $this->prefix;
+    }
 
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	abstract public function get($key);
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    abstract public function get($key);
 
-	/**
-	 * @param string $key
-	 * @param mixed $value
-	 * @param int $ttl
-	 * @return mixed
-	 */
-	abstract public function set($key, $value, $ttl = 0);
+    /**
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl
+     * @return mixed
+     */
+    abstract public function set($key, $value, $ttl = 0);
 
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	abstract public function hasKey($key);
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    abstract public function hasKey($key);
 
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	abstract public function remove($key);
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    abstract public function remove($key);
 
-	/**
-	 * @param string $prefix
-	 * @return mixed
-	 */
-	abstract public function clear($prefix = '');
+    /**
+     * @param string $prefix
+     * @return mixed
+     */
+    abstract public function clear($prefix = '');
 
-	//implement the ArrayAccess interface
+    //implement the ArrayAccess interface
 
-	public function offsetExists($offset) {
-		return $this->hasKey($offset);
-	}
+    public function offsetExists($offset) {
+        return $this->hasKey($offset);
+    }
 
-	public function offsetSet($offset, $value) {
-		$this->set($offset, $value);
-	}
+    public function offsetSet($offset, $value) {
+        $this->set($offset, $value);
+    }
 
-	public function offsetGet($offset) {
-		return $this->get($offset);
-	}
+    public function offsetGet($offset) {
+        return $this->get($offset);
+    }
 
-	public function offsetUnset($offset) {
-		$this->remove($offset);
-	}
+    public function offsetUnset($offset) {
+        $this->remove($offset);
+    }
 }

lib/private/Memcache/CADTrait.php

Indentation +25 added lines, -25 removed lines

@@ -23,32 +23,32 @@
 namespace OC\Memcache;
 
 trait CADTrait {
-	abstract public function get($key);
+    abstract public function get($key);
 
-	abstract public function remove($key);
+    abstract public function remove($key);
 
-	abstract public function add($key, $value, $ttl = 0);
+    abstract public function add($key, $value, $ttl = 0);
 
-	/**
-	 * Compare and delete
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @return bool
-	 */
-	public function cad($key, $old) {
-		//no native cas, emulate with locking
-		if ($this->add($key . '_lock', true)) {
-			if ($this->get($key) === $old) {
-				$this->remove($key);
-				$this->remove($key . '_lock');
-				return true;
-			} else {
-				$this->remove($key . '_lock');
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Compare and delete
+     *
+     * @param string $key
+     * @param mixed $old
+     * @return bool
+     */
+    public function cad($key, $old) {
+        //no native cas, emulate with locking
+        if ($this->add($key . '_lock', true)) {
+            if ($this->get($key) === $old) {
+                $this->remove($key);
+                $this->remove($key . '_lock');
+                return true;
+            } else {
+                $this->remove($key . '_lock');
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

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

lib/private/Memcache/NullCache.php

Indentation +33 added lines, -33 removed lines

@@ -27,47 +27,47 @@
 namespace OC\Memcache;
 
 class NullCache extends Cache implements \OCP\IMemcache {
-	public function get($key) {
-		return null;
-	}
+    public function get($key) {
+        return null;
+    }
 
-	public function set($key, $value, $ttl = 0) {
-		return true;
-	}
+    public function set($key, $value, $ttl = 0) {
+        return true;
+    }
 
-	public function hasKey($key) {
-		return false;
-	}
+    public function hasKey($key) {
+        return false;
+    }
 
-	public function remove($key) {
-		return true;
-	}
+    public function remove($key) {
+        return true;
+    }
 
-	public function add($key, $value, $ttl = 0) {
-		return true;
-	}
+    public function add($key, $value, $ttl = 0) {
+        return true;
+    }
 
-	public function inc($key, $step = 1) {
-		return true;
-	}
+    public function inc($key, $step = 1) {
+        return true;
+    }
 
-	public function dec($key, $step = 1) {
-		return true;
-	}
+    public function dec($key, $step = 1) {
+        return true;
+    }
 
-	public function cas($key, $old, $new) {
-		return true;
-	}
+    public function cas($key, $old, $new) {
+        return true;
+    }
 
-	public function cad($key, $old) {
-		return true;
-	}
+    public function cad($key, $old) {
+        return true;
+    }
 
-	public function clear($prefix = '') {
-		return true;
-	}
+    public function clear($prefix = '') {
+        return true;
+    }
 
-	static public function isAvailable() {
-		return true;
-	}
+    static public function isAvailable() {
+        return true;
+    }
 }

lib/private/OCS/Result.php

Indentation +124 added lines, -124 removed lines

@@ -32,129 +32,129 @@
 
 class Result {
 
-	/** @var array  */
-	protected $data;
-
-	/** @var null|string */
-	protected $message;
-
-	/** @var int */
-	protected $statusCode;
-
-	/** @var integer */
-	protected $items;
-
-	/** @var integer */
-	protected $perPage;
-
-	/** @var array */
-	private $headers = [];
-
-	/**
-	 * create the OCS_Result object
-	 * @param mixed $data the data to return
-	 * @param int $code
-	 * @param null|string $message
-	 * @param array $headers
-	 */
-	public function __construct($data = null, $code = 100, $message = null, $headers = []) {
-		if ($data === null) {
-			$this->data = array();
-		} elseif (!is_array($data)) {
-			$this->data = array($this->data);
-		} else {
-			$this->data = $data;
-		}
-		$this->statusCode = $code;
-		$this->message = $message;
-		$this->headers = $headers;
-	}
-
-	/**
-	 * optionally set the total number of items available
-	 * @param int $items
-	 */
-	public function setTotalItems($items) {
-		$this->items = $items;
-	}
-
-	/**
-	 * optionally set the the number of items per page
-	 * @param int $items
-	 */
-	public function setItemsPerPage($items) {
-		$this->perPage = $items;
-	}
-
-	/**
-	 * get the status code
-	 * @return int
-	 */
-	public function getStatusCode() {
-		return $this->statusCode;
-	}
-
-	/**
-	 * get the meta data for the result
-	 * @return array
-	 */
-	public function getMeta() {
-		$meta = array();
-		$meta['status'] = $this->succeeded() ? 'ok' : 'failure';
-		$meta['statuscode'] = $this->statusCode;
-		$meta['message'] = $this->message;
-		if(isset($this->items)) {
-			$meta['totalitems'] = $this->items;
-		}
-		if(isset($this->perPage)) {
-			$meta['itemsperpage'] = $this->perPage;
-		}
-		return $meta;
-
-	}
-
-	/**
-	 * get the result data
-	 * @return array
-	 */
-	public function getData() {
-		return $this->data;
-	}
-
-	/**
-	 * return bool Whether the method succeeded
-	 * @return bool
-	 */
-	public function succeeded() {
-		return ($this->statusCode == 100);
-	}
-
-	/**
-	 * Adds a new header to the response
-	 * @param string $name The name of the HTTP header
-	 * @param string $value The value, null will delete it
-	 * @return $this
-	 */
-	public function addHeader($name, $value) {
-		$name = trim($name);  // always remove leading and trailing whitespace
-		// to be able to reliably check for security
-		// headers
-
-		if(is_null($value)) {
-			unset($this->headers[$name]);
-		} else {
-			$this->headers[$name] = $value;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Returns the set headers
-	 * @return array the headers
-	 */
-	public function getHeaders() {
-		return $this->headers;
-	}
+    /** @var array  */
+    protected $data;
+
+    /** @var null|string */
+    protected $message;
+
+    /** @var int */
+    protected $statusCode;
+
+    /** @var integer */
+    protected $items;
+
+    /** @var integer */
+    protected $perPage;
+
+    /** @var array */
+    private $headers = [];
+
+    /**
+     * create the OCS_Result object
+     * @param mixed $data the data to return
+     * @param int $code
+     * @param null|string $message
+     * @param array $headers
+     */
+    public function __construct($data = null, $code = 100, $message = null, $headers = []) {
+        if ($data === null) {
+            $this->data = array();
+        } elseif (!is_array($data)) {
+            $this->data = array($this->data);
+        } else {
+            $this->data = $data;
+        }
+        $this->statusCode = $code;
+        $this->message = $message;
+        $this->headers = $headers;
+    }
+
+    /**
+     * optionally set the total number of items available
+     * @param int $items
+     */
+    public function setTotalItems($items) {
+        $this->items = $items;
+    }
+
+    /**
+     * optionally set the the number of items per page
+     * @param int $items
+     */
+    public function setItemsPerPage($items) {
+        $this->perPage = $items;
+    }
+
+    /**
+     * get the status code
+     * @return int
+     */
+    public function getStatusCode() {
+        return $this->statusCode;
+    }
+
+    /**
+     * get the meta data for the result
+     * @return array
+     */
+    public function getMeta() {
+        $meta = array();
+        $meta['status'] = $this->succeeded() ? 'ok' : 'failure';
+        $meta['statuscode'] = $this->statusCode;
+        $meta['message'] = $this->message;
+        if(isset($this->items)) {
+            $meta['totalitems'] = $this->items;
+        }
+        if(isset($this->perPage)) {
+            $meta['itemsperpage'] = $this->perPage;
+        }
+        return $meta;
+
+    }
+
+    /**
+     * get the result data
+     * @return array
+     */
+    public function getData() {
+        return $this->data;
+    }
+
+    /**
+     * return bool Whether the method succeeded
+     * @return bool
+     */
+    public function succeeded() {
+        return ($this->statusCode == 100);
+    }
+
+    /**
+     * Adds a new header to the response
+     * @param string $name The name of the HTTP header
+     * @param string $value The value, null will delete it
+     * @return $this
+     */
+    public function addHeader($name, $value) {
+        $name = trim($name);  // always remove leading and trailing whitespace
+        // to be able to reliably check for security
+        // headers
+
+        if(is_null($value)) {
+            unset($this->headers[$name]);
+        } else {
+            $this->headers[$name] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the set headers
+     * @return array the headers
+     */
+    public function getHeaders() {
+        return $this->headers;
+    }
 
 }

Spacing +4 added lines, -4 removed lines

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

lib/private/OCS/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/Root.php

Spacing +4 added lines, -4 removed lines

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

Indentation +335 added lines, -335 removed lines

@@ -61,339 +61,339 @@
  * @package OC\Files\Node
  */
 class Root extends Folder implements IRootFolder {
-	/** @var Manager */
-	private $mountManager;
-	/** @var PublicEmitter */
-	private $emitter;
-	/** @var null|\OC\User\User */
-	private $user;
-	/** @var CappedMemoryCache */
-	private $userFolderCache;
-	/** @var IUserMountCache */
-	private $userMountCache;
-	/** @var ILogger */
-	private $logger;
-	/** @var IUserManager */
-	private $userManager;
-
-	/**
-	 * @param \OC\Files\Mount\Manager $manager
-	 * @param \OC\Files\View $view
-	 * @param \OC\User\User|null $user
-	 * @param IUserMountCache $userMountCache
-	 * @param ILogger $logger
-	 * @param IUserManager $userManager
-	 */
-	public function __construct($manager,
-								$view,
-								$user,
-								IUserMountCache $userMountCache,
-								ILogger $logger,
-								IUserManager $userManager) {
-		parent::__construct($this, $view, '');
-		$this->mountManager = $manager;
-		$this->user = $user;
-		$this->emitter = new PublicEmitter();
-		$this->userFolderCache = new CappedMemoryCache();
-		$this->userMountCache = $userMountCache;
-		$this->logger = $logger;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * Get the user for which the filesystem is setup
-	 *
-	 * @return \OC\User\User
-	 */
-	public function getUser() {
-		return $this->user;
-	}
-
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param callable $callback
-	 */
-	public function listen($scope, $method, callable $callback) {
-		$this->emitter->listen($scope, $method, $callback);
-	}
-
-	/**
-	 * @param string $scope optional
-	 * @param string $method optional
-	 * @param callable $callback optional
-	 */
-	public function removeListener($scope = null, $method = null, callable $callback = null) {
-		$this->emitter->removeListener($scope, $method, $callback);
-	}
-
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param Node[] $arguments
-	 */
-	public function emit($scope, $method, $arguments = array()) {
-		$this->emitter->emit($scope, $method, $arguments);
-	}
-
-	/**
-	 * @param \OC\Files\Storage\Storage $storage
-	 * @param string $mountPoint
-	 * @param array $arguments
-	 */
-	public function mount($storage, $mountPoint, $arguments = array()) {
-		$mount = new MountPoint($storage, $mountPoint, $arguments);
-		$this->mountManager->addMount($mount);
-	}
-
-	/**
-	 * @param string $mountPoint
-	 * @return \OC\Files\Mount\MountPoint
-	 */
-	public function getMount($mountPoint) {
-		return $this->mountManager->find($mountPoint);
-	}
-
-	/**
-	 * @param string $mountPoint
-	 * @return \OC\Files\Mount\MountPoint[]
-	 */
-	public function getMountsIn($mountPoint) {
-		return $this->mountManager->findIn($mountPoint);
-	}
-
-	/**
-	 * @param string $storageId
-	 * @return \OC\Files\Mount\MountPoint[]
-	 */
-	public function getMountByStorageId($storageId) {
-		return $this->mountManager->findByStorageId($storageId);
-	}
-
-	/**
-	 * @param int $numericId
-	 * @return MountPoint[]
-	 */
-	public function getMountByNumericStorageId($numericId) {
-		return $this->mountManager->findByNumericId($numericId);
-	}
-
-	/**
-	 * @param \OC\Files\Mount\MountPoint $mount
-	 */
-	public function unMount($mount) {
-		$this->mountManager->remove($mount);
-	}
-
-	/**
-	 * @param string $path
-	 * @throws \OCP\Files\NotFoundException
-	 * @throws \OCP\Files\NotPermittedException
-	 * @return string
-	 */
-	public function get($path) {
-		$path = $this->normalizePath($path);
-		if ($this->isValidPath($path)) {
-			$fullPath = $this->getFullPath($path);
-			$fileInfo = $this->view->getFileInfo($fullPath);
-			if ($fileInfo) {
-				return $this->createNode($fullPath, $fileInfo);
-			} else {
-				throw new NotFoundException($path);
-			}
-		} else {
-			throw new NotPermittedException();
-		}
-	}
-
-	//most operations can't be done on the root
-
-	/**
-	 * @param string $targetPath
-	 * @throws \OCP\Files\NotPermittedException
-	 * @return \OC\Files\Node\Node
-	 */
-	public function rename($targetPath) {
-		throw new NotPermittedException();
-	}
-
-	public function delete() {
-		throw new NotPermittedException();
-	}
-
-	/**
-	 * @param string $targetPath
-	 * @throws \OCP\Files\NotPermittedException
-	 * @return \OC\Files\Node\Node
-	 */
-	public function copy($targetPath) {
-		throw new NotPermittedException();
-	}
-
-	/**
-	 * @param int $mtime
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function touch($mtime = null) {
-		throw new NotPermittedException();
-	}
-
-	/**
-	 * @return \OC\Files\Storage\Storage
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function getStorage() {
-		throw new NotFoundException();
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPath() {
-		return '/';
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getInternalPath() {
-		return '';
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getId() {
-		return null;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function stat() {
-		return null;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getMTime() {
-		return null;
-	}
-
-	/**
-	 * @param bool $includeMounts
-	 * @return int
-	 */
-	public function getSize($includeMounts = true) {
-		return null;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getEtag() {
-		return null;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getPermissions() {
-		return \OCP\Constants::PERMISSION_CREATE;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isReadable() {
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isUpdateable() {
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isDeletable() {
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isShareable() {
-		return false;
-	}
-
-	/**
-	 * @return Node
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function getParent() {
-		throw new NotFoundException();
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return '';
-	}
-
-	/**
-	 * Returns a view to user's files folder
-	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\Folder
-	 * @throws \OC\User\NoUserException
-	 */
-	public function getUserFolder($userId) {
-		$userObject = $this->userManager->get($userId);
-
-		if (is_null($userObject)) {
-			$this->logger->error(
-				sprintf(
-					'Backends provided no user object for %s',
-					$userId
-				),
-				[
-					'app' => 'files',
-				]
-			);
-			throw new \OC\User\NoUserException('Backends provided no user object');
-		}
-
-		$userId = $userObject->getUID();
-
-		if (!$this->userFolderCache->hasKey($userId)) {
-			\OC\Files\Filesystem::initMountPoints($userId);
-
-			try {
-				$folder = $this->get('/' . $userId . '/files');
-			} catch (NotFoundException $e) {
-				if (!$this->nodeExists('/' . $userId)) {
-					$this->newFolder('/' . $userId);
-				}
-				$folder = $this->newFolder('/' . $userId . '/files');
-			}
-
-			$this->userFolderCache->set($userId, $folder);
-		}
-
-		return $this->userFolderCache->get($userId);
-	}
-
-	public function clearCache() {
-		$this->userFolderCache = new CappedMemoryCache();
-	}
-
-	public function getUserMountCache() {
-		return $this->userMountCache;
-	}
+    /** @var Manager */
+    private $mountManager;
+    /** @var PublicEmitter */
+    private $emitter;
+    /** @var null|\OC\User\User */
+    private $user;
+    /** @var CappedMemoryCache */
+    private $userFolderCache;
+    /** @var IUserMountCache */
+    private $userMountCache;
+    /** @var ILogger */
+    private $logger;
+    /** @var IUserManager */
+    private $userManager;
+
+    /**
+     * @param \OC\Files\Mount\Manager $manager
+     * @param \OC\Files\View $view
+     * @param \OC\User\User|null $user
+     * @param IUserMountCache $userMountCache
+     * @param ILogger $logger
+     * @param IUserManager $userManager
+     */
+    public function __construct($manager,
+                                $view,
+                                $user,
+                                IUserMountCache $userMountCache,
+                                ILogger $logger,
+                                IUserManager $userManager) {
+        parent::__construct($this, $view, '');
+        $this->mountManager = $manager;
+        $this->user = $user;
+        $this->emitter = new PublicEmitter();
+        $this->userFolderCache = new CappedMemoryCache();
+        $this->userMountCache = $userMountCache;
+        $this->logger = $logger;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * Get the user for which the filesystem is setup
+     *
+     * @return \OC\User\User
+     */
+    public function getUser() {
+        return $this->user;
+    }
+
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param callable $callback
+     */
+    public function listen($scope, $method, callable $callback) {
+        $this->emitter->listen($scope, $method, $callback);
+    }
+
+    /**
+     * @param string $scope optional
+     * @param string $method optional
+     * @param callable $callback optional
+     */
+    public function removeListener($scope = null, $method = null, callable $callback = null) {
+        $this->emitter->removeListener($scope, $method, $callback);
+    }
+
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param Node[] $arguments
+     */
+    public function emit($scope, $method, $arguments = array()) {
+        $this->emitter->emit($scope, $method, $arguments);
+    }
+
+    /**
+     * @param \OC\Files\Storage\Storage $storage
+     * @param string $mountPoint
+     * @param array $arguments
+     */
+    public function mount($storage, $mountPoint, $arguments = array()) {
+        $mount = new MountPoint($storage, $mountPoint, $arguments);
+        $this->mountManager->addMount($mount);
+    }
+
+    /**
+     * @param string $mountPoint
+     * @return \OC\Files\Mount\MountPoint
+     */
+    public function getMount($mountPoint) {
+        return $this->mountManager->find($mountPoint);
+    }
+
+    /**
+     * @param string $mountPoint
+     * @return \OC\Files\Mount\MountPoint[]
+     */
+    public function getMountsIn($mountPoint) {
+        return $this->mountManager->findIn($mountPoint);
+    }
+
+    /**
+     * @param string $storageId
+     * @return \OC\Files\Mount\MountPoint[]
+     */
+    public function getMountByStorageId($storageId) {
+        return $this->mountManager->findByStorageId($storageId);
+    }
+
+    /**
+     * @param int $numericId
+     * @return MountPoint[]
+     */
+    public function getMountByNumericStorageId($numericId) {
+        return $this->mountManager->findByNumericId($numericId);
+    }
+
+    /**
+     * @param \OC\Files\Mount\MountPoint $mount
+     */
+    public function unMount($mount) {
+        $this->mountManager->remove($mount);
+    }
+
+    /**
+     * @param string $path
+     * @throws \OCP\Files\NotFoundException
+     * @throws \OCP\Files\NotPermittedException
+     * @return string
+     */
+    public function get($path) {
+        $path = $this->normalizePath($path);
+        if ($this->isValidPath($path)) {
+            $fullPath = $this->getFullPath($path);
+            $fileInfo = $this->view->getFileInfo($fullPath);
+            if ($fileInfo) {
+                return $this->createNode($fullPath, $fileInfo);
+            } else {
+                throw new NotFoundException($path);
+            }
+        } else {
+            throw new NotPermittedException();
+        }
+    }
+
+    //most operations can't be done on the root
+
+    /**
+     * @param string $targetPath
+     * @throws \OCP\Files\NotPermittedException
+     * @return \OC\Files\Node\Node
+     */
+    public function rename($targetPath) {
+        throw new NotPermittedException();
+    }
+
+    public function delete() {
+        throw new NotPermittedException();
+    }
+
+    /**
+     * @param string $targetPath
+     * @throws \OCP\Files\NotPermittedException
+     * @return \OC\Files\Node\Node
+     */
+    public function copy($targetPath) {
+        throw new NotPermittedException();
+    }
+
+    /**
+     * @param int $mtime
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function touch($mtime = null) {
+        throw new NotPermittedException();
+    }
+
+    /**
+     * @return \OC\Files\Storage\Storage
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function getStorage() {
+        throw new NotFoundException();
+    }
+
+    /**
+     * @return string
+     */
+    public function getPath() {
+        return '/';
+    }
+
+    /**
+     * @return string
+     */
+    public function getInternalPath() {
+        return '';
+    }
+
+    /**
+     * @return int
+     */
+    public function getId() {
+        return null;
+    }
+
+    /**
+     * @return array
+     */
+    public function stat() {
+        return null;
+    }
+
+    /**
+     * @return int
+     */
+    public function getMTime() {
+        return null;
+    }
+
+    /**
+     * @param bool $includeMounts
+     * @return int
+     */
+    public function getSize($includeMounts = true) {
+        return null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEtag() {
+        return null;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPermissions() {
+        return \OCP\Constants::PERMISSION_CREATE;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isReadable() {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isUpdateable() {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isDeletable() {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isShareable() {
+        return false;
+    }
+
+    /**
+     * @return Node
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function getParent() {
+        throw new NotFoundException();
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return '';
+    }
+
+    /**
+     * Returns a view to user's files folder
+     *
+     * @param string $userId user ID
+     * @return \OCP\Files\Folder
+     * @throws \OC\User\NoUserException
+     */
+    public function getUserFolder($userId) {
+        $userObject = $this->userManager->get($userId);
+
+        if (is_null($userObject)) {
+            $this->logger->error(
+                sprintf(
+                    'Backends provided no user object for %s',
+                    $userId
+                ),
+                [
+                    'app' => 'files',
+                ]
+            );
+            throw new \OC\User\NoUserException('Backends provided no user object');
+        }
+
+        $userId = $userObject->getUID();
+
+        if (!$this->userFolderCache->hasKey($userId)) {
+            \OC\Files\Filesystem::initMountPoints($userId);
+
+            try {
+                $folder = $this->get('/' . $userId . '/files');
+            } catch (NotFoundException $e) {
+                if (!$this->nodeExists('/' . $userId)) {
+                    $this->newFolder('/' . $userId);
+                }
+                $folder = $this->newFolder('/' . $userId . '/files');
+            }
+
+            $this->userFolderCache->set($userId, $folder);
+        }
+
+        return $this->userFolderCache->get($userId);
+    }
+
+    public function clearCache() {
+        $this->userFolderCache = new CappedMemoryCache();
+    }
+
+    public function getUserMountCache() {
+        return $this->userMountCache;
+    }
 }

lib/private/Files/Node/Node.php

Spacing +6 added lines, -6 removed lines

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

Indentation +396 added lines, -396 removed lines

@@ -35,401 +35,401 @@
 
 // FIXME: this class really should be abstract
 class Node implements \OCP\Files\Node {
-	/**
-	 * @var \OC\Files\View $view
-	 */
-	protected $view;
-
-	/**
-	 * @var \OC\Files\Node\Root $root
-	 */
-	protected $root;
-
-	/**
-	 * @var string $path
-	 */
-	protected $path;
-
-	/**
-	 * @var \OCP\Files\FileInfo
-	 */
-	protected $fileInfo;
-
-	/**
-	 * @param \OC\Files\View $view
-	 * @param \OCP\Files\IRootFolder $root
-	 * @param string $path
-	 * @param FileInfo $fileInfo
-	 */
-	public function __construct($root, $view, $path, $fileInfo = null) {
-		$this->view = $view;
-		$this->root = $root;
-		$this->path = $path;
-		$this->fileInfo = $fileInfo;
-	}
-
-	/**
-	 * Creates a Node of the same type that represents a non-existing path
-	 *
-	 * @param string $path path
-	 * @return string non-existing node class
-	 */
-	protected function createNonExistingNode($path) {
-		throw new \Exception('Must be implemented by subclasses');
-	}
-
-	/**
-	 * Returns the matching file info
-	 *
-	 * @return FileInfo
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function getFileInfo() {
-		if (!Filesystem::isValidPath($this->path)) {
-			throw new InvalidPathException();
-		}
-		if (!$this->fileInfo) {
-			$fileInfo = $this->view->getFileInfo($this->path);
-			if ($fileInfo instanceof FileInfo) {
-				$this->fileInfo = $fileInfo;
-			} else {
-				throw new NotFoundException();
-			}
-		}
-		return $this->fileInfo;
-	}
-
-	/**
-	 * @param string[] $hooks
-	 */
-	protected function sendHooks($hooks) {
-		foreach ($hooks as $hook) {
-			$this->root->emit('\OC\Files', $hook, array($this));
-		}
-	}
-
-	/**
-	 * @param int $permissions
-	 * @return bool
-	 */
-	protected function checkPermissions($permissions) {
-		return ($this->getPermissions() & $permissions) === $permissions;
-	}
-
-	public function delete() {
-	}
-
-	/**
-	 * @param int $mtime
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function touch($mtime = null) {
-		if ($this->checkPermissions(\OCP\Constants::PERMISSION_UPDATE)) {
-			$this->sendHooks(array('preTouch'));
-			$this->view->touch($this->path, $mtime);
-			$this->sendHooks(array('postTouch'));
-			if ($this->fileInfo) {
-				if (is_null($mtime)) {
-					$mtime = time();
-				}
-				$this->fileInfo['mtime'] = $mtime;
-			}
-		} else {
-			throw new NotPermittedException();
-		}
-	}
-
-	/**
-	 * @return \OC\Files\Storage\Storage
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function getStorage() {
-		list($storage,) = $this->view->resolvePath($this->path);
-		return $storage;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPath() {
-		return $this->path;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getInternalPath() {
-		list(, $internalPath) = $this->view->resolvePath($this->path);
-		return $internalPath;
-	}
-
-	/**
-	 * @return int
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function getId() {
-		return $this->getFileInfo()->getId();
-	}
-
-	/**
-	 * @return array
-	 */
-	public function stat() {
-		return $this->view->stat($this->path);
-	}
-
-	/**
-	 * @return int
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function getMTime() {
-		return $this->getFileInfo()->getMTime();
-	}
-
-	/**
-	 * @param bool $includeMounts
-	 * @return int
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function getSize($includeMounts = true) {
-		return $this->getFileInfo()->getSize($includeMounts);
-	}
-
-	/**
-	 * @return string
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function getEtag() {
-		return $this->getFileInfo()->getEtag();
-	}
-
-	/**
-	 * @return int
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function getPermissions() {
-		return $this->getFileInfo()->getPermissions();
-	}
-
-	/**
-	 * @return bool
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function isReadable() {
-		return $this->getFileInfo()->isReadable();
-	}
-
-	/**
-	 * @return bool
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function isUpdateable() {
-		return $this->getFileInfo()->isUpdateable();
-	}
-
-	/**
-	 * @return bool
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function isDeletable() {
-		return $this->getFileInfo()->isDeletable();
-	}
-
-	/**
-	 * @return bool
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function isShareable() {
-		return $this->getFileInfo()->isShareable();
-	}
-
-	/**
-	 * @return bool
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function isCreatable() {
-		return $this->getFileInfo()->isCreatable();
-	}
-
-	/**
-	 * @return Node
-	 */
-	public function getParent() {
-		$newPath = dirname($this->path);
-		if ($newPath === '' || $newPath === '.' || $newPath === '/') {
-			return $this->root;
-		}
-		return $this->root->get($newPath);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return basename($this->path);
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	protected function normalizePath($path) {
-		if ($path === '' or $path === '/') {
-			return '/';
-		}
-		//no windows style slashes
-		$path = str_replace('\\', '/', $path);
-		//add leading slash
-		if ($path[0] !== '/') {
-			$path = '/' . $path;
-		}
-		//remove duplicate slashes
-		while (strpos($path, '//') !== false) {
-			$path = str_replace('//', '/', $path);
-		}
-		//remove trailing slash
-		$path = rtrim($path, '/');
-
-		return $path;
-	}
-
-	/**
-	 * check if the requested path is valid
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isValidPath($path) {
-		if (!$path || $path[0] !== '/') {
-			$path = '/' . $path;
-		}
-		if (strstr($path, '/../') || strrchr($path, '/') === '/..') {
-			return false;
-		}
-		return true;
-	}
-
-	public function isMounted() {
-		return $this->getFileInfo()->isMounted();
-	}
-
-	public function isShared() {
-		return $this->getFileInfo()->isShared();
-	}
-
-	public function getMimeType() {
-		return $this->getFileInfo()->getMimetype();
-	}
-
-	public function getMimePart() {
-		return $this->getFileInfo()->getMimePart();
-	}
-
-	public function getType() {
-		return $this->getFileInfo()->getType();
-	}
-
-	public function isEncrypted() {
-		return $this->getFileInfo()->isEncrypted();
-	}
-
-	public function getMountPoint() {
-		return $this->getFileInfo()->getMountPoint();
-	}
-
-	public function getOwner() {
-		return $this->getFileInfo()->getOwner();
-	}
-
-	public function getChecksum() {
-	}
-
-	public function getExtension(): string {
-		return $this->getFileInfo()->getExtension();
-	}
-
-	/**
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function lock($type) {
-		$this->view->lockFile($this->path, $type);
-	}
-
-	/**
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function changeLock($type) {
-		$this->view->changeLock($this->path, $type);
-	}
-
-	/**
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function unlock($type) {
-		$this->view->unlockFile($this->path, $type);
-	}
-
-	/**
-	 * @param string $targetPath
-	 * @throws \OCP\Files\NotPermittedException if copy not allowed or failed
-	 * @return \OC\Files\Node\Node
-	 */
-	public function copy($targetPath) {
-		$targetPath = $this->normalizePath($targetPath);
-		$parent = $this->root->get(dirname($targetPath));
-		if ($parent instanceof Folder and $this->isValidPath($targetPath) and $parent->isCreatable()) {
-			$nonExisting = $this->createNonExistingNode($targetPath);
-			$this->root->emit('\OC\Files', 'preCopy', [$this, $nonExisting]);
-			$this->root->emit('\OC\Files', 'preWrite', [$nonExisting]);
-			if (!$this->view->copy($this->path, $targetPath)) {
-				throw new NotPermittedException('Could not copy ' . $this->path . ' to ' . $targetPath);
-			}
-			$targetNode = $this->root->get($targetPath);
-			$this->root->emit('\OC\Files', 'postCopy', [$this, $targetNode]);
-			$this->root->emit('\OC\Files', 'postWrite', [$targetNode]);
-			return $targetNode;
-		} else {
-			throw new NotPermittedException('No permission to copy to path ' . $targetPath);
-		}
-	}
-
-	/**
-	 * @param string $targetPath
-	 * @throws \OCP\Files\NotPermittedException if move not allowed or failed
-	 * @return \OC\Files\Node\Node
-	 */
-	public function move($targetPath) {
-		$targetPath = $this->normalizePath($targetPath);
-		$parent = $this->root->get(dirname($targetPath));
-		if ($parent instanceof Folder and $this->isValidPath($targetPath) and $parent->isCreatable()) {
-			$nonExisting = $this->createNonExistingNode($targetPath);
-			$this->root->emit('\OC\Files', 'preRename', [$this, $nonExisting]);
-			$this->root->emit('\OC\Files', 'preWrite', [$nonExisting]);
-			if (!$this->view->rename($this->path, $targetPath)) {
-				throw new NotPermittedException('Could not move ' . $this->path . ' to ' . $targetPath);
-			}
-			$targetNode = $this->root->get($targetPath);
-			$this->root->emit('\OC\Files', 'postRename', [$this, $targetNode]);
-			$this->root->emit('\OC\Files', 'postWrite', [$targetNode]);
-			$this->path = $targetPath;
-			return $targetNode;
-		} else {
-			throw new NotPermittedException('No permission to move to path ' . $targetPath);
-		}
-	}
+    /**
+     * @var \OC\Files\View $view
+     */
+    protected $view;
+
+    /**
+     * @var \OC\Files\Node\Root $root
+     */
+    protected $root;
+
+    /**
+     * @var string $path
+     */
+    protected $path;
+
+    /**
+     * @var \OCP\Files\FileInfo
+     */
+    protected $fileInfo;
+
+    /**
+     * @param \OC\Files\View $view
+     * @param \OCP\Files\IRootFolder $root
+     * @param string $path
+     * @param FileInfo $fileInfo
+     */
+    public function __construct($root, $view, $path, $fileInfo = null) {
+        $this->view = $view;
+        $this->root = $root;
+        $this->path = $path;
+        $this->fileInfo = $fileInfo;
+    }
+
+    /**
+     * Creates a Node of the same type that represents a non-existing path
+     *
+     * @param string $path path
+     * @return string non-existing node class
+     */
+    protected function createNonExistingNode($path) {
+        throw new \Exception('Must be implemented by subclasses');
+    }
+
+    /**
+     * Returns the matching file info
+     *
+     * @return FileInfo
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function getFileInfo() {
+        if (!Filesystem::isValidPath($this->path)) {
+            throw new InvalidPathException();
+        }
+        if (!$this->fileInfo) {
+            $fileInfo = $this->view->getFileInfo($this->path);
+            if ($fileInfo instanceof FileInfo) {
+                $this->fileInfo = $fileInfo;
+            } else {
+                throw new NotFoundException();
+            }
+        }
+        return $this->fileInfo;
+    }
+
+    /**
+     * @param string[] $hooks
+     */
+    protected function sendHooks($hooks) {
+        foreach ($hooks as $hook) {
+            $this->root->emit('\OC\Files', $hook, array($this));
+        }
+    }
+
+    /**
+     * @param int $permissions
+     * @return bool
+     */
+    protected function checkPermissions($permissions) {
+        return ($this->getPermissions() & $permissions) === $permissions;
+    }
+
+    public function delete() {
+    }
+
+    /**
+     * @param int $mtime
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function touch($mtime = null) {
+        if ($this->checkPermissions(\OCP\Constants::PERMISSION_UPDATE)) {
+            $this->sendHooks(array('preTouch'));
+            $this->view->touch($this->path, $mtime);
+            $this->sendHooks(array('postTouch'));
+            if ($this->fileInfo) {
+                if (is_null($mtime)) {
+                    $mtime = time();
+                }
+                $this->fileInfo['mtime'] = $mtime;
+            }
+        } else {
+            throw new NotPermittedException();
+        }
+    }
+
+    /**
+     * @return \OC\Files\Storage\Storage
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function getStorage() {
+        list($storage,) = $this->view->resolvePath($this->path);
+        return $storage;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPath() {
+        return $this->path;
+    }
+
+    /**
+     * @return string
+     */
+    public function getInternalPath() {
+        list(, $internalPath) = $this->view->resolvePath($this->path);
+        return $internalPath;
+    }
+
+    /**
+     * @return int
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function getId() {
+        return $this->getFileInfo()->getId();
+    }
+
+    /**
+     * @return array
+     */
+    public function stat() {
+        return $this->view->stat($this->path);
+    }
+
+    /**
+     * @return int
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function getMTime() {
+        return $this->getFileInfo()->getMTime();
+    }
+
+    /**
+     * @param bool $includeMounts
+     * @return int
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function getSize($includeMounts = true) {
+        return $this->getFileInfo()->getSize($includeMounts);
+    }
+
+    /**
+     * @return string
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function getEtag() {
+        return $this->getFileInfo()->getEtag();
+    }
+
+    /**
+     * @return int
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function getPermissions() {
+        return $this->getFileInfo()->getPermissions();
+    }
+
+    /**
+     * @return bool
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function isReadable() {
+        return $this->getFileInfo()->isReadable();
+    }
+
+    /**
+     * @return bool
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function isUpdateable() {
+        return $this->getFileInfo()->isUpdateable();
+    }
+
+    /**
+     * @return bool
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function isDeletable() {
+        return $this->getFileInfo()->isDeletable();
+    }
+
+    /**
+     * @return bool
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function isShareable() {
+        return $this->getFileInfo()->isShareable();
+    }
+
+    /**
+     * @return bool
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function isCreatable() {
+        return $this->getFileInfo()->isCreatable();
+    }
+
+    /**
+     * @return Node
+     */
+    public function getParent() {
+        $newPath = dirname($this->path);
+        if ($newPath === '' || $newPath === '.' || $newPath === '/') {
+            return $this->root;
+        }
+        return $this->root->get($newPath);
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return basename($this->path);
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    protected function normalizePath($path) {
+        if ($path === '' or $path === '/') {
+            return '/';
+        }
+        //no windows style slashes
+        $path = str_replace('\\', '/', $path);
+        //add leading slash
+        if ($path[0] !== '/') {
+            $path = '/' . $path;
+        }
+        //remove duplicate slashes
+        while (strpos($path, '//') !== false) {
+            $path = str_replace('//', '/', $path);
+        }
+        //remove trailing slash
+        $path = rtrim($path, '/');
+
+        return $path;
+    }
+
+    /**
+     * check if the requested path is valid
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function isValidPath($path) {
+        if (!$path || $path[0] !== '/') {
+            $path = '/' . $path;
+        }
+        if (strstr($path, '/../') || strrchr($path, '/') === '/..') {
+            return false;
+        }
+        return true;
+    }
+
+    public function isMounted() {
+        return $this->getFileInfo()->isMounted();
+    }
+
+    public function isShared() {
+        return $this->getFileInfo()->isShared();
+    }
+
+    public function getMimeType() {
+        return $this->getFileInfo()->getMimetype();
+    }
+
+    public function getMimePart() {
+        return $this->getFileInfo()->getMimePart();
+    }
+
+    public function getType() {
+        return $this->getFileInfo()->getType();
+    }
+
+    public function isEncrypted() {
+        return $this->getFileInfo()->isEncrypted();
+    }
+
+    public function getMountPoint() {
+        return $this->getFileInfo()->getMountPoint();
+    }
+
+    public function getOwner() {
+        return $this->getFileInfo()->getOwner();
+    }
+
+    public function getChecksum() {
+    }
+
+    public function getExtension(): string {
+        return $this->getFileInfo()->getExtension();
+    }
+
+    /**
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @throws \OCP\Lock\LockedException
+     */
+    public function lock($type) {
+        $this->view->lockFile($this->path, $type);
+    }
+
+    /**
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @throws \OCP\Lock\LockedException
+     */
+    public function changeLock($type) {
+        $this->view->changeLock($this->path, $type);
+    }
+
+    /**
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @throws \OCP\Lock\LockedException
+     */
+    public function unlock($type) {
+        $this->view->unlockFile($this->path, $type);
+    }
+
+    /**
+     * @param string $targetPath
+     * @throws \OCP\Files\NotPermittedException if copy not allowed or failed
+     * @return \OC\Files\Node\Node
+     */
+    public function copy($targetPath) {
+        $targetPath = $this->normalizePath($targetPath);
+        $parent = $this->root->get(dirname($targetPath));
+        if ($parent instanceof Folder and $this->isValidPath($targetPath) and $parent->isCreatable()) {
+            $nonExisting = $this->createNonExistingNode($targetPath);
+            $this->root->emit('\OC\Files', 'preCopy', [$this, $nonExisting]);
+            $this->root->emit('\OC\Files', 'preWrite', [$nonExisting]);
+            if (!$this->view->copy($this->path, $targetPath)) {
+                throw new NotPermittedException('Could not copy ' . $this->path . ' to ' . $targetPath);
+            }
+            $targetNode = $this->root->get($targetPath);
+            $this->root->emit('\OC\Files', 'postCopy', [$this, $targetNode]);
+            $this->root->emit('\OC\Files', 'postWrite', [$targetNode]);
+            return $targetNode;
+        } else {
+            throw new NotPermittedException('No permission to copy to path ' . $targetPath);
+        }
+    }
+
+    /**
+     * @param string $targetPath
+     * @throws \OCP\Files\NotPermittedException if move not allowed or failed
+     * @return \OC\Files\Node\Node
+     */
+    public function move($targetPath) {
+        $targetPath = $this->normalizePath($targetPath);
+        $parent = $this->root->get(dirname($targetPath));
+        if ($parent instanceof Folder and $this->isValidPath($targetPath) and $parent->isCreatable()) {
+            $nonExisting = $this->createNonExistingNode($targetPath);
+            $this->root->emit('\OC\Files', 'preRename', [$this, $nonExisting]);
+            $this->root->emit('\OC\Files', 'preWrite', [$nonExisting]);
+            if (!$this->view->rename($this->path, $targetPath)) {
+                throw new NotPermittedException('Could not move ' . $this->path . ' to ' . $targetPath);
+            }
+            $targetNode = $this->root->get($targetPath);
+            $this->root->emit('\OC\Files', 'postRename', [$this, $targetNode]);
+            $this->root->emit('\OC\Files', 'postWrite', [$targetNode]);
+            $this->path = $targetPath;
+            return $targetNode;
+        } else {
+            throw new NotPermittedException('No permission to move to path ' . $targetPath);
+        }
+    }
 
 }