nextcloud / server

lib/private/Settings/Section.php

Indentation +58 added lines, -58 removed lines

@@ -26,67 +26,67 @@
 use OCP\Settings\IIconSection;
 
 class Section implements IIconSection {
-	/** @var string */
-	private $id;
-	/** @var string */
-	private $name;
-	/** @var int */
-	private $priority;
-	/** @var string */
-	private $icon;
+    /** @var string */
+    private $id;
+    /** @var string */
+    private $name;
+    /** @var int */
+    private $priority;
+    /** @var string */
+    private $icon;
 
-	/**
-	 * @param string $id
-	 * @param string $name
-	 * @param int $priority
-	 * @param string $icon
-	 */
-	public function __construct($id, $name, $priority, $icon = '') {
-		$this->id = $id;
-		$this->name = $name;
-		$this->priority = $priority;
-		$this->icon = $icon;
-	}
+    /**
+     * @param string $id
+     * @param string $name
+     * @param int $priority
+     * @param string $icon
+     */
+    public function __construct($id, $name, $priority, $icon = '') {
+        $this->id = $id;
+        $this->name = $name;
+        $this->priority = $priority;
+        $this->icon = $icon;
+    }
 
-	/**
-	 * returns the ID of the section. It is supposed to be a lower case string,
-	 * e.g. 'ldap'
-	 *
-	 * @returns string
-	 */
-	public function getID() {
-		return $this->id;
-	}
+    /**
+     * returns the ID of the section. It is supposed to be a lower case string,
+     * e.g. 'ldap'
+     *
+     * @returns string
+     */
+    public function getID() {
+        return $this->id;
+    }
 
-	/**
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
-	 * integration'. Use the L10N service to translate it.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	}
+    /**
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+     * integration'. Use the L10N service to translate it.
+     *
+     * @return string
+     */
+    public function getName() {
+        return $this->name;
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the settings navigation. The sections are arranged in ascending order of
-	 * the priority values. It is required to return a value between 0 and 99.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return $this->priority;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the settings navigation. The sections are arranged in ascending order of
+     * the priority values. It is required to return a value between 0 and 99.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return $this->priority;
+    }
 
-	/**
-	 * returns the relative path to an 16*16 icon describing the section.
-	 * e.g. '/core/img/places/files.svg'
-	 *
-	 * @returns string
-	 * @since 12
-	 */
-	public function getIcon() {
-		return $this->icon;
-	}
+    /**
+     * returns the relative path to an 16*16 icon describing the section.
+     * e.g. '/core/img/places/files.svg'
+     *
+     * @returns string
+     * @since 12
+     */
+    public function getIcon() {
+        return $this->icon;
+    }
 }

lib/private/Streamer.php

Indentation +91 added lines, -91 removed lines

@@ -28,105 +28,105 @@
 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;
 	
-	public function __construct(){
-		/** @var \OCP\IRequest */
-		$request = \OC::$server->getRequest();
+    public function __construct(){
+        /** @var \OCP\IRequest */
+        $request = \OC::$server->getRequest();
 		
-		if ($request->isUserAgent($this->preferTarFor)) {
-			$this->streamerInstance = new TarStreamer();
-		} else {
-			$this->streamerInstance = new ZipStreamer(['zip64' => PHP_INT_SIZE !== 4]);
-		}
-	}
+        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

@@ -29,12 +29,12 @@ 
 
 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;
 	
-	public function __construct(){
+	public function __construct() {
 		/** @var \OCP\IRequest */
 		$request = \OC::$server->getRequest();
 		
@@ -49,9 +49,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);
 	}
 	
@@ -60,27 +60,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);
 			}
 		}
@@ -116,7 +116,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);
 	}
 
@@ -126,7 +126,7 @@ 
 	 * closing, the file is completely written to the output stream.
 	 * @return bool $success
 	 */
-	public function finalize(){
+	public function finalize() {
 		return $this->streamerInstance->finalize();
 	}
 }

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);
 			}
 		}

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/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();
+        }
+    }
 }