YetiForceCompany / YetiForceCRM

libraries/SabreDAV/composer/ClassLoader.php

Doc Comments +4 added lines

@@ -341,6 +341,10 @@
         return $file;
     }
 
+    /**
+     * @param string $class
+     * @param string $ext
+     */
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup

Indentation +359 added lines, -359 removed lines

@@ -42,364 +42,364 @@ 
  */
 class ClassLoader
 {
-    // PSR-4
-    private $prefixLengthsPsr4 = array();
-    private $prefixDirsPsr4 = array();
-    private $fallbackDirsPsr4 = array();
-
-    // PSR-0
-    private $prefixesPsr0 = array();
-    private $fallbackDirsPsr0 = array();
-
-    private $useIncludePath = false;
-    private $classMap = array();
-
-    private $classMapAuthoritative = false;
-
-    public function getPrefixes()
-    {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
-        }
-
-        return array();
-    }
-
-    public function getPrefixesPsr4()
-    {
-        return $this->prefixDirsPsr4;
-    }
-
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirsPsr0;
-    }
-
-    public function getFallbackDirsPsr4()
-    {
-        return $this->fallbackDirsPsr4;
-    }
-
-    public function getClassMap()
-    {
-        return $this->classMap;
-    }
-
-    /**
-     * @param array $classMap Class to filename map
-     */
-    public function addClassMap(array $classMap)
-    {
-        if ($this->classMap) {
-            $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
-            $this->classMap = $classMap;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix, either
-     * appending or prepending to the ones previously set for this prefix.
-     *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
-     */
-    public function add($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            if ($prepend) {
-                $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr0
-                );
-            } else {
-                $this->fallbackDirsPsr0 = array_merge(
-                    $this->fallbackDirsPsr0,
-                    (array) $paths
-                );
-            }
-
-            return;
-        }
-
-        $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
-
-            return;
-        }
-        if ($prepend) {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixesPsr0[$first][$prefix]
-            );
-        } else {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace, either
-     * appending or prepending to the ones previously set for this namespace.
-     *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function addPsr4($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            // Register directories for the root namespace.
-            if ($prepend) {
-                $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr4
-                );
-            } else {
-                $this->fallbackDirsPsr4 = array_merge(
-                    $this->fallbackDirsPsr4,
-                    (array) $paths
-                );
-            }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
-            // Register directories for a new namespace.
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        } elseif ($prepend) {
-            // Prepend directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixDirsPsr4[$prefix]
-            );
-        } else {
-            // Append directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $this->prefixDirsPsr4[$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix,
-     * replacing any others previously set for this prefix.
-     *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
-     */
-    public function set($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr0 = (array) $paths;
-        } else {
-            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace,
-     * replacing any others previously set for this namespace.
-     *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setPsr4($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr4 = (array) $paths;
-        } else {
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Turns on searching the include path for class files.
-     *
-     * @param bool $useIncludePath
-     */
-    public function setUseIncludePath($useIncludePath)
-    {
-        $this->useIncludePath = $useIncludePath;
-    }
-
-    /**
-     * Can be used to check if the autoloader uses the include path to check
-     * for classes.
-     *
-     * @return bool
-     */
-    public function getUseIncludePath()
-    {
-        return $this->useIncludePath;
-    }
-
-    /**
-     * Turns off searching the prefix and fallback directories for classes
-     * that have not been registered with the class map.
-     *
-     * @param bool $classMapAuthoritative
-     */
-    public function setClassMapAuthoritative($classMapAuthoritative)
-    {
-        $this->classMapAuthoritative = $classMapAuthoritative;
-    }
-
-    /**
-     * Should class lookup fail if not found in the current class map?
-     *
-     * @return bool
-     */
-    public function isClassMapAuthoritative()
-    {
-        return $this->classMapAuthoritative;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            includeFile($file);
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|false The path if found, false otherwise
-     */
-    public function findFile($class)
-    {
-        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
-        }
-
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative) {
-            return false;
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if ($file === null && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if ($file === null) {
-            // Remember that this class does not exist.
-            return $this->classMap[$class] = false;
-        }
-
-        return $file;
-    }
-
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-4 fallback dirs
-        foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 lookup
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
-                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
-        } else {
-            // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
-        }
-
-        if (isset($this->prefixesPsr0[$first])) {
-            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-0 fallback dirs
-        foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 include paths.
-        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
-            return $file;
-        }
-    }
+	// PSR-4
+	private $prefixLengthsPsr4 = array();
+	private $prefixDirsPsr4 = array();
+	private $fallbackDirsPsr4 = array();
+
+	// PSR-0
+	private $prefixesPsr0 = array();
+	private $fallbackDirsPsr0 = array();
+
+	private $useIncludePath = false;
+	private $classMap = array();
+
+	private $classMapAuthoritative = false;
+
+	public function getPrefixes()
+	{
+		if (!empty($this->prefixesPsr0)) {
+			return call_user_func_array('array_merge', $this->prefixesPsr0);
+		}
+
+		return array();
+	}
+
+	public function getPrefixesPsr4()
+	{
+		return $this->prefixDirsPsr4;
+	}
+
+	public function getFallbackDirs()
+	{
+		return $this->fallbackDirsPsr0;
+	}
+
+	public function getFallbackDirsPsr4()
+	{
+		return $this->fallbackDirsPsr4;
+	}
+
+	public function getClassMap()
+	{
+		return $this->classMap;
+	}
+
+	/**
+	 * @param array $classMap Class to filename map
+	 */
+	public function addClassMap(array $classMap)
+	{
+		if ($this->classMap) {
+			$this->classMap = array_merge($this->classMap, $classMap);
+		} else {
+			$this->classMap = $classMap;
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-0 directories for a given prefix, either
+	 * appending or prepending to the ones previously set for this prefix.
+	 *
+	 * @param string       $prefix  The prefix
+	 * @param array|string $paths   The PSR-0 root directories
+	 * @param bool         $prepend Whether to prepend the directories
+	 */
+	public function add($prefix, $paths, $prepend = false)
+	{
+		if (!$prefix) {
+			if ($prepend) {
+				$this->fallbackDirsPsr0 = array_merge(
+					(array) $paths,
+					$this->fallbackDirsPsr0
+				);
+			} else {
+				$this->fallbackDirsPsr0 = array_merge(
+					$this->fallbackDirsPsr0,
+					(array) $paths
+				);
+			}
+
+			return;
+		}
+
+		$first = $prefix[0];
+		if (!isset($this->prefixesPsr0[$first][$prefix])) {
+			$this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+			return;
+		}
+		if ($prepend) {
+			$this->prefixesPsr0[$first][$prefix] = array_merge(
+				(array) $paths,
+				$this->prefixesPsr0[$first][$prefix]
+			);
+		} else {
+			$this->prefixesPsr0[$first][$prefix] = array_merge(
+				$this->prefixesPsr0[$first][$prefix],
+				(array) $paths
+			);
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-4 directories for a given namespace, either
+	 * appending or prepending to the ones previously set for this namespace.
+	 *
+	 * @param string       $prefix  The prefix/namespace, with trailing '\\'
+	 * @param array|string $paths   The PSR-4 base directories
+	 * @param bool         $prepend Whether to prepend the directories
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public function addPsr4($prefix, $paths, $prepend = false)
+	{
+		if (!$prefix) {
+			// Register directories for the root namespace.
+			if ($prepend) {
+				$this->fallbackDirsPsr4 = array_merge(
+					(array) $paths,
+					$this->fallbackDirsPsr4
+				);
+			} else {
+				$this->fallbackDirsPsr4 = array_merge(
+					$this->fallbackDirsPsr4,
+					(array) $paths
+				);
+			}
+		} elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+			// Register directories for a new namespace.
+			$length = strlen($prefix);
+			if ('\\' !== $prefix[$length - 1]) {
+				throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+			}
+			$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+			$this->prefixDirsPsr4[$prefix] = (array) $paths;
+		} elseif ($prepend) {
+			// Prepend directories for an already registered namespace.
+			$this->prefixDirsPsr4[$prefix] = array_merge(
+				(array) $paths,
+				$this->prefixDirsPsr4[$prefix]
+			);
+		} else {
+			// Append directories for an already registered namespace.
+			$this->prefixDirsPsr4[$prefix] = array_merge(
+				$this->prefixDirsPsr4[$prefix],
+				(array) $paths
+			);
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-0 directories for a given prefix,
+	 * replacing any others previously set for this prefix.
+	 *
+	 * @param string       $prefix The prefix
+	 * @param array|string $paths  The PSR-0 base directories
+	 */
+	public function set($prefix, $paths)
+	{
+		if (!$prefix) {
+			$this->fallbackDirsPsr0 = (array) $paths;
+		} else {
+			$this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+		}
+	}
+
+	/**
+	 * Registers a set of PSR-4 directories for a given namespace,
+	 * replacing any others previously set for this namespace.
+	 *
+	 * @param string       $prefix The prefix/namespace, with trailing '\\'
+	 * @param array|string $paths  The PSR-4 base directories
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public function setPsr4($prefix, $paths)
+	{
+		if (!$prefix) {
+			$this->fallbackDirsPsr4 = (array) $paths;
+		} else {
+			$length = strlen($prefix);
+			if ('\\' !== $prefix[$length - 1]) {
+				throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+			}
+			$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+			$this->prefixDirsPsr4[$prefix] = (array) $paths;
+		}
+	}
+
+	/**
+	 * Turns on searching the include path for class files.
+	 *
+	 * @param bool $useIncludePath
+	 */
+	public function setUseIncludePath($useIncludePath)
+	{
+		$this->useIncludePath = $useIncludePath;
+	}
+
+	/**
+	 * Can be used to check if the autoloader uses the include path to check
+	 * for classes.
+	 *
+	 * @return bool
+	 */
+	public function getUseIncludePath()
+	{
+		return $this->useIncludePath;
+	}
+
+	/**
+	 * Turns off searching the prefix and fallback directories for classes
+	 * that have not been registered with the class map.
+	 *
+	 * @param bool $classMapAuthoritative
+	 */
+	public function setClassMapAuthoritative($classMapAuthoritative)
+	{
+		$this->classMapAuthoritative = $classMapAuthoritative;
+	}
+
+	/**
+	 * Should class lookup fail if not found in the current class map?
+	 *
+	 * @return bool
+	 */
+	public function isClassMapAuthoritative()
+	{
+		return $this->classMapAuthoritative;
+	}
+
+	/**
+	 * Registers this instance as an autoloader.
+	 *
+	 * @param bool $prepend Whether to prepend the autoloader or not
+	 */
+	public function register($prepend = false)
+	{
+		spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+	}
+
+	/**
+	 * Unregisters this instance as an autoloader.
+	 */
+	public function unregister()
+	{
+		spl_autoload_unregister(array($this, 'loadClass'));
+	}
+
+	/**
+	 * Loads the given class or interface.
+	 *
+	 * @param  string    $class The name of the class
+	 * @return bool|null True if loaded, null otherwise
+	 */
+	public function loadClass($class)
+	{
+		if ($file = $this->findFile($class)) {
+			includeFile($file);
+
+			return true;
+		}
+	}
+
+	/**
+	 * Finds the path to the file where the class is defined.
+	 *
+	 * @param string $class The name of the class
+	 *
+	 * @return string|false The path if found, false otherwise
+	 */
+	public function findFile($class)
+	{
+		// work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
+		if ('\\' == $class[0]) {
+			$class = substr($class, 1);
+		}
+
+		// class map lookup
+		if (isset($this->classMap[$class])) {
+			return $this->classMap[$class];
+		}
+		if ($this->classMapAuthoritative) {
+			return false;
+		}
+
+		$file = $this->findFileWithExtension($class, '.php');
+
+		// Search for Hack files if we are running on HHVM
+		if ($file === null && defined('HHVM_VERSION')) {
+			$file = $this->findFileWithExtension($class, '.hh');
+		}
+
+		if ($file === null) {
+			// Remember that this class does not exist.
+			return $this->classMap[$class] = false;
+		}
+
+		return $file;
+	}
+
+	private function findFileWithExtension($class, $ext)
+	{
+		// PSR-4 lookup
+		$logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+		$first = $class[0];
+		if (isset($this->prefixLengthsPsr4[$first])) {
+			foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
+				if (0 === strpos($class, $prefix)) {
+					foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
+						if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+							return $file;
+						}
+					}
+				}
+			}
+		}
+
+		// PSR-4 fallback dirs
+		foreach ($this->fallbackDirsPsr4 as $dir) {
+			if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+				return $file;
+			}
+		}
+
+		// PSR-0 lookup
+		if (false !== $pos = strrpos($class, '\\')) {
+			// namespaced class name
+			$logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+				. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+		} else {
+			// PEAR-like class name
+			$logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+		}
+
+		if (isset($this->prefixesPsr0[$first])) {
+			foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+				if (0 === strpos($class, $prefix)) {
+					foreach ($dirs as $dir) {
+						if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+							return $file;
+						}
+					}
+				}
+			}
+		}
+
+		// PSR-0 fallback dirs
+		foreach ($this->fallbackDirsPsr0 as $dir) {
+			if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+				return $file;
+			}
+		}
+
+		// PSR-0 include paths.
+		if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+			return $file;
+		}
+	}
 }
 
 /**
@@ -409,5 +409,5 @@ 
  */
 function includeFile($file)
 {
-    include $file;
+	include $file;
 }

libraries/SabreDAV/DAV/Auth/Backend/AbstractDigest.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,8 +2,8 @@
 
 namespace Sabre\DAV\Auth\Backend;
 
-use Sabre\HTTP;
 use Sabre\DAV;
+use Sabre\HTTP;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
 

Indentation +138 added lines, -138 removed lines

@@ -20,143 +20,143 @@
  */
 abstract class AbstractDigest implements BackendInterface {
 
-    /**
-     * Authentication Realm.
-     *
-     * The realm is often displayed by browser clients when showing the
-     * authentication dialog.
-     *
-     * @var string
-     */
-    protected $realm = 'SabreDAV';
-
-    /**
-     * This is the prefix that will be used to generate principal urls.
-     *
-     * @var string
-     */
-    protected $principalPrefix = 'principals/';
-
-    /**
-     * Sets the authentication realm for this backend.
-     *
-     * Be aware that for Digest authentication, the realm influences the digest
-     * hash. Choose the realm wisely, because if you change it later, all the
-     * existing hashes will break and nobody can authenticate.
-     *
-     * @param string $realm
-     * @return void
-     */
-    public function setRealm($realm) {
-
-        $this->realm = $realm;
-
-    }
-
-    /**
-     * Returns a users digest hash based on the username and realm.
-     *
-     * If the user was not known, null must be returned.
-     *
-     * @param string $realm
-     * @param string $username
-     * @return string|null
-     */
-    abstract function getDigestHash($realm, $username);
-
-    /**
-     * When this method is called, the backend must check if authentication was
-     * successful.
-     *
-     * The returned value must be one of the following
-     *
-     * [true, "principals/username"]
-     * [false, "reason for failure"]
-     *
-     * If authentication was successful, it's expected that the authentication
-     * backend returns a so-called principal url.
-     *
-     * Examples of a principal url:
-     *
-     * principals/admin
-     * principals/user1
-     * principals/users/joe
-     * principals/uid/123457
-     *
-     * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
-     * return a string such as:
-     *
-     * principals/users/[username]
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return array
-     */
-    public function check(RequestInterface $request, ResponseInterface $response) {
-
-        $digest = new HTTP\Auth\Digest(
-            $this->realm,
-            $request,
-            $response
-        );
-        $digest->init();
-
-        $username = $digest->getUsername();
-
-        // No username was given
-        if (!$username) {
-            return [false, "No 'Authorization: Digest' header found. Either the client didn't send one, or the server is misconfigured"];
-        }
-
-        $hash = $this->getDigestHash($this->realm, $username);
-        // If this was false, the user account didn't exist
-        if ($hash === false || is_null($hash)) {
-            return [false, "Username or password was incorrect"];
-        }
-        if (!is_string($hash)) {
-            throw new DAV\Exception('The returned value from getDigestHash must be a string or null');
-        }
-
-        // If this was false, the password or part of the hash was incorrect.
-        if (!$digest->validateA1($hash)) {
-            return [false, "Username or password was incorrect"];
-        }
-
-        return [true, $this->principalPrefix . $username];
-
-    }
-
-    /**
-     * This method is called when a user could not be authenticated, and
-     * authentication was required for the current request.
-     *
-     * This gives you the opportunity to set authentication headers. The 401
-     * status code will already be set.
-     *
-     * In this case of Basic Auth, this would for example mean that the
-     * following header needs to be set:
-     *
-     * $response->addHeader('WWW-Authenticate', 'Basic realm=SabreDAV');
-     *
-     * Keep in mind that in the case of multiple authentication backends, other
-     * WWW-Authenticate headers may already have been set, and you'll want to
-     * append your own WWW-Authenticate header instead of overwriting the
-     * existing one.
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return void
-     */
-    public function challenge(RequestInterface $request, ResponseInterface $response) {
-
-        $auth = new HTTP\Auth\Digest(
-            $this->realm,
-            $request,
-            $response
-        );
-        $auth->init();
-        $auth->requireLogin();
-
-    }
+	/**
+	 * Authentication Realm.
+	 *
+	 * The realm is often displayed by browser clients when showing the
+	 * authentication dialog.
+	 *
+	 * @var string
+	 */
+	protected $realm = 'SabreDAV';
+
+	/**
+	 * This is the prefix that will be used to generate principal urls.
+	 *
+	 * @var string
+	 */
+	protected $principalPrefix = 'principals/';
+
+	/**
+	 * Sets the authentication realm for this backend.
+	 *
+	 * Be aware that for Digest authentication, the realm influences the digest
+	 * hash. Choose the realm wisely, because if you change it later, all the
+	 * existing hashes will break and nobody can authenticate.
+	 *
+	 * @param string $realm
+	 * @return void
+	 */
+	public function setRealm($realm) {
+
+		$this->realm = $realm;
+
+	}
+
+	/**
+	 * Returns a users digest hash based on the username and realm.
+	 *
+	 * If the user was not known, null must be returned.
+	 *
+	 * @param string $realm
+	 * @param string $username
+	 * @return string|null
+	 */
+	abstract function getDigestHash($realm, $username);
+
+	/**
+	 * When this method is called, the backend must check if authentication was
+	 * successful.
+	 *
+	 * The returned value must be one of the following
+	 *
+	 * [true, "principals/username"]
+	 * [false, "reason for failure"]
+	 *
+	 * If authentication was successful, it's expected that the authentication
+	 * backend returns a so-called principal url.
+	 *
+	 * Examples of a principal url:
+	 *
+	 * principals/admin
+	 * principals/user1
+	 * principals/users/joe
+	 * principals/uid/123457
+	 *
+	 * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
+	 * return a string such as:
+	 *
+	 * principals/users/[username]
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return array
+	 */
+	public function check(RequestInterface $request, ResponseInterface $response) {
+
+		$digest = new HTTP\Auth\Digest(
+			$this->realm,
+			$request,
+			$response
+		);
+		$digest->init();
+
+		$username = $digest->getUsername();
+
+		// No username was given
+		if (!$username) {
+			return [false, "No 'Authorization: Digest' header found. Either the client didn't send one, or the server is misconfigured"];
+		}
+
+		$hash = $this->getDigestHash($this->realm, $username);
+		// If this was false, the user account didn't exist
+		if ($hash === false || is_null($hash)) {
+			return [false, "Username or password was incorrect"];
+		}
+		if (!is_string($hash)) {
+			throw new DAV\Exception('The returned value from getDigestHash must be a string or null');
+		}
+
+		// If this was false, the password or part of the hash was incorrect.
+		if (!$digest->validateA1($hash)) {
+			return [false, "Username or password was incorrect"];
+		}
+
+		return [true, $this->principalPrefix . $username];
+
+	}
+
+	/**
+	 * This method is called when a user could not be authenticated, and
+	 * authentication was required for the current request.
+	 *
+	 * This gives you the opportunity to set authentication headers. The 401
+	 * status code will already be set.
+	 *
+	 * In this case of Basic Auth, this would for example mean that the
+	 * following header needs to be set:
+	 *
+	 * $response->addHeader('WWW-Authenticate', 'Basic realm=SabreDAV');
+	 *
+	 * Keep in mind that in the case of multiple authentication backends, other
+	 * WWW-Authenticate headers may already have been set, and you'll want to
+	 * append your own WWW-Authenticate header instead of overwriting the
+	 * existing one.
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return void
+	 */
+	public function challenge(RequestInterface $request, ResponseInterface $response) {
+
+		$auth = new HTTP\Auth\Digest(
+			$this->realm,
+			$request,
+			$response
+		);
+		$auth->init();
+		$auth->requireLogin();
+
+	}
 
 }

libraries/SabreDAV/DAV/Auth/Plugin.php

Unused Use Statements +3 added lines, -3 removed lines

@@ -2,12 +2,12 @@
 
 namespace Sabre\DAV\Auth;
 
-use Sabre\HTTP\RequestInterface;
-use Sabre\HTTP\ResponseInterface;
-use Sabre\HTTP\URLUtil;
 use Sabre\DAV\Exception\NotAuthenticated;
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
+use Sabre\HTTP\URLUtil;
 
 /**
  * This plugin provides Authentication for a WebDAV server.

Indentation +184 added lines, -184 removed lines

@@ -25,189 +25,189 @@
  */
 class Plugin extends ServerPlugin {
 
-    /**
-     * authentication backends
-     */
-    protected $backends;
-
-    /**
-     * The currently logged in principal. Will be `null` if nobody is currently
-     * logged in.
-     *
-     * @var string|null
-     */
-    protected $currentPrincipal;
-
-    /**
-     * Creates the authentication plugin
-     *
-     * @param Backend\BackendInterface $authBackend
-     */
-    public function __construct(Backend\BackendInterface $authBackend = null) {
-
-        if (!is_null($authBackend)) {
-            $this->addBackend($authBackend);
-        }
-
-    }
-
-    /**
-     * Adds an authentication backend to the plugin.
-     *
-     * @param Backend\BackendInterface $authBackend
-     * @return void
-     */
-    public function addBackend(Backend\BackendInterface $authBackend) {
-
-        $this->backends[] = $authBackend;
-
-    }
-
-    /**
-     * Initializes the plugin. This function is automatically called by the server
-     *
-     * @param Server $server
-     * @return void
-     */
-    public function initialize(Server $server) {
-
-        $server->on('beforeMethod', [$this, 'beforeMethod'], 10);
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'auth';
-
-    }
-
-    /**
-     * Returns the currently logged-in principal.
-     *
-     * This will return a string such as:
-     *
-     * principals/username
-     * principals/users/username
-     *
-     * This method will return null if nobody is logged in.
-     *
-     * @return string|null
-     */
-    public function getCurrentPrincipal() {
-
-        return $this->currentPrincipal;
-
-    }
-
-    /**
-     * Returns the current username.
-     *
-     * This method is deprecated and is only kept for backwards compatibility
-     * purposes. Please switch to getCurrentPrincipal().
-     *
-     * @deprecated Will be removed in a future version!
-     * @return string|null
-     */
-    public function getCurrentUser() {
-
-        // We just do a 'basename' on the principal to give back a sane value
-        // here.
-        list(, $userName) = URLUtil::splitPath(
-            $this->getCurrentPrincipal()
-        );
-
-        return $userName;
-
-    }
-
-    /**
-     * This method is called before any HTTP method and forces users to be authenticated
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
-
-        if ($this->currentPrincipal) {
-
-            // We already have authentication information. This means that the
-            // event has already fired earlier, and is now likely fired for a
-            // sub-request.
-            //
-            // We don't want to authenticate users twice, so we simply don't do
-            // anything here. See Issue #700 for additional reasoning.
-            //
-            // This is not a perfect solution, but will be fixed once the
-            // "currently authenticated principal" is information that's not
-            // not associated with the plugin, but rather per-request.
-            //
-            // See issue #580 for more information about that.
-            return;
-
-        }
-        if (!$this->backends) {
-            throw new \Sabre\DAV\Exception('No authentication backends were configured on this server.');
-        }
-        $reasons = [];
-        foreach ($this->backends as $backend) {
-
-            $result = $backend->check(
-                $request,
-                $response
-            );
-
-            if (!is_array($result) || count($result) !== 2 || !is_bool($result[0]) || !is_string($result[1])) {
-                throw new \Sabre\DAV\Exception('The authentication backend did not return a correct value from the check() method.');
-            }
-
-            if ($result[0]) {
-                $this->currentPrincipal = $result[1];
-                // Exit early
-                return;
-            }
-            $reasons[] = $result[1];
-
-        }
-
-        // If we got here, it means that no authentication backend was
-        // successful in authenticating the user.
-        $this->currentPrincipal = null;
-
-        foreach ($this->backends as $backend) {
-            $backend->challenge($request, $response);
-        }
-        throw new NotAuthenticated(implode(', ', $reasons));
-
-    }
-
-    /**
-     * Returns a bunch of meta-data about the plugin.
-     *
-     * Providing this information is optional, and is mainly displayed by the
-     * Browser plugin.
-     *
-     * The description key in the returned array may contain html and will not
-     * be sanitized.
-     *
-     * @return array
-     */
-    public function getPluginInfo() {
-
-        return [
-            'name'        => $this->getPluginName(),
-            'description' => 'Generic authentication plugin',
-            'link'        => 'http://sabre.io/dav/authentication/',
-        ];
-
-    }
+	/**
+	 * authentication backends
+	 */
+	protected $backends;
+
+	/**
+	 * The currently logged in principal. Will be `null` if nobody is currently
+	 * logged in.
+	 *
+	 * @var string|null
+	 */
+	protected $currentPrincipal;
+
+	/**
+	 * Creates the authentication plugin
+	 *
+	 * @param Backend\BackendInterface $authBackend
+	 */
+	public function __construct(Backend\BackendInterface $authBackend = null) {
+
+		if (!is_null($authBackend)) {
+			$this->addBackend($authBackend);
+		}
+
+	}
+
+	/**
+	 * Adds an authentication backend to the plugin.
+	 *
+	 * @param Backend\BackendInterface $authBackend
+	 * @return void
+	 */
+	public function addBackend(Backend\BackendInterface $authBackend) {
+
+		$this->backends[] = $authBackend;
+
+	}
+
+	/**
+	 * Initializes the plugin. This function is automatically called by the server
+	 *
+	 * @param Server $server
+	 * @return void
+	 */
+	public function initialize(Server $server) {
+
+		$server->on('beforeMethod', [$this, 'beforeMethod'], 10);
+
+	}
+
+	/**
+	 * Returns a plugin name.
+	 *
+	 * Using this name other plugins will be able to access other plugins
+	 * using DAV\Server::getPlugin
+	 *
+	 * @return string
+	 */
+	public function getPluginName() {
+
+		return 'auth';
+
+	}
+
+	/**
+	 * Returns the currently logged-in principal.
+	 *
+	 * This will return a string such as:
+	 *
+	 * principals/username
+	 * principals/users/username
+	 *
+	 * This method will return null if nobody is logged in.
+	 *
+	 * @return string|null
+	 */
+	public function getCurrentPrincipal() {
+
+		return $this->currentPrincipal;
+
+	}
+
+	/**
+	 * Returns the current username.
+	 *
+	 * This method is deprecated and is only kept for backwards compatibility
+	 * purposes. Please switch to getCurrentPrincipal().
+	 *
+	 * @deprecated Will be removed in a future version!
+	 * @return string|null
+	 */
+	public function getCurrentUser() {
+
+		// We just do a 'basename' on the principal to give back a sane value
+		// here.
+		list(, $userName) = URLUtil::splitPath(
+			$this->getCurrentPrincipal()
+		);
+
+		return $userName;
+
+	}
+
+	/**
+	 * This method is called before any HTTP method and forces users to be authenticated
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
+
+		if ($this->currentPrincipal) {
+
+			// We already have authentication information. This means that the
+			// event has already fired earlier, and is now likely fired for a
+			// sub-request.
+			//
+			// We don't want to authenticate users twice, so we simply don't do
+			// anything here. See Issue #700 for additional reasoning.
+			//
+			// This is not a perfect solution, but will be fixed once the
+			// "currently authenticated principal" is information that's not
+			// not associated with the plugin, but rather per-request.
+			//
+			// See issue #580 for more information about that.
+			return;
+
+		}
+		if (!$this->backends) {
+			throw new \Sabre\DAV\Exception('No authentication backends were configured on this server.');
+		}
+		$reasons = [];
+		foreach ($this->backends as $backend) {
+
+			$result = $backend->check(
+				$request,
+				$response
+			);
+
+			if (!is_array($result) || count($result) !== 2 || !is_bool($result[0]) || !is_string($result[1])) {
+				throw new \Sabre\DAV\Exception('The authentication backend did not return a correct value from the check() method.');
+			}
+
+			if ($result[0]) {
+				$this->currentPrincipal = $result[1];
+				// Exit early
+				return;
+			}
+			$reasons[] = $result[1];
+
+		}
+
+		// If we got here, it means that no authentication backend was
+		// successful in authenticating the user.
+		$this->currentPrincipal = null;
+
+		foreach ($this->backends as $backend) {
+			$backend->challenge($request, $response);
+		}
+		throw new NotAuthenticated(implode(', ', $reasons));
+
+	}
+
+	/**
+	 * Returns a bunch of meta-data about the plugin.
+	 *
+	 * Providing this information is optional, and is mainly displayed by the
+	 * Browser plugin.
+	 *
+	 * The description key in the returned array may contain html and will not
+	 * be sanitized.
+	 *
+	 * @return array
+	 */
+	public function getPluginInfo() {
+
+		return [
+			'name'        => $this->getPluginName(),
+			'description' => 'Generic authentication plugin',
+			'link'        => 'http://sabre.io/dav/authentication/',
+		];
+
+	}
 
 }

Doc Comments +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
      *
      * @param RequestInterface $request
      * @param ResponseInterface $response
-     * @return bool
+     * @return boolean|null
      */
     public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
 

libraries/SabreDAV/DAV/Browser/GuessContentType.php

Unused Use Statements +1 added lines, -2 removed lines

@@ -2,10 +2,9 @@
 
 namespace Sabre\DAV\Browser;
 
-use Sabre\HTTP\URLUtil;
 use Sabre\DAV;
 use Sabre\DAV\PropFind;
-use Sabre\DAV\Inode;
+use Sabre\HTTP\URLUtil;
 
 /**
  * GuessContentType plugin

Indentation +73 added lines, -73 removed lines

@@ -24,78 +24,78 @@
  */
 class GuessContentType extends DAV\ServerPlugin {
 
-    /**
-     * List of recognized file extensions
-     *
-     * Feel free to add more
-     *
-     * @var array
-     */
-    public $extensionMap = [
-
-        // images
-        'jpg' => 'image/jpeg',
-        'gif' => 'image/gif',
-        'png' => 'image/png',
-
-        // groupware
-        'ics' => 'text/calendar',
-        'vcf' => 'text/vcard',
-
-        // text
-        'txt' => 'text/plain',
-
-    ];
-
-    /**
-     * Initializes the plugin
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        // Using a relatively low priority (200) to allow other extensions
-        // to set the content-type first.
-        $server->on('propFind', [$this, 'propFind'], 200);
-
-    }
-
-    /**
-     * Our PROPFIND handler
-     *
-     * Here we set a contenttype, if the node didn't already have one.
-     *
-     * @param PropFind $propFind
-     * @param INode $node
-     * @return void
-     */
-    public function propFind(PropFind $propFind, INode $node) {
-
-        $propFind->handle('{DAV:}getcontenttype', function() use ($propFind) {
-
-            list(, $fileName) = URLUtil::splitPath($propFind->getPath());
-            return $this->getContentType($fileName);
-
-        });
-
-    }
-
-    /**
-     * Simple method to return the contenttype
-     *
-     * @param string $fileName
-     * @return string
-     */
-    protected function getContentType($fileName) {
-
-        // Just grabbing the extension
-        $extension = strtolower(substr($fileName, strrpos($fileName, '.') + 1));
-        if (isset($this->extensionMap[$extension])) {
-            return $this->extensionMap[$extension];
-        }
-        return 'application/octet-stream';
-
-    }
+	/**
+	 * List of recognized file extensions
+	 *
+	 * Feel free to add more
+	 *
+	 * @var array
+	 */
+	public $extensionMap = [
+
+		// images
+		'jpg' => 'image/jpeg',
+		'gif' => 'image/gif',
+		'png' => 'image/png',
+
+		// groupware
+		'ics' => 'text/calendar',
+		'vcf' => 'text/vcard',
+
+		// text
+		'txt' => 'text/plain',
+
+	];
+
+	/**
+	 * Initializes the plugin
+	 *
+	 * @param DAV\Server $server
+	 * @return void
+	 */
+	public function initialize(DAV\Server $server) {
+
+		// Using a relatively low priority (200) to allow other extensions
+		// to set the content-type first.
+		$server->on('propFind', [$this, 'propFind'], 200);
+
+	}
+
+	/**
+	 * Our PROPFIND handler
+	 *
+	 * Here we set a contenttype, if the node didn't already have one.
+	 *
+	 * @param PropFind $propFind
+	 * @param INode $node
+	 * @return void
+	 */
+	public function propFind(PropFind $propFind, INode $node) {
+
+		$propFind->handle('{DAV:}getcontenttype', function() use ($propFind) {
+
+			list(, $fileName) = URLUtil::splitPath($propFind->getPath());
+			return $this->getContentType($fileName);
+
+		});
+
+	}
+
+	/**
+	 * Simple method to return the contenttype
+	 *
+	 * @param string $fileName
+	 * @return string
+	 */
+	protected function getContentType($fileName) {
+
+		// Just grabbing the extension
+		$extension = strtolower(substr($fileName, strrpos($fileName, '.') + 1));
+		if (isset($this->extensionMap[$extension])) {
+			return $this->extensionMap[$extension];
+		}
+		return 'application/octet-stream';
+
+	}
 
 }

Doc Comments +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
      * Here we set a contenttype, if the node didn't already have one.
      *
      * @param PropFind $propFind
-     * @param INode $node
+     * @param DAV\INode $node
      * @return void
      */
     public function propFind(PropFind $propFind, INode $node) {

libraries/SabreDAV/DAV/Browser/Plugin.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -4,9 +4,9 @@
 
 use Sabre\DAV;
 use Sabre\DAV\MkCol;
-use Sabre\HTTP\URLUtil;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
+use Sabre\HTTP\URLUtil;
 
 /**
  * Browser Plugin

Spacing +2 added lines, -2 removed lines

@@ -317,7 +317,7 @@ 
 
                 $buttonActions = '';
                 if ($subProps['subNode'] instanceof DAV\IFile) {
-                    $buttonActions =  '<a href="' . $this->escapeHTML($subProps['fullPath']) . '?sabreAction=info"><span class="oi" data-glyph="info"></span></a>';
+                    $buttonActions = '<a href="' . $this->escapeHTML($subProps['fullPath']) . '?sabreAction=info"><span class="oi" data-glyph="info"></span></a>';
                 }
                 $this->server->emit('browserButtonActions', [$subProps['fullPath'], $subProps['subNode'], &$buttonActions]);
 
@@ -450,7 +450,7 @@ 
 HTML;
 
         // If the path is empty, there's no parent.
-        if ($path)  {
+        if ($path) {
             list($parentUri) = URLUtil::splitPath($path);
             $fullPath = $this->server->getBaseUri() . URLUtil::encodePath($parentUri);
             $html .= '<a href="' . $fullPath . '" class="btn">⇤ Go to parent</a>';

Indentation +723 added lines, -723 removed lines

@@ -23,413 +23,413 @@ 
  */
 class Plugin extends DAV\ServerPlugin {
 
-    /**
-     * reference to server class
-     *
-     * @var Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * enablePost turns on the 'actions' panel, which allows people to create
-     * folders and upload files straight from a browser.
-     *
-     * @var bool
-     */
-    protected $enablePost = true;
-
-    /**
-     * A list of properties that are usually not interesting. This can cut down
-     * the browser output a bit by removing the properties that most people
-     * will likely not want to see.
-     *
-     * @var array
-     */
-    public $uninterestingProperties = [
-        '{DAV:}supportedlock',
-        '{DAV:}acl-restrictions',
-        '{DAV:}supported-privilege-set',
-        '{DAV:}supported-method-set',
-    ];
-
-    /**
-     * Creates the object.
-     *
-     * By default it will allow file creation and uploads.
-     * Specify the first argument as false to disable this
-     *
-     * @param bool $enablePost
-     */
-    public function __construct($enablePost = true) {
-
-        $this->enablePost = $enablePost;
-
-    }
-
-    /**
-     * Initializes the plugin and subscribes to events
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $this->server->on('method:GET', [$this, 'httpGetEarly'], 90);
-        $this->server->on('method:GET', [$this, 'httpGet'], 200);
-        $this->server->on('onHTMLActionsPanel', [$this, 'htmlActionsPanel'], 200);
-        if ($this->enablePost) $this->server->on('method:POST', [$this, 'httpPOST']);
-    }
-
-    /**
-     * This method intercepts GET requests that have ?sabreAction=info
-     * appended to the URL
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpGetEarly(RequestInterface $request, ResponseInterface $response) {
-
-        $params = $request->getQueryParameters();
-        if (isset($params['sabreAction']) && $params['sabreAction'] === 'info') {
-            return $this->httpGet($request, $response);
-        }
-
-    }
-
-    /**
-     * This method intercepts GET requests to collections and returns the html
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpGet(RequestInterface $request, ResponseInterface $response) {
-
-        // We're not using straight-up $_GET, because we want everything to be
-        // unit testable.
-        $getVars = $request->getQueryParameters();
-
-        // CSP headers
-        $this->server->httpResponse->setHeader('Content-Security-Policy', "img-src 'self'; style-src 'self';");
-
-        $sabreAction = isset($getVars['sabreAction']) ? $getVars['sabreAction'] : null;
-
-        switch ($sabreAction) {
-
-            case 'asset' :
-                // Asset handling, such as images
-                $this->serveAsset(isset($getVars['assetName']) ? $getVars['assetName'] : null);
-                return false;
-            default :
-            case 'info' :
-                try {
-                    $this->server->tree->getNodeForPath($request->getPath());
-                } catch (DAV\Exception\NotFound $e) {
-                    // We're simply stopping when the file isn't found to not interfere
-                    // with other plugins.
-                    return;
-                }
-
-                $response->setStatus(200);
-                $response->setHeader('Content-Type', 'text/html; charset=utf-8');
-
-                $response->setBody(
-                    $this->generateDirectoryIndex($request->getPath())
-                );
-
-                return false;
-
-            case 'plugins' :
-                $response->setStatus(200);
-                $response->setHeader('Content-Type', 'text/html; charset=utf-8');
-
-                $response->setBody(
-                    $this->generatePluginListing()
-                );
-
-                return false;
-
-        }
-
-    }
-
-    /**
-     * Handles POST requests for tree operations.
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpPOST(RequestInterface $request, ResponseInterface $response) {
-
-        $contentType = $request->getHeader('Content-Type');
-        list($contentType) = explode(';', $contentType);
-        if ($contentType !== 'application/x-www-form-urlencoded' &&
-            $contentType !== 'multipart/form-data') {
-                return;
-        }
-        $postVars = $request->getPostData();
-
-        if (!isset($postVars['sabreAction']))
-            return;
-
-        $uri = $request->getPath();
-
-        if ($this->server->emit('onBrowserPostAction', [$uri, $postVars['sabreAction'], $postVars])) {
-
-            switch ($postVars['sabreAction']) {
-
-                case 'mkcol' :
-                    if (isset($postVars['name']) && trim($postVars['name'])) {
-                        // Using basename() because we won't allow slashes
-                        list(, $folderName) = URLUtil::splitPath(trim($postVars['name']));
-
-                        if (isset($postVars['resourceType'])) {
-                            $resourceType = explode(',', $postVars['resourceType']);
-                        } else {
-                            $resourceType = ['{DAV:}collection'];
-                        }
-
-                        $properties = [];
-                        foreach ($postVars as $varName => $varValue) {
-                            // Any _POST variable in clark notation is treated
-                            // like a property.
-                            if ($varName[0] === '{') {
-                                // PHP will convert any dots to underscores.
-                                // This leaves us with no way to differentiate
-                                // the two.
-                                // Therefore we replace the string *DOT* with a
-                                // real dot. * is not allowed in uris so we
-                                // should be good.
-                                $varName = str_replace('*DOT*', '.', $varName);
-                                $properties[$varName] = $varValue;
-                            }
-                        }
-
-                        $mkCol = new MkCol(
-                            $resourceType,
-                            $properties
-                        );
-                        $this->server->createCollection($uri . '/' . $folderName, $mkCol);
-                    }
-                    break;
-
-                // @codeCoverageIgnoreStart
-                case 'put' :
-
-                    if ($_FILES) $file = current($_FILES);
-                    else break;
-
-                    list(, $newName) = URLUtil::splitPath(trim($file['name']));
-                    if (isset($postVars['name']) && trim($postVars['name']))
-                        $newName = trim($postVars['name']);
-
-                    // Making sure we only have a 'basename' component
-                    list(, $newName) = URLUtil::splitPath($newName);
-
-                    if (is_uploaded_file($file['tmp_name'])) {
-                        $this->server->createFile($uri . '/' . $newName, fopen($file['tmp_name'], 'r'));
-                    }
-                    break;
-                // @codeCoverageIgnoreEnd
-
-            }
-
-        }
-        $response->setHeader('Location', $request->getUrl());
-        $response->setStatus(302);
-        return false;
-
-    }
-
-    /**
-     * Escapes a string for html.
-     *
-     * @param string $value
-     * @return string
-     */
-    public function escapeHTML($value) {
-
-        return htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
-
-    }
-
-    /**
-     * Generates the html directory index for a given url
-     *
-     * @param string $path
-     * @return string
-     */
-    public function generateDirectoryIndex($path) {
-
-        $html = $this->generateHeader($path ? $path : '/', $path);
-
-        $node = $this->server->tree->getNodeForPath($path);
-        if ($node instanceof DAV\ICollection) {
-
-            $html .= "<section><h1>Nodes</h1>\n";
-            $html .= "<table class=\"nodeTable\">";
-
-            $subNodes = $this->server->getPropertiesForChildren($path, [
-                '{DAV:}displayname',
-                '{DAV:}resourcetype',
-                '{DAV:}getcontenttype',
-                '{DAV:}getcontentlength',
-                '{DAV:}getlastmodified',
-            ]);
-
-            foreach ($subNodes as $subPath => $subProps) {
-
-                $subNode = $this->server->tree->getNodeForPath($subPath);
-                $fullPath = $this->server->getBaseUri() . URLUtil::encodePath($subPath);
-                list(, $displayPath) = URLUtil::splitPath($subPath);
-
-                $subNodes[$subPath]['subNode'] = $subNode;
-                $subNodes[$subPath]['fullPath'] = $fullPath;
-                $subNodes[$subPath]['displayPath'] = $displayPath;
-            }
-            uasort($subNodes, [$this, 'compareNodes']);
-
-            foreach ($subNodes as $subProps) {
-                $type = [
-                    'string' => 'Unknown',
-                    'icon'   => 'cog',
-                ];
-                if (isset($subProps['{DAV:}resourcetype'])) {
-                    $type = $this->mapResourceType($subProps['{DAV:}resourcetype']->getValue(), $subProps['subNode']);
-                }
-
-                $html .= '<tr>';
-                $html .= '<td class="nameColumn"><a href="' . $this->escapeHTML($subProps['fullPath']) . '"><span class="oi" data-glyph="' . $this->escapeHTML($type['icon']) . '"></span> ' . $this->escapeHTML($subProps['displayPath']) . '</a></td>';
-                $html .= '<td class="typeColumn">' . $this->escapeHTML($type['string']) . '</td>';
-                $html .= '<td>';
-                if (isset($subProps['{DAV:}getcontentlength'])) {
-                    $html .= $this->escapeHTML($subProps['{DAV:}getcontentlength'] . ' bytes');
-                }
-                $html .= '</td><td>';
-                if (isset($subProps['{DAV:}getlastmodified'])) {
-                    $lastMod = $subProps['{DAV:}getlastmodified']->getTime();
-                    $html .= $this->escapeHTML($lastMod->format('F j, Y, g:i a'));
-                }
-                $html .= '</td>';
-
-                $buttonActions = '';
-                if ($subProps['subNode'] instanceof DAV\IFile) {
-                    $buttonActions =  '<a href="' . $this->escapeHTML($subProps['fullPath']) . '?sabreAction=info"><span class="oi" data-glyph="info"></span></a>';
-                }
-                $this->server->emit('browserButtonActions', [$subProps['fullPath'], $subProps['subNode'], &$buttonActions]);
-
-                $html .= '<td>' . $buttonActions . '</td>';
-                $html .= '</tr>';
-            }
-
-            $html .= '</table>';
-
-        }
-
-        $html .= "</section>";
-        $html .= "<section><h1>Properties</h1>";
-        $html .= "<table class=\"propTable\">";
-
-        // Allprops request
-        $propFind = new PropFindAll($path);
-        $properties = $this->server->getPropertiesByNode($propFind, $node);
-
-        $properties = $propFind->getResultForMultiStatus()[200];
-
-        foreach ($properties as $propName => $propValue) {
-            if (!in_array($propName, $this->uninterestingProperties)) {
-                $html .= $this->drawPropertyRow($propName, $propValue);
-            }
-
-        }
-
-
-        $html .= "</table>";
-        $html .= "</section>";
-
-        /* Start of generating actions */
-
-        $output = '';
-        if ($this->enablePost) {
-            $this->server->emit('onHTMLActionsPanel', [$node, &$output]);
-        }
-
-        if ($output) {
-
-            $html .= "<section><h1>Actions</h1>";
-            $html .= "<div class=\"actions\">\n";
-            $html .= $output;
-            $html .= "</div>\n";
-            $html .= "</section>\n";
-        }
-
-        $html .= $this->generateFooter();
-
-        $this->server->httpResponse->setHeader('Content-Security-Policy', "img-src 'self'; style-src 'self';");
-
-        return $html;
-
-    }
-
-    /**
-     * Generates the 'plugins' page.
-     *
-     * @return string
-     */
-    public function generatePluginListing() {
-
-        $html = $this->generateHeader('Plugins');
-
-        $html .= "<section><h1>Plugins</h1>";
-        $html .= "<table class=\"propTable\">";
-        foreach ($this->server->getPlugins() as $plugin) {
-            $info = $plugin->getPluginInfo();
-            $html .= '<tr><th>' . $info['name'] . '</th>';
-            $html .= '<td>' . $info['description'] . '</td>';
-            $html .= '<td>';
-            if (isset($info['link']) && $info['link']) {
-                $html .= '<a href="' . $this->escapeHTML($info['link']) . '"><span class="oi" data-glyph="book"></span></a>';
-            }
-            $html .= '</td></tr>';
-        }
-        $html .= "</table>";
-        $html .= "</section>";
-
-        /* Start of generating actions */
-
-        $html .= $this->generateFooter();
-
-        return $html;
-
-    }
-
-    /**
-     * Generates the first block of HTML, including the <head> tag and page
-     * header.
-     *
-     * Returns footer.
-     *
-     * @param string $title
-     * @param string $path
-     * @return void
-     */
-    public function generateHeader($title, $path = null) {
+	/**
+	 * reference to server class
+	 *
+	 * @var Sabre\DAV\Server
+	 */
+	protected $server;
+
+	/**
+	 * enablePost turns on the 'actions' panel, which allows people to create
+	 * folders and upload files straight from a browser.
+	 *
+	 * @var bool
+	 */
+	protected $enablePost = true;
+
+	/**
+	 * A list of properties that are usually not interesting. This can cut down
+	 * the browser output a bit by removing the properties that most people
+	 * will likely not want to see.
+	 *
+	 * @var array
+	 */
+	public $uninterestingProperties = [
+		'{DAV:}supportedlock',
+		'{DAV:}acl-restrictions',
+		'{DAV:}supported-privilege-set',
+		'{DAV:}supported-method-set',
+	];
+
+	/**
+	 * Creates the object.
+	 *
+	 * By default it will allow file creation and uploads.
+	 * Specify the first argument as false to disable this
+	 *
+	 * @param bool $enablePost
+	 */
+	public function __construct($enablePost = true) {
+
+		$this->enablePost = $enablePost;
+
+	}
+
+	/**
+	 * Initializes the plugin and subscribes to events
+	 *
+	 * @param DAV\Server $server
+	 * @return void
+	 */
+	public function initialize(DAV\Server $server) {
+
+		$this->server = $server;
+		$this->server->on('method:GET', [$this, 'httpGetEarly'], 90);
+		$this->server->on('method:GET', [$this, 'httpGet'], 200);
+		$this->server->on('onHTMLActionsPanel', [$this, 'htmlActionsPanel'], 200);
+		if ($this->enablePost) $this->server->on('method:POST', [$this, 'httpPOST']);
+	}
+
+	/**
+	 * This method intercepts GET requests that have ?sabreAction=info
+	 * appended to the URL
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpGetEarly(RequestInterface $request, ResponseInterface $response) {
+
+		$params = $request->getQueryParameters();
+		if (isset($params['sabreAction']) && $params['sabreAction'] === 'info') {
+			return $this->httpGet($request, $response);
+		}
+
+	}
+
+	/**
+	 * This method intercepts GET requests to collections and returns the html
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpGet(RequestInterface $request, ResponseInterface $response) {
+
+		// We're not using straight-up $_GET, because we want everything to be
+		// unit testable.
+		$getVars = $request->getQueryParameters();
+
+		// CSP headers
+		$this->server->httpResponse->setHeader('Content-Security-Policy', "img-src 'self'; style-src 'self';");
+
+		$sabreAction = isset($getVars['sabreAction']) ? $getVars['sabreAction'] : null;
+
+		switch ($sabreAction) {
+
+			case 'asset' :
+				// Asset handling, such as images
+				$this->serveAsset(isset($getVars['assetName']) ? $getVars['assetName'] : null);
+				return false;
+			default :
+			case 'info' :
+				try {
+					$this->server->tree->getNodeForPath($request->getPath());
+				} catch (DAV\Exception\NotFound $e) {
+					// We're simply stopping when the file isn't found to not interfere
+					// with other plugins.
+					return;
+				}
+
+				$response->setStatus(200);
+				$response->setHeader('Content-Type', 'text/html; charset=utf-8');
+
+				$response->setBody(
+					$this->generateDirectoryIndex($request->getPath())
+				);
+
+				return false;
+
+			case 'plugins' :
+				$response->setStatus(200);
+				$response->setHeader('Content-Type', 'text/html; charset=utf-8');
+
+				$response->setBody(
+					$this->generatePluginListing()
+				);
+
+				return false;
+
+		}
+
+	}
+
+	/**
+	 * Handles POST requests for tree operations.
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpPOST(RequestInterface $request, ResponseInterface $response) {
+
+		$contentType = $request->getHeader('Content-Type');
+		list($contentType) = explode(';', $contentType);
+		if ($contentType !== 'application/x-www-form-urlencoded' &&
+			$contentType !== 'multipart/form-data') {
+				return;
+		}
+		$postVars = $request->getPostData();
+
+		if (!isset($postVars['sabreAction']))
+			return;
+
+		$uri = $request->getPath();
+
+		if ($this->server->emit('onBrowserPostAction', [$uri, $postVars['sabreAction'], $postVars])) {
+
+			switch ($postVars['sabreAction']) {
+
+				case 'mkcol' :
+					if (isset($postVars['name']) && trim($postVars['name'])) {
+						// Using basename() because we won't allow slashes
+						list(, $folderName) = URLUtil::splitPath(trim($postVars['name']));
+
+						if (isset($postVars['resourceType'])) {
+							$resourceType = explode(',', $postVars['resourceType']);
+						} else {
+							$resourceType = ['{DAV:}collection'];
+						}
+
+						$properties = [];
+						foreach ($postVars as $varName => $varValue) {
+							// Any _POST variable in clark notation is treated
+							// like a property.
+							if ($varName[0] === '{') {
+								// PHP will convert any dots to underscores.
+								// This leaves us with no way to differentiate
+								// the two.
+								// Therefore we replace the string *DOT* with a
+								// real dot. * is not allowed in uris so we
+								// should be good.
+								$varName = str_replace('*DOT*', '.', $varName);
+								$properties[$varName] = $varValue;
+							}
+						}
+
+						$mkCol = new MkCol(
+							$resourceType,
+							$properties
+						);
+						$this->server->createCollection($uri . '/' . $folderName, $mkCol);
+					}
+					break;
+
+				// @codeCoverageIgnoreStart
+				case 'put' :
+
+					if ($_FILES) $file = current($_FILES);
+					else break;
+
+					list(, $newName) = URLUtil::splitPath(trim($file['name']));
+					if (isset($postVars['name']) && trim($postVars['name']))
+						$newName = trim($postVars['name']);
+
+					// Making sure we only have a 'basename' component
+					list(, $newName) = URLUtil::splitPath($newName);
+
+					if (is_uploaded_file($file['tmp_name'])) {
+						$this->server->createFile($uri . '/' . $newName, fopen($file['tmp_name'], 'r'));
+					}
+					break;
+				// @codeCoverageIgnoreEnd
+
+			}
+
+		}
+		$response->setHeader('Location', $request->getUrl());
+		$response->setStatus(302);
+		return false;
+
+	}
+
+	/**
+	 * Escapes a string for html.
+	 *
+	 * @param string $value
+	 * @return string
+	 */
+	public function escapeHTML($value) {
+
+		return htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
+
+	}
+
+	/**
+	 * Generates the html directory index for a given url
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function generateDirectoryIndex($path) {
+
+		$html = $this->generateHeader($path ? $path : '/', $path);
+
+		$node = $this->server->tree->getNodeForPath($path);
+		if ($node instanceof DAV\ICollection) {
+
+			$html .= "<section><h1>Nodes</h1>\n";
+			$html .= "<table class=\"nodeTable\">";
+
+			$subNodes = $this->server->getPropertiesForChildren($path, [
+				'{DAV:}displayname',
+				'{DAV:}resourcetype',
+				'{DAV:}getcontenttype',
+				'{DAV:}getcontentlength',
+				'{DAV:}getlastmodified',
+			]);
+
+			foreach ($subNodes as $subPath => $subProps) {
+
+				$subNode = $this->server->tree->getNodeForPath($subPath);
+				$fullPath = $this->server->getBaseUri() . URLUtil::encodePath($subPath);
+				list(, $displayPath) = URLUtil::splitPath($subPath);
+
+				$subNodes[$subPath]['subNode'] = $subNode;
+				$subNodes[$subPath]['fullPath'] = $fullPath;
+				$subNodes[$subPath]['displayPath'] = $displayPath;
+			}
+			uasort($subNodes, [$this, 'compareNodes']);
+
+			foreach ($subNodes as $subProps) {
+				$type = [
+					'string' => 'Unknown',
+					'icon'   => 'cog',
+				];
+				if (isset($subProps['{DAV:}resourcetype'])) {
+					$type = $this->mapResourceType($subProps['{DAV:}resourcetype']->getValue(), $subProps['subNode']);
+				}
+
+				$html .= '<tr>';
+				$html .= '<td class="nameColumn"><a href="' . $this->escapeHTML($subProps['fullPath']) . '"><span class="oi" data-glyph="' . $this->escapeHTML($type['icon']) . '"></span> ' . $this->escapeHTML($subProps['displayPath']) . '</a></td>';
+				$html .= '<td class="typeColumn">' . $this->escapeHTML($type['string']) . '</td>';
+				$html .= '<td>';
+				if (isset($subProps['{DAV:}getcontentlength'])) {
+					$html .= $this->escapeHTML($subProps['{DAV:}getcontentlength'] . ' bytes');
+				}
+				$html .= '</td><td>';
+				if (isset($subProps['{DAV:}getlastmodified'])) {
+					$lastMod = $subProps['{DAV:}getlastmodified']->getTime();
+					$html .= $this->escapeHTML($lastMod->format('F j, Y, g:i a'));
+				}
+				$html .= '</td>';
+
+				$buttonActions = '';
+				if ($subProps['subNode'] instanceof DAV\IFile) {
+					$buttonActions =  '<a href="' . $this->escapeHTML($subProps['fullPath']) . '?sabreAction=info"><span class="oi" data-glyph="info"></span></a>';
+				}
+				$this->server->emit('browserButtonActions', [$subProps['fullPath'], $subProps['subNode'], &$buttonActions]);
+
+				$html .= '<td>' . $buttonActions . '</td>';
+				$html .= '</tr>';
+			}
+
+			$html .= '</table>';
+
+		}
+
+		$html .= "</section>";
+		$html .= "<section><h1>Properties</h1>";
+		$html .= "<table class=\"propTable\">";
+
+		// Allprops request
+		$propFind = new PropFindAll($path);
+		$properties = $this->server->getPropertiesByNode($propFind, $node);
+
+		$properties = $propFind->getResultForMultiStatus()[200];
+
+		foreach ($properties as $propName => $propValue) {
+			if (!in_array($propName, $this->uninterestingProperties)) {
+				$html .= $this->drawPropertyRow($propName, $propValue);
+			}
+
+		}
+
+
+		$html .= "</table>";
+		$html .= "</section>";
+
+		/* Start of generating actions */
+
+		$output = '';
+		if ($this->enablePost) {
+			$this->server->emit('onHTMLActionsPanel', [$node, &$output]);
+		}
+
+		if ($output) {
+
+			$html .= "<section><h1>Actions</h1>";
+			$html .= "<div class=\"actions\">\n";
+			$html .= $output;
+			$html .= "</div>\n";
+			$html .= "</section>\n";
+		}
+
+		$html .= $this->generateFooter();
+
+		$this->server->httpResponse->setHeader('Content-Security-Policy', "img-src 'self'; style-src 'self';");
+
+		return $html;
+
+	}
+
+	/**
+	 * Generates the 'plugins' page.
+	 *
+	 * @return string
+	 */
+	public function generatePluginListing() {
+
+		$html = $this->generateHeader('Plugins');
+
+		$html .= "<section><h1>Plugins</h1>";
+		$html .= "<table class=\"propTable\">";
+		foreach ($this->server->getPlugins() as $plugin) {
+			$info = $plugin->getPluginInfo();
+			$html .= '<tr><th>' . $info['name'] . '</th>';
+			$html .= '<td>' . $info['description'] . '</td>';
+			$html .= '<td>';
+			if (isset($info['link']) && $info['link']) {
+				$html .= '<a href="' . $this->escapeHTML($info['link']) . '"><span class="oi" data-glyph="book"></span></a>';
+			}
+			$html .= '</td></tr>';
+		}
+		$html .= "</table>";
+		$html .= "</section>";
+
+		/* Start of generating actions */
+
+		$html .= $this->generateFooter();
+
+		return $html;
+
+	}
+
+	/**
+	 * Generates the first block of HTML, including the <head> tag and page
+	 * header.
+	 *
+	 * Returns footer.
+	 *
+	 * @param string $title
+	 * @param string $path
+	 * @return void
+	 */
+	public function generateHeader($title, $path = null) {
 
-        $version = DAV\Version::VERSION;
+		$version = DAV\Version::VERSION;
 
-        $vars = [
-            'title'     => $this->escapeHTML($title),
-            'favicon'   => $this->escapeHTML($this->getAssetUrl('favicon.ico')),
-            'style'     => $this->escapeHTML($this->getAssetUrl('sabredav.css')),
-            'iconstyle' => $this->escapeHTML($this->getAssetUrl('openiconic/open-iconic.css')),
-            'logo'      => $this->escapeHTML($this->getAssetUrl('sabredav.png')),
-            'baseUrl'   => $this->server->getBaseUri(),
-        ];
+		$vars = [
+			'title'     => $this->escapeHTML($title),
+			'favicon'   => $this->escapeHTML($this->getAssetUrl('favicon.ico')),
+			'style'     => $this->escapeHTML($this->getAssetUrl('sabredav.css')),
+			'iconstyle' => $this->escapeHTML($this->getAssetUrl('openiconic/open-iconic.css')),
+			'logo'      => $this->escapeHTML($this->getAssetUrl('sabredav.png')),
+			'baseUrl'   => $this->server->getBaseUri(),
+		];
 
-        $html = <<<HTML
+		$html = <<<HTML
 <!DOCTYPE html>
 <html>
 <head>
@@ -449,64 +449,64 @@ 
     <nav>
 HTML;
 
-        // If the path is empty, there's no parent.
-        if ($path)  {
-            list($parentUri) = URLUtil::splitPath($path);
-            $fullPath = $this->server->getBaseUri() . URLUtil::encodePath($parentUri);
-            $html .= '<a href="' . $fullPath . '" class="btn">⇤ Go to parent</a>';
-        } else {
-            $html .= '<span class="btn disabled">⇤ Go to parent</span>';
-        }
+		// If the path is empty, there's no parent.
+		if ($path)  {
+			list($parentUri) = URLUtil::splitPath($path);
+			$fullPath = $this->server->getBaseUri() . URLUtil::encodePath($parentUri);
+			$html .= '<a href="' . $fullPath . '" class="btn">⇤ Go to parent</a>';
+		} else {
+			$html .= '<span class="btn disabled">⇤ Go to parent</span>';
+		}
 
-        $html .= ' <a href="?sabreAction=plugins" class="btn"><span class="oi" data-glyph="puzzle-piece"></span> Plugins</a>';
+		$html .= ' <a href="?sabreAction=plugins" class="btn"><span class="oi" data-glyph="puzzle-piece"></span> Plugins</a>';
 
-        $html .= "</nav>";
+		$html .= "</nav>";
 
-        return $html;
+		return $html;
 
-    }
+	}
 
-    /**
-     * Generates the page footer.
-     *
-     * Returns html.
-     *
-     * @return string
-     */
-    public function generateFooter() {
+	/**
+	 * Generates the page footer.
+	 *
+	 * Returns html.
+	 *
+	 * @return string
+	 */
+	public function generateFooter() {
 
-        $version = DAV\Version::VERSION;
-        return <<<HTML
+		$version = DAV\Version::VERSION;
+		return <<<HTML
 <footer>Generated by SabreDAV $version (c)2007-2015 <a href="http://sabre.io/">http://sabre.io/</a></footer>
 </body>
 </html>
 HTML;
 
-    }
-
-    /**
-     * This method is used to generate the 'actions panel' output for
-     * collections.
-     *
-     * This specifically generates the interfaces for creating new files, and
-     * creating new directories.
-     *
-     * @param DAV\INode $node
-     * @param mixed $output
-     * @return void
-     */
-    public function htmlActionsPanel(DAV\INode $node, &$output) {
-
-        if (!$node instanceof DAV\ICollection)
-            return;
-
-        // We also know fairly certain that if an object is a non-extended
-        // SimpleCollection, we won't need to show the panel either.
-        if (get_class($node) === 'Sabre\\DAV\\SimpleCollection')
-            return;
-
-        ob_start();
-        echo '<form method="post" action="">
+	}
+
+	/**
+	 * This method is used to generate the 'actions panel' output for
+	 * collections.
+	 *
+	 * This specifically generates the interfaces for creating new files, and
+	 * creating new directories.
+	 *
+	 * @param DAV\INode $node
+	 * @param mixed $output
+	 * @return void
+	 */
+	public function htmlActionsPanel(DAV\INode $node, &$output) {
+
+		if (!$node instanceof DAV\ICollection)
+			return;
+
+		// We also know fairly certain that if an object is a non-extended
+		// SimpleCollection, we won't need to show the panel either.
+		if (get_class($node) === 'Sabre\\DAV\\SimpleCollection')
+			return;
+
+		ob_start();
+		echo '<form method="post" action="">
         <h3>Create new folder</h3>
         <input type="hidden" name="sabreAction" value="mkcol" />
         <label>Name:</label> <input type="text" name="name" /><br />
@@ -521,277 +521,277 @@ 
         </form>
         ';
 
-        $output .= ob_get_clean();
-
-    }
-
-    /**
-     * This method takes a path/name of an asset and turns it into url
-     * suiteable for http access.
-     *
-     * @param string $assetName
-     * @return string
-     */
-    protected function getAssetUrl($assetName) {
-
-        return $this->server->getBaseUri() . '?sabreAction=asset&assetName=' . urlencode($assetName);
-
-    }
-
-    /**
-     * This method returns a local pathname to an asset.
-     *
-     * @param string $assetName
-     * @return string
-     * @throws DAV\Exception\NotFound
-     */
-    protected function getLocalAssetPath($assetName) {
-
-        $assetDir = __DIR__ . '/assets/';
-        $path = $assetDir . $assetName;
-
-        // Making sure people aren't trying to escape from the base path.
-        $path = str_replace('\\', '/', $path);
-        if (strpos($path, '/../') !== false || strrchr($path, '/') === '/..') {
-            throw new DAV\Exception\NotFound('Path does not exist, or escaping from the base path was detected');
-        }
-        if (strpos(realpath($path), realpath($assetDir)) === 0 && file_exists($path)) {
-            return $path;
-        }
-        throw new DAV\Exception\NotFound('Path does not exist, or escaping from the base path was detected');
-    }
-
-    /**
-     * This method reads an asset from disk and generates a full http response.
-     *
-     * @param string $assetName
-     * @return void
-     */
-    protected function serveAsset($assetName) {
-
-        $assetPath = $this->getLocalAssetPath($assetName);
-
-        // Rudimentary mime type detection
-        $mime = 'application/octet-stream';
-        $map = [
-            'ico'  => 'image/vnd.microsoft.icon',
-            'png'  => 'image/png',
-            'css'  => 'text/css',
-        ];
-
-        $ext = substr($assetName, strrpos($assetName, '.') + 1);
-        if (isset($map[$ext])) {
-            $mime = $map[$ext];
-        }
-
-        $this->server->httpResponse->setHeader('Content-Type', $mime);
-        $this->server->httpResponse->setHeader('Content-Length', filesize($assetPath));
-        $this->server->httpResponse->setHeader('Cache-Control', 'public, max-age=1209600');
-        $this->server->httpResponse->setStatus(200);
-        $this->server->httpResponse->setBody(fopen($assetPath, 'r'));
-
-    }
-
-    /**
-     * Sort helper function: compares two directory entries based on type and
-     * display name. Collections sort above other types.
-     *
-     * @param array $a
-     * @param array $b
-     * @return int
-     */
-    protected function compareNodes($a, $b) {
-
-        $typeA = (isset($a['{DAV:}resourcetype']))
-            ? (in_array('{DAV:}collection', $a['{DAV:}resourcetype']->getValue()))
-            : false;
-
-        $typeB = (isset($b['{DAV:}resourcetype']))
-            ? (in_array('{DAV:}collection', $b['{DAV:}resourcetype']->getValue()))
-            : false;
-
-        // If same type, sort alphabetically by filename:
-        if ($typeA === $typeB) {
-            return strnatcasecmp($a['displayPath'], $b['displayPath']);
-        }
-        return (($typeA < $typeB) ? 1 : -1);
-
-    }
-
-    /**
-     * Maps a resource type to a human-readable string and icon.
-     *
-     * @param array $resourceTypes
-     * @param INode $node
-     * @return array
-     */
-    private function mapResourceType(array $resourceTypes, $node) {
-
-        if (!$resourceTypes) {
-            if ($node instanceof DAV\IFile) {
-                return [
-                    'string' => 'File',
-                    'icon'   => 'file',
-                ];
-            } else {
-                return [
-                    'string' => 'Unknown',
-                    'icon'   => 'cog',
-                ];
-            }
-        }
-
-        $types = [
-            '{http://calendarserver.org/ns/}calendar-proxy-write' => [
-                'string' => 'Proxy-Write',
-                'icon'   => 'people',
-            ],
-            '{http://calendarserver.org/ns/}calendar-proxy-read' => [
-                'string' => 'Proxy-Read',
-                'icon'   => 'people',
-            ],
-            '{urn:ietf:params:xml:ns:caldav}schedule-outbox' => [
-                'string' => 'Outbox',
-                'icon'   => 'inbox',
-            ],
-            '{urn:ietf:params:xml:ns:caldav}schedule-inbox' => [
-                'string' => 'Inbox',
-                'icon'   => 'inbox',
-            ],
-            '{urn:ietf:params:xml:ns:caldav}calendar' => [
-                'string' => 'Calendar',
-                'icon'   => 'calendar',
-            ],
-            '{http://calendarserver.org/ns/}shared-owner' => [
-                'string' => 'Shared',
-                'icon'   => 'calendar',
-            ],
-            '{http://calendarserver.org/ns/}subscribed' => [
-                'string' => 'Subscription',
-                'icon'   => 'calendar',
-            ],
-            '{urn:ietf:params:xml:ns:carddav}directory' => [
-                'string' => 'Directory',
-                'icon'   => 'globe',
-            ],
-            '{urn:ietf:params:xml:ns:carddav}addressbook' => [
-                'string' => 'Address book',
-                'icon'   => 'book',
-            ],
-            '{DAV:}principal' => [
-                'string' => 'Principal',
-                'icon'   => 'person',
-            ],
-            '{DAV:}collection' => [
-                'string' => 'Collection',
-                'icon'   => 'folder',
-            ],
-        ];
-
-        $info = [
-            'string' => [],
-            'icon'   => 'cog',
-        ];
-        foreach ($resourceTypes as $k => $resourceType) {
-            if (isset($types[$resourceType])) {
-                $info['string'][] = $types[$resourceType]['string'];
-            } else {
-                $info['string'][] = $resourceType;
-            }
-        }
-        foreach ($types as $key => $resourceInfo) {
-            if (in_array($key, $resourceTypes)) {
-                $info['icon'] = $resourceInfo['icon'];
-                break;
-            }
-        }
-        $info['string'] = implode(', ', $info['string']);
-
-        return $info;
-
-    }
-
-    /**
-     * Draws a table row for a property
-     *
-     * @param string $name
-     * @param mixed $value
-     * @return string
-     */
-    private function drawPropertyRow($name, $value) {
-
-        $html = new HtmlOutputHelper(
-            $this->server->getBaseUri(),
-            $this->server->xml->namespaceMap
-        );
-
-        return "<tr><th>" . $html->xmlName($name) . "</th><td>" . $this->drawPropertyValue($html, $value) . "</td></tr>";
-
-    }
-
-    /**
-     * Draws a table row for a property
-     *
-     * @param HtmlOutputHelper $html
-     * @param mixed $value
-     * @return string
-     */
-    private function drawPropertyValue($html, $value) {
-
-        if (is_scalar($value)) {
-            return $html->h($value);
-        } elseif ($value instanceof HtmlOutput) {
-            return $value->toHtml($html);
-        } elseif ($value instanceof \Sabre\Xml\XmlSerializable) {
-
-            // There's no default html output for this property, we're going
-            // to output the actual xml serialization instead.
-            $xml = $this->server->xml->write('{DAV:}root', $value, $this->server->getBaseUri());
-            // removing first and last line, as they contain our root
-            // element.
-            $xml = explode("\n", $xml);
-            $xml = array_slice($xml, 2, -2);
-            return "<pre>" . $html->h(implode("\n", $xml)) . "</pre>";
-
-        } else {
-            return "<em>unknown</em>";
-        }
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins;
-     * using \Sabre\DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'browser';
-
-    }
-
-    /**
-     * Returns a bunch of meta-data about the plugin.
-     *
-     * Providing this information is optional, and is mainly displayed by the
-     * Browser plugin.
-     *
-     * The description key in the returned array may contain html and will not
-     * be sanitized.
-     *
-     * @return array
-     */
-    public function getPluginInfo() {
-
-        return [
-            'name'        => $this->getPluginName(),
-            'description' => 'Generates HTML indexes and debug information for your sabre/dav server',
-            'link'        => 'http://sabre.io/dav/browser-plugin/',
-        ];
-
-    }
+		$output .= ob_get_clean();
+
+	}
+
+	/**
+	 * This method takes a path/name of an asset and turns it into url
+	 * suiteable for http access.
+	 *
+	 * @param string $assetName
+	 * @return string
+	 */
+	protected function getAssetUrl($assetName) {
+
+		return $this->server->getBaseUri() . '?sabreAction=asset&assetName=' . urlencode($assetName);
+
+	}
+
+	/**
+	 * This method returns a local pathname to an asset.
+	 *
+	 * @param string $assetName
+	 * @return string
+	 * @throws DAV\Exception\NotFound
+	 */
+	protected function getLocalAssetPath($assetName) {
+
+		$assetDir = __DIR__ . '/assets/';
+		$path = $assetDir . $assetName;
+
+		// Making sure people aren't trying to escape from the base path.
+		$path = str_replace('\\', '/', $path);
+		if (strpos($path, '/../') !== false || strrchr($path, '/') === '/..') {
+			throw new DAV\Exception\NotFound('Path does not exist, or escaping from the base path was detected');
+		}
+		if (strpos(realpath($path), realpath($assetDir)) === 0 && file_exists($path)) {
+			return $path;
+		}
+		throw new DAV\Exception\NotFound('Path does not exist, or escaping from the base path was detected');
+	}
+
+	/**
+	 * This method reads an asset from disk and generates a full http response.
+	 *
+	 * @param string $assetName
+	 * @return void
+	 */
+	protected function serveAsset($assetName) {
+
+		$assetPath = $this->getLocalAssetPath($assetName);
+
+		// Rudimentary mime type detection
+		$mime = 'application/octet-stream';
+		$map = [
+			'ico'  => 'image/vnd.microsoft.icon',
+			'png'  => 'image/png',
+			'css'  => 'text/css',
+		];
+
+		$ext = substr($assetName, strrpos($assetName, '.') + 1);
+		if (isset($map[$ext])) {
+			$mime = $map[$ext];
+		}
+
+		$this->server->httpResponse->setHeader('Content-Type', $mime);
+		$this->server->httpResponse->setHeader('Content-Length', filesize($assetPath));
+		$this->server->httpResponse->setHeader('Cache-Control', 'public, max-age=1209600');
+		$this->server->httpResponse->setStatus(200);
+		$this->server->httpResponse->setBody(fopen($assetPath, 'r'));
+
+	}
+
+	/**
+	 * Sort helper function: compares two directory entries based on type and
+	 * display name. Collections sort above other types.
+	 *
+	 * @param array $a
+	 * @param array $b
+	 * @return int
+	 */
+	protected function compareNodes($a, $b) {
+
+		$typeA = (isset($a['{DAV:}resourcetype']))
+			? (in_array('{DAV:}collection', $a['{DAV:}resourcetype']->getValue()))
+			: false;
+
+		$typeB = (isset($b['{DAV:}resourcetype']))
+			? (in_array('{DAV:}collection', $b['{DAV:}resourcetype']->getValue()))
+			: false;
+
+		// If same type, sort alphabetically by filename:
+		if ($typeA === $typeB) {
+			return strnatcasecmp($a['displayPath'], $b['displayPath']);
+		}
+		return (($typeA < $typeB) ? 1 : -1);
+
+	}
+
+	/**
+	 * Maps a resource type to a human-readable string and icon.
+	 *
+	 * @param array $resourceTypes
+	 * @param INode $node
+	 * @return array
+	 */
+	private function mapResourceType(array $resourceTypes, $node) {
+
+		if (!$resourceTypes) {
+			if ($node instanceof DAV\IFile) {
+				return [
+					'string' => 'File',
+					'icon'   => 'file',
+				];
+			} else {
+				return [
+					'string' => 'Unknown',
+					'icon'   => 'cog',
+				];
+			}
+		}
+
+		$types = [
+			'{http://calendarserver.org/ns/}calendar-proxy-write' => [
+				'string' => 'Proxy-Write',
+				'icon'   => 'people',
+			],
+			'{http://calendarserver.org/ns/}calendar-proxy-read' => [
+				'string' => 'Proxy-Read',
+				'icon'   => 'people',
+			],
+			'{urn:ietf:params:xml:ns:caldav}schedule-outbox' => [
+				'string' => 'Outbox',
+				'icon'   => 'inbox',
+			],
+			'{urn:ietf:params:xml:ns:caldav}schedule-inbox' => [
+				'string' => 'Inbox',
+				'icon'   => 'inbox',
+			],
+			'{urn:ietf:params:xml:ns:caldav}calendar' => [
+				'string' => 'Calendar',
+				'icon'   => 'calendar',
+			],
+			'{http://calendarserver.org/ns/}shared-owner' => [
+				'string' => 'Shared',
+				'icon'   => 'calendar',
+			],
+			'{http://calendarserver.org/ns/}subscribed' => [
+				'string' => 'Subscription',
+				'icon'   => 'calendar',
+			],
+			'{urn:ietf:params:xml:ns:carddav}directory' => [
+				'string' => 'Directory',
+				'icon'   => 'globe',
+			],
+			'{urn:ietf:params:xml:ns:carddav}addressbook' => [
+				'string' => 'Address book',
+				'icon'   => 'book',
+			],
+			'{DAV:}principal' => [
+				'string' => 'Principal',
+				'icon'   => 'person',
+			],
+			'{DAV:}collection' => [
+				'string' => 'Collection',
+				'icon'   => 'folder',
+			],
+		];
+
+		$info = [
+			'string' => [],
+			'icon'   => 'cog',
+		];
+		foreach ($resourceTypes as $k => $resourceType) {
+			if (isset($types[$resourceType])) {
+				$info['string'][] = $types[$resourceType]['string'];
+			} else {
+				$info['string'][] = $resourceType;
+			}
+		}
+		foreach ($types as $key => $resourceInfo) {
+			if (in_array($key, $resourceTypes)) {
+				$info['icon'] = $resourceInfo['icon'];
+				break;
+			}
+		}
+		$info['string'] = implode(', ', $info['string']);
+
+		return $info;
+
+	}
+
+	/**
+	 * Draws a table row for a property
+	 *
+	 * @param string $name
+	 * @param mixed $value
+	 * @return string
+	 */
+	private function drawPropertyRow($name, $value) {
+
+		$html = new HtmlOutputHelper(
+			$this->server->getBaseUri(),
+			$this->server->xml->namespaceMap
+		);
+
+		return "<tr><th>" . $html->xmlName($name) . "</th><td>" . $this->drawPropertyValue($html, $value) . "</td></tr>";
+
+	}
+
+	/**
+	 * Draws a table row for a property
+	 *
+	 * @param HtmlOutputHelper $html
+	 * @param mixed $value
+	 * @return string
+	 */
+	private function drawPropertyValue($html, $value) {
+
+		if (is_scalar($value)) {
+			return $html->h($value);
+		} elseif ($value instanceof HtmlOutput) {
+			return $value->toHtml($html);
+		} elseif ($value instanceof \Sabre\Xml\XmlSerializable) {
+
+			// There's no default html output for this property, we're going
+			// to output the actual xml serialization instead.
+			$xml = $this->server->xml->write('{DAV:}root', $value, $this->server->getBaseUri());
+			// removing first and last line, as they contain our root
+			// element.
+			$xml = explode("\n", $xml);
+			$xml = array_slice($xml, 2, -2);
+			return "<pre>" . $html->h(implode("\n", $xml)) . "</pre>";
+
+		} else {
+			return "<em>unknown</em>";
+		}
+
+	}
+
+	/**
+	 * Returns a plugin name.
+	 *
+	 * Using this name other plugins will be able to access other plugins;
+	 * using \Sabre\DAV\Server::getPlugin
+	 *
+	 * @return string
+	 */
+	public function getPluginName() {
+
+		return 'browser';
+
+	}
+
+	/**
+	 * Returns a bunch of meta-data about the plugin.
+	 *
+	 * Providing this information is optional, and is mainly displayed by the
+	 * Browser plugin.
+	 *
+	 * The description key in the returned array may contain html and will not
+	 * be sanitized.
+	 *
+	 * @return array
+	 */
+	public function getPluginInfo() {
+
+		return [
+			'name'        => $this->getPluginName(),
+			'description' => 'Generates HTML indexes and debug information for your sabre/dav server',
+			'link'        => 'http://sabre.io/dav/browser-plugin/',
+		];
+
+	}
 
 }

Doc Comments +3 added lines, -3 removed lines

@@ -87,7 +87,7 @@ 
      *
      * @param RequestInterface $request
      * @param ResponseInterface $response
-     * @return bool
+     * @return boolean|null
      */
     public function httpGetEarly(RequestInterface $request, ResponseInterface $response) {
 
@@ -160,7 +160,7 @@ 
      *
      * @param RequestInterface $request
      * @param ResponseInterface $response
-     * @return bool
+     * @return null|false
      */
     public function httpPOST(RequestInterface $request, ResponseInterface $response) {
 
@@ -414,7 +414,7 @@ 
      *
      * @param string $title
      * @param string $path
-     * @return void
+     * @return string
      */
     public function generateHeader($title, $path = null) {
 

Braces +20 added lines, -11 removed lines

@@ -78,7 +78,9 @@ 
         $this->server->on('method:GET', [$this, 'httpGetEarly'], 90);
         $this->server->on('method:GET', [$this, 'httpGet'], 200);
         $this->server->on('onHTMLActionsPanel', [$this, 'htmlActionsPanel'], 200);
-        if ($this->enablePost) $this->server->on('method:POST', [$this, 'httpPOST']);
+        if ($this->enablePost) {
+        	$this->server->on('method:POST', [$this, 'httpPOST']);
+        }
     }
 
     /**
@@ -172,8 +174,9 @@ 
         }
         $postVars = $request->getPostData();
 
-        if (!isset($postVars['sabreAction']))
-            return;
+        if (!isset($postVars['sabreAction'])) {
+                    return;
+        }
 
         $uri = $request->getPath();
 
@@ -219,12 +222,16 @@ 
                 // @codeCoverageIgnoreStart
                 case 'put' :
 
-                    if ($_FILES) $file = current($_FILES);
-                    else break;
+                    if ($_FILES) {
+                    	$file = current($_FILES);
+                    } else {
+                    	break;
+                    }
 
                     list(, $newName) = URLUtil::splitPath(trim($file['name']));
-                    if (isset($postVars['name']) && trim($postVars['name']))
-                        $newName = trim($postVars['name']);
+                    if (isset($postVars['name']) && trim($postVars['name'])) {
+                                            $newName = trim($postVars['name']);
+                    }
 
                     // Making sure we only have a 'basename' component
                     list(, $newName) = URLUtil::splitPath($newName);
@@ -497,13 +504,15 @@ 
      */
     public function htmlActionsPanel(DAV\INode $node, &$output) {
 
-        if (!$node instanceof DAV\ICollection)
-            return;
+        if (!$node instanceof DAV\ICollection) {
+                    return;
+        }
 
         // We also know fairly certain that if an object is a non-extended
         // SimpleCollection, we won't need to show the panel either.
-        if (get_class($node) === 'Sabre\\DAV\\SimpleCollection')
-            return;
+        if (get_class($node) === 'Sabre\\DAV\\SimpleCollection') {
+                    return;
+        }
 
         ob_start();
         echo '<form method="post" action="">

libraries/SabreDAV/DAV/Exception/InvalidResourceType.php

Doc Comments +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     /**
      * This method allows the exception to include additional information into the WebDAV error response
      *
-     * @param DAV\Server $server
+     * @param \Sabre\DAV\Server $server
      * @param \DOMElement $errorNode
      * @return void
      */

Indentation +11 added lines, -11 removed lines

@@ -16,18 +16,18 @@
  */
 class InvalidResourceType extends Forbidden {
 
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(\Sabre\DAV\Server $server, \DOMElement $errorNode) {
+	/**
+	 * This method allows the exception to include additional information into the WebDAV error response
+	 *
+	 * @param DAV\Server $server
+	 * @param \DOMElement $errorNode
+	 * @return void
+	 */
+	public function serialize(\Sabre\DAV\Server $server, \DOMElement $errorNode) {
 
-        $error = $errorNode->ownerDocument->createElementNS('DAV:', 'd:valid-resourcetype');
-        $errorNode->appendChild($error);
+		$error = $errorNode->ownerDocument->createElementNS('DAV:', 'd:valid-resourcetype');
+		$errorNode->appendChild($error);
 
-    }
+	}
 
 }

libraries/SabreDAV/DAV/PropertyStorage/Plugin.php

Unused Use Statements +3 added lines, -3 removed lines

@@ -2,11 +2,11 @@
 
 namespace Sabre\DAV\PropertyStorage;
 
+use Sabre\DAV\INode;
+use Sabre\DAV\PropFind;
+use Sabre\DAV\PropPatch;
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
-use Sabre\DAV\PropPatch;
-use Sabre\DAV\PropFind;
-use Sabre\DAV\INode;
 
 /**
  * PropertyStorage Plugin.

Indentation +152 added lines, -152 removed lines

@@ -25,156 +25,156 @@
  */
 class Plugin extends ServerPlugin {
 
-    /**
-     * If you only want this plugin to store properties for a limited set of
-     * paths, you can use a pathFilter to do this.
-     *
-     * The pathFilter should be a callable. The callable retrieves a path as
-     * its argument, and should return true or false wether it allows
-     * properties to be stored.
-     *
-     * @var callable
-     */
-    public $pathFilter;
-
-    /**
-     * Creates the plugin
-     *
-     * @param Backend\BackendInterface $backend
-     */
-    public function __construct(Backend\BackendInterface $backend) {
-
-        $this->backend = $backend;
-
-    }
-
-    /**
-     * This initializes the plugin.
-     *
-     * This function is called by Sabre\DAV\Server, after
-     * addPlugin is called.
-     *
-     * This method should set up the required event subscriptions.
-     *
-     * @param Server $server
-     * @return void
-     */
-    public function initialize(Server $server) {
-
-        $server->on('propFind',    [$this, 'propFind'], 130);
-        $server->on('propPatch',   [$this, 'propPatch'], 300);
-        $server->on('afterMove',   [$this, 'afterMove']);
-        $server->on('afterUnbind', [$this, 'afterUnbind']);
-
-    }
-
-    /**
-     * Called during PROPFIND operations.
-     *
-     * If there's any requested properties that don't have a value yet, this
-     * plugin will look in the property storage backend to find them.
-     *
-     * @param PropFind $propFind
-     * @param INode $node
-     * @return void
-     */
-    public function propFind(PropFind $propFind, INode $node) {
-
-        $path = $propFind->getPath();
-        $pathFilter = $this->pathFilter;
-        if ($pathFilter && !$pathFilter($path)) return;
-        $this->backend->propFind($propFind->getPath(), $propFind);
-
-    }
-
-    /**
-     * Called during PROPPATCH operations
-     *
-     * If there's any updated properties that haven't been stored, the
-     * propertystorage backend can handle it.
-     *
-     * @param string $path
-     * @param PropPatch $propPatch
-     * @return void
-     */
-    public function propPatch($path, PropPatch $propPatch) {
-
-        $pathFilter = $this->pathFilter;
-        if ($pathFilter && !$pathFilter($path)) return;
-        $this->backend->propPatch($path, $propPatch);
-
-    }
-
-    /**
-     * Called after a node is deleted.
-     *
-     * This allows the backend to clean up any properties still in the
-     * database.
-     *
-     * @param string $path
-     * @return void
-     */
-    public function afterUnbind($path) {
-
-        $pathFilter = $this->pathFilter;
-        if ($pathFilter && !$pathFilter($path)) return;
-        $this->backend->delete($path);
-
-    }
-
-    /**
-     * Called after a node is moved.
-     *
-     * This allows the backend to move all the associated properties.
-     *
-     * @param string $source
-     * @param string $destination
-     * @return void
-     */
-    public function afterMove($source, $destination) {
-
-        $pathFilter = $this->pathFilter;
-        if ($pathFilter && !$pathFilter($source)) return;
-        // If the destination is filtered, afterUnbind will handle cleaning up
-        // the properties.
-        if ($pathFilter && !$pathFilter($destination)) return;
-
-        $this->backend->move($source, $destination);
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using \Sabre\DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'property-storage';
-
-    }
-
-    /**
-     * Returns a bunch of meta-data about the plugin.
-     *
-     * Providing this information is optional, and is mainly displayed by the
-     * Browser plugin.
-     *
-     * The description key in the returned array may contain html and will not
-     * be sanitized.
-     *
-     * @return array
-     */
-    public function getPluginInfo() {
-
-        return [
-            'name'        => $this->getPluginName(),
-            'description' => 'This plugin allows any arbitrary WebDAV property to be set on any resource.',
-            'link'        => 'http://sabre.io/dav/property-storage/',
-        ];
-
-    }
+	/**
+	 * If you only want this plugin to store properties for a limited set of
+	 * paths, you can use a pathFilter to do this.
+	 *
+	 * The pathFilter should be a callable. The callable retrieves a path as
+	 * its argument, and should return true or false wether it allows
+	 * properties to be stored.
+	 *
+	 * @var callable
+	 */
+	public $pathFilter;
+
+	/**
+	 * Creates the plugin
+	 *
+	 * @param Backend\BackendInterface $backend
+	 */
+	public function __construct(Backend\BackendInterface $backend) {
+
+		$this->backend = $backend;
+
+	}
+
+	/**
+	 * This initializes the plugin.
+	 *
+	 * This function is called by Sabre\DAV\Server, after
+	 * addPlugin is called.
+	 *
+	 * This method should set up the required event subscriptions.
+	 *
+	 * @param Server $server
+	 * @return void
+	 */
+	public function initialize(Server $server) {
+
+		$server->on('propFind',    [$this, 'propFind'], 130);
+		$server->on('propPatch',   [$this, 'propPatch'], 300);
+		$server->on('afterMove',   [$this, 'afterMove']);
+		$server->on('afterUnbind', [$this, 'afterUnbind']);
+
+	}
+
+	/**
+	 * Called during PROPFIND operations.
+	 *
+	 * If there's any requested properties that don't have a value yet, this
+	 * plugin will look in the property storage backend to find them.
+	 *
+	 * @param PropFind $propFind
+	 * @param INode $node
+	 * @return void
+	 */
+	public function propFind(PropFind $propFind, INode $node) {
+
+		$path = $propFind->getPath();
+		$pathFilter = $this->pathFilter;
+		if ($pathFilter && !$pathFilter($path)) return;
+		$this->backend->propFind($propFind->getPath(), $propFind);
+
+	}
+
+	/**
+	 * Called during PROPPATCH operations
+	 *
+	 * If there's any updated properties that haven't been stored, the
+	 * propertystorage backend can handle it.
+	 *
+	 * @param string $path
+	 * @param PropPatch $propPatch
+	 * @return void
+	 */
+	public function propPatch($path, PropPatch $propPatch) {
+
+		$pathFilter = $this->pathFilter;
+		if ($pathFilter && !$pathFilter($path)) return;
+		$this->backend->propPatch($path, $propPatch);
+
+	}
+
+	/**
+	 * Called after a node is deleted.
+	 *
+	 * This allows the backend to clean up any properties still in the
+	 * database.
+	 *
+	 * @param string $path
+	 * @return void
+	 */
+	public function afterUnbind($path) {
+
+		$pathFilter = $this->pathFilter;
+		if ($pathFilter && !$pathFilter($path)) return;
+		$this->backend->delete($path);
+
+	}
+
+	/**
+	 * Called after a node is moved.
+	 *
+	 * This allows the backend to move all the associated properties.
+	 *
+	 * @param string $source
+	 * @param string $destination
+	 * @return void
+	 */
+	public function afterMove($source, $destination) {
+
+		$pathFilter = $this->pathFilter;
+		if ($pathFilter && !$pathFilter($source)) return;
+		// If the destination is filtered, afterUnbind will handle cleaning up
+		// the properties.
+		if ($pathFilter && !$pathFilter($destination)) return;
+
+		$this->backend->move($source, $destination);
+
+	}
+
+	/**
+	 * Returns a plugin name.
+	 *
+	 * Using this name other plugins will be able to access other plugins
+	 * using \Sabre\DAV\Server::getPlugin
+	 *
+	 * @return string
+	 */
+	public function getPluginName() {
+
+		return 'property-storage';
+
+	}
+
+	/**
+	 * Returns a bunch of meta-data about the plugin.
+	 *
+	 * Providing this information is optional, and is mainly displayed by the
+	 * Browser plugin.
+	 *
+	 * The description key in the returned array may contain html and will not
+	 * be sanitized.
+	 *
+	 * @return array
+	 */
+	public function getPluginInfo() {
+
+		return [
+			'name'        => $this->getPluginName(),
+			'description' => 'This plugin allows any arbitrary WebDAV property to be set on any resource.',
+			'link'        => 'http://sabre.io/dav/property-storage/',
+		];
+
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -61,9 +61,9 @@
      */
     public function initialize(Server $server) {
 
-        $server->on('propFind',    [$this, 'propFind'], 130);
-        $server->on('propPatch',   [$this, 'propPatch'], 300);
-        $server->on('afterMove',   [$this, 'afterMove']);
+        $server->on('propFind', [$this, 'propFind'], 130);
+        $server->on('propPatch', [$this, 'propPatch'], 300);
+        $server->on('afterMove', [$this, 'afterMove']);
         $server->on('afterUnbind', [$this, 'afterUnbind']);
 
     }

Braces +15 added lines, -5 removed lines

@@ -82,7 +82,9 @@ 
 
         $path = $propFind->getPath();
         $pathFilter = $this->pathFilter;
-        if ($pathFilter && !$pathFilter($path)) return;
+        if ($pathFilter && !$pathFilter($path)) {
+        	return;
+        }
         $this->backend->propFind($propFind->getPath(), $propFind);
 
     }
@@ -100,7 +102,9 @@ 
     public function propPatch($path, PropPatch $propPatch) {
 
         $pathFilter = $this->pathFilter;
-        if ($pathFilter && !$pathFilter($path)) return;
+        if ($pathFilter && !$pathFilter($path)) {
+        	return;
+        }
         $this->backend->propPatch($path, $propPatch);
 
     }
@@ -117,7 +121,9 @@ 
     public function afterUnbind($path) {
 
         $pathFilter = $this->pathFilter;
-        if ($pathFilter && !$pathFilter($path)) return;
+        if ($pathFilter && !$pathFilter($path)) {
+        	return;
+        }
         $this->backend->delete($path);
 
     }
@@ -134,10 +140,14 @@ 
     public function afterMove($source, $destination) {
 
         $pathFilter = $this->pathFilter;
-        if ($pathFilter && !$pathFilter($source)) return;
+        if ($pathFilter && !$pathFilter($source)) {
+        	return;
+        }
         // If the destination is filtered, afterUnbind will handle cleaning up
         // the properties.
-        if ($pathFilter && !$pathFilter($destination)) return;
+        if ($pathFilter && !$pathFilter($destination)) {
+        	return;
+        }
 
         $this->backend->move($source, $destination);
 

libraries/SabreDAV/DAV/PropPatch.php

Doc Comments +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
     /**
      * Sets the result code for one or more properties.
      *
-     * @param string|string[] $properties
+     * @param string[] $properties
      * @param int $resultCode
      * @return void
      */

Indentation +350 added lines, -350 removed lines

@@ -19,355 +19,355 @@
  */
 class PropPatch {
 
-    /**
-     * Properties that are being updated.
-     *
-     * This is a key-value list. If the value is null, the property is supposed
-     * to be deleted.
-     *
-     * @var array
-     */
-    protected $mutations;
-
-    /**
-     * A list of properties and the result of the update. The result is in the
-     * form of a HTTP status code.
-     *
-     * @var array
-     */
-    protected $result = [];
-
-    /**
-     * This is the list of callbacks when we're performing the actual update.
-     *
-     * @var array
-     */
-    protected $propertyUpdateCallbacks = [];
-
-    /**
-     * This property will be set to true if the operation failed.
-     *
-     * @var bool
-     */
-    protected $failed = false;
-
-    /**
-     * Constructor
-     *
-     * @param array $mutations A list of updates
-     */
-    public function __construct(array $mutations) {
-
-        $this->mutations = $mutations;
-
-    }
-
-    /**
-     * Call this function if you wish to handle updating certain properties.
-     * For instance, your class may be responsible for handling updates for the
-     * {DAV:}displayname property.
-     *
-     * In that case, call this method with the first argument
-     * "{DAV:}displayname" and a second argument that's a method that does the
-     * actual updating.
-     *
-     * It's possible to specify more than one property as an array.
-     *
-     * The callback must return a boolean or an it. If the result is true, the
-     * operation was considered successful. If it's false, it's consided
-     * failed.
-     *
-     * If the result is an integer, we'll use that integer as the http status
-     * code associated with the operation.
-     *
-     * @param string|string[] $properties
-     * @param callable $callback
-     * @return void
-     */
-    public function handle($properties, callable $callback) {
-
-        $usedProperties = [];
-        foreach ((array)$properties as $propertyName) {
-
-            if (array_key_exists($propertyName, $this->mutations) && !isset($this->result[$propertyName])) {
-
-                $usedProperties[] = $propertyName;
-                // HTTP Accepted
-                $this->result[$propertyName] = 202;
-            }
-
-        }
-
-        // Only registering if there's any unhandled properties.
-        if (!$usedProperties) {
-            return;
-        }
-        $this->propertyUpdateCallbacks[] = [
-            // If the original argument to this method was a string, we need
-            // to also make sure that it stays that way, so the commit function
-            // knows how to format the arguments to the callback.
-            is_string($properties) ? $properties : $usedProperties,
-            $callback
-        ];
-
-    }
-
-    /**
-     * Call this function if you wish to handle _all_ properties that haven't
-     * been handled by anything else yet. Note that you effectively claim with
-     * this that you promise to process _all_ properties that are coming in.
-     *
-     * @param callable $callback
-     * @return void
-     */
-    public function handleRemaining(callable $callback) {
-
-        $properties = $this->getRemainingMutations();
-        if (!$properties) {
-            // Nothing to do, don't register callback
-            return;
-        }
-
-        foreach ($properties as $propertyName) {
-            // HTTP Accepted
-            $this->result[$propertyName] = 202;
-
-            $this->propertyUpdateCallbacks[] = [
-                $properties,
-                $callback
-            ];
-        }
-
-    }
-
-    /**
-     * Sets the result code for one or more properties.
-     *
-     * @param string|string[] $properties
-     * @param int $resultCode
-     * @return void
-     */
-    public function setResultCode($properties, $resultCode) {
-
-        foreach ((array)$properties as $propertyName) {
-            $this->result[$propertyName] = $resultCode;
-        }
-
-        if ($resultCode >= 400) {
-            $this->failed = true;
-        }
-
-    }
-
-    /**
-     * Sets the result code for all properties that did not have a result yet.
-     *
-     * @param int $resultCode
-     * @return void
-     */
-    public function setRemainingResultCode($resultCode) {
-
-        $this->setResultCode(
-            $this->getRemainingMutations(),
-            $resultCode
-        );
-
-    }
-
-    /**
-     * Returns the list of properties that don't have a result code yet.
-     *
-     * This method returns a list of property names, but not its values.
-     *
-     * @return string[]
-     */
-    public function getRemainingMutations() {
-
-        $remaining = [];
-        foreach ($this->mutations as $propertyName => $propValue) {
-            if (!isset($this->result[$propertyName])) {
-                $remaining[] = $propertyName;
-            }
-        }
-
-        return $remaining;
-
-    }
-
-    /**
-     * Returns the list of properties that don't have a result code yet.
-     *
-     * This method returns list of properties and their values.
-     *
-     * @return array
-     */
-    public function getRemainingValues() {
-
-        $remaining = [];
-        foreach ($this->mutations as $propertyName => $propValue) {
-            if (!isset($this->result[$propertyName])) {
-                $remaining[$propertyName] = $propValue;
-            }
-        }
-
-        return $remaining;
-
-    }
-
-    /**
-     * Performs the actual update, and calls all callbacks.
-     *
-     * This method returns true or false depending on if the operation was
-     * successful.
-     *
-     * @return bool
-     */
-    public function commit() {
-
-        // First we validate if every property has a handler
-        foreach ($this->mutations as $propertyName => $value) {
-
-            if (!isset($this->result[$propertyName])) {
-                $this->failed = true;
-                $this->result[$propertyName] = 403;
-            }
-
-        }
-
-        foreach ($this->propertyUpdateCallbacks as $callbackInfo) {
-
-            if ($this->failed) {
-                break;
-            }
-            if (is_string($callbackInfo[0])) {
-                $this->doCallbackSingleProp($callbackInfo[0], $callbackInfo[1]);
-            } else {
-                $this->doCallbackMultiProp($callbackInfo[0], $callbackInfo[1]);
-            }
-
-        }
-
-        /**
-         * If anywhere in this operation updating a property failed, we must
-         * update all other properties accordingly.
-         */
-        if ($this->failed) {
-
-            foreach ($this->result as $propertyName => $status) {
-                if ($status === 202) {
-                    // Failed dependency
-                    $this->result[$propertyName] = 424;
-                }
-            }
-
-        }
-
-        return !$this->failed;
-
-    }
-
-    /**
-     * Executes a property callback with the single-property syntax.
-     *
-     * @param string $propertyName
-     * @param callable $callback
-     * @return void
-     */
-    private function doCallBackSingleProp($propertyName, callable $callback) {
-
-        $result = $callback($this->mutations[$propertyName]);
-        if (is_bool($result)) {
-            if ($result) {
-                if (is_null($this->mutations[$propertyName])) {
-                    // Delete
-                    $result = 204;
-                } else {
-                    // Update
-                    $result = 200;
-                }
-            } else {
-                // Fail
-                $result = 403;
-            }
-        }
-        if (!is_int($result)) {
-            throw new UnexpectedValueException('A callback sent to handle() did not return an int or a bool');
-        }
-        $this->result[$propertyName] = $result;
-        if ($result >= 400) {
-            $this->failed = true;
-        }
-
-    }
-
-    /**
-     * Executes a property callback with the multi-property syntax.
-     *
-     * @param array $propertyList
-     * @param callable $callback
-     * @return void
-     */
-    private function doCallBackMultiProp(array $propertyList, callable $callback) {
-
-        $argument = [];
-        foreach ($propertyList as $propertyName) {
-            $argument[$propertyName] = $this->mutations[$propertyName];
-        }
-
-        $result = $callback($argument);
-
-        if (is_array($result)) {
-            foreach ($propertyList as $propertyName) {
-                if (!isset($result[$propertyName])) {
-                    $resultCode = 500;
-                } else {
-                    $resultCode = $result[$propertyName];
-                }
-                if ($resultCode >= 400) {
-                    $this->failed = true;
-                }
-                $this->result[$propertyName] = $resultCode;
-
-            }
-        } elseif ($result === true) {
-
-            // Success
-            foreach ($argument as $propertyName => $propertyValue) {
-                $this->result[$propertyName] = is_null($propertyValue) ? 204 : 200;
-            }
-
-        } elseif ($result === false) {
-            // Fail :(
-            $this->failed = true;
-            foreach ($propertyList as $propertyName) {
-                $this->result[$propertyName] = 403;
-            }
-        } else {
-            throw new UnexpectedValueException('A callback sent to handle() did not return an array or a bool');
-        }
-
-    }
-
-    /**
-     * Returns the result of the operation.
-     *
-     * @return array
-     */
-    public function getResult() {
-
-        return $this->result;
-
-    }
-
-    /**
-     * Returns the full list of mutations
-     *
-     * @return array
-     */
-    public function getMutations() {
-
-        return $this->mutations;
-
-    }
+	/**
+	 * Properties that are being updated.
+	 *
+	 * This is a key-value list. If the value is null, the property is supposed
+	 * to be deleted.
+	 *
+	 * @var array
+	 */
+	protected $mutations;
+
+	/**
+	 * A list of properties and the result of the update. The result is in the
+	 * form of a HTTP status code.
+	 *
+	 * @var array
+	 */
+	protected $result = [];
+
+	/**
+	 * This is the list of callbacks when we're performing the actual update.
+	 *
+	 * @var array
+	 */
+	protected $propertyUpdateCallbacks = [];
+
+	/**
+	 * This property will be set to true if the operation failed.
+	 *
+	 * @var bool
+	 */
+	protected $failed = false;
+
+	/**
+	 * Constructor
+	 *
+	 * @param array $mutations A list of updates
+	 */
+	public function __construct(array $mutations) {
+
+		$this->mutations = $mutations;
+
+	}
+
+	/**
+	 * Call this function if you wish to handle updating certain properties.
+	 * For instance, your class may be responsible for handling updates for the
+	 * {DAV:}displayname property.
+	 *
+	 * In that case, call this method with the first argument
+	 * "{DAV:}displayname" and a second argument that's a method that does the
+	 * actual updating.
+	 *
+	 * It's possible to specify more than one property as an array.
+	 *
+	 * The callback must return a boolean or an it. If the result is true, the
+	 * operation was considered successful. If it's false, it's consided
+	 * failed.
+	 *
+	 * If the result is an integer, we'll use that integer as the http status
+	 * code associated with the operation.
+	 *
+	 * @param string|string[] $properties
+	 * @param callable $callback
+	 * @return void
+	 */
+	public function handle($properties, callable $callback) {
+
+		$usedProperties = [];
+		foreach ((array)$properties as $propertyName) {
+
+			if (array_key_exists($propertyName, $this->mutations) && !isset($this->result[$propertyName])) {
+
+				$usedProperties[] = $propertyName;
+				// HTTP Accepted
+				$this->result[$propertyName] = 202;
+			}
+
+		}
+
+		// Only registering if there's any unhandled properties.
+		if (!$usedProperties) {
+			return;
+		}
+		$this->propertyUpdateCallbacks[] = [
+			// If the original argument to this method was a string, we need
+			// to also make sure that it stays that way, so the commit function
+			// knows how to format the arguments to the callback.
+			is_string($properties) ? $properties : $usedProperties,
+			$callback
+		];
+
+	}
+
+	/**
+	 * Call this function if you wish to handle _all_ properties that haven't
+	 * been handled by anything else yet. Note that you effectively claim with
+	 * this that you promise to process _all_ properties that are coming in.
+	 *
+	 * @param callable $callback
+	 * @return void
+	 */
+	public function handleRemaining(callable $callback) {
+
+		$properties = $this->getRemainingMutations();
+		if (!$properties) {
+			// Nothing to do, don't register callback
+			return;
+		}
+
+		foreach ($properties as $propertyName) {
+			// HTTP Accepted
+			$this->result[$propertyName] = 202;
+
+			$this->propertyUpdateCallbacks[] = [
+				$properties,
+				$callback
+			];
+		}
+
+	}
+
+	/**
+	 * Sets the result code for one or more properties.
+	 *
+	 * @param string|string[] $properties
+	 * @param int $resultCode
+	 * @return void
+	 */
+	public function setResultCode($properties, $resultCode) {
+
+		foreach ((array)$properties as $propertyName) {
+			$this->result[$propertyName] = $resultCode;
+		}
+
+		if ($resultCode >= 400) {
+			$this->failed = true;
+		}
+
+	}
+
+	/**
+	 * Sets the result code for all properties that did not have a result yet.
+	 *
+	 * @param int $resultCode
+	 * @return void
+	 */
+	public function setRemainingResultCode($resultCode) {
+
+		$this->setResultCode(
+			$this->getRemainingMutations(),
+			$resultCode
+		);
+
+	}
+
+	/**
+	 * Returns the list of properties that don't have a result code yet.
+	 *
+	 * This method returns a list of property names, but not its values.
+	 *
+	 * @return string[]
+	 */
+	public function getRemainingMutations() {
+
+		$remaining = [];
+		foreach ($this->mutations as $propertyName => $propValue) {
+			if (!isset($this->result[$propertyName])) {
+				$remaining[] = $propertyName;
+			}
+		}
+
+		return $remaining;
+
+	}
+
+	/**
+	 * Returns the list of properties that don't have a result code yet.
+	 *
+	 * This method returns list of properties and their values.
+	 *
+	 * @return array
+	 */
+	public function getRemainingValues() {
+
+		$remaining = [];
+		foreach ($this->mutations as $propertyName => $propValue) {
+			if (!isset($this->result[$propertyName])) {
+				$remaining[$propertyName] = $propValue;
+			}
+		}
+
+		return $remaining;
+
+	}
+
+	/**
+	 * Performs the actual update, and calls all callbacks.
+	 *
+	 * This method returns true or false depending on if the operation was
+	 * successful.
+	 *
+	 * @return bool
+	 */
+	public function commit() {
+
+		// First we validate if every property has a handler
+		foreach ($this->mutations as $propertyName => $value) {
+
+			if (!isset($this->result[$propertyName])) {
+				$this->failed = true;
+				$this->result[$propertyName] = 403;
+			}
+
+		}
+
+		foreach ($this->propertyUpdateCallbacks as $callbackInfo) {
+
+			if ($this->failed) {
+				break;
+			}
+			if (is_string($callbackInfo[0])) {
+				$this->doCallbackSingleProp($callbackInfo[0], $callbackInfo[1]);
+			} else {
+				$this->doCallbackMultiProp($callbackInfo[0], $callbackInfo[1]);
+			}
+
+		}
+
+		/**
+		 * If anywhere in this operation updating a property failed, we must
+		 * update all other properties accordingly.
+		 */
+		if ($this->failed) {
+
+			foreach ($this->result as $propertyName => $status) {
+				if ($status === 202) {
+					// Failed dependency
+					$this->result[$propertyName] = 424;
+				}
+			}
+
+		}
+
+		return !$this->failed;
+
+	}
+
+	/**
+	 * Executes a property callback with the single-property syntax.
+	 *
+	 * @param string $propertyName
+	 * @param callable $callback
+	 * @return void
+	 */
+	private function doCallBackSingleProp($propertyName, callable $callback) {
+
+		$result = $callback($this->mutations[$propertyName]);
+		if (is_bool($result)) {
+			if ($result) {
+				if (is_null($this->mutations[$propertyName])) {
+					// Delete
+					$result = 204;
+				} else {
+					// Update
+					$result = 200;
+				}
+			} else {
+				// Fail
+				$result = 403;
+			}
+		}
+		if (!is_int($result)) {
+			throw new UnexpectedValueException('A callback sent to handle() did not return an int or a bool');
+		}
+		$this->result[$propertyName] = $result;
+		if ($result >= 400) {
+			$this->failed = true;
+		}
+
+	}
+
+	/**
+	 * Executes a property callback with the multi-property syntax.
+	 *
+	 * @param array $propertyList
+	 * @param callable $callback
+	 * @return void
+	 */
+	private function doCallBackMultiProp(array $propertyList, callable $callback) {
+
+		$argument = [];
+		foreach ($propertyList as $propertyName) {
+			$argument[$propertyName] = $this->mutations[$propertyName];
+		}
+
+		$result = $callback($argument);
+
+		if (is_array($result)) {
+			foreach ($propertyList as $propertyName) {
+				if (!isset($result[$propertyName])) {
+					$resultCode = 500;
+				} else {
+					$resultCode = $result[$propertyName];
+				}
+				if ($resultCode >= 400) {
+					$this->failed = true;
+				}
+				$this->result[$propertyName] = $resultCode;
+
+			}
+		} elseif ($result === true) {
+
+			// Success
+			foreach ($argument as $propertyName => $propertyValue) {
+				$this->result[$propertyName] = is_null($propertyValue) ? 204 : 200;
+			}
+
+		} elseif ($result === false) {
+			// Fail :(
+			$this->failed = true;
+			foreach ($propertyList as $propertyName) {
+				$this->result[$propertyName] = 403;
+			}
+		} else {
+			throw new UnexpectedValueException('A callback sent to handle() did not return an array or a bool');
+		}
+
+	}
+
+	/**
+	 * Returns the result of the operation.
+	 *
+	 * @return array
+	 */
+	public function getResult() {
+
+		return $this->result;
+
+	}
+
+	/**
+	 * Returns the full list of mutations
+	 *
+	 * @return array
+	 */
+	public function getMutations() {
+
+		return $this->mutations;
+
+	}
 
 }

Spacing +2 added lines, -2 removed lines

@@ -87,7 +87,7 @@ 
     public function handle($properties, callable $callback) {
 
         $usedProperties = [];
-        foreach ((array)$properties as $propertyName) {
+        foreach ((array) $properties as $propertyName) {
 
             if (array_key_exists($propertyName, $this->mutations) && !isset($this->result[$propertyName])) {
 
@@ -149,7 +149,7 @@ 
      */
     public function setResultCode($properties, $resultCode) {
 
-        foreach ((array)$properties as $propertyName) {
+        foreach ((array) $properties as $propertyName) {
             $this->result[$propertyName] = $resultCode;
         }
 

libraries/SabreDAV/DAV/Sync/Plugin.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -3,8 +3,8 @@
 namespace Sabre\DAV\Sync;
 
 use Sabre\DAV;
-use Sabre\HTTP\RequestInterface;
 use Sabre\DAV\Xml\Request\SyncCollectionReport;
+use Sabre\HTTP\RequestInterface;
 
 /**
  * This plugin all WebDAV-sync capabilities to the Server.

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 
         });
 
-        $server->on('propFind',       [$this, 'propFind']);
+        $server->on('propFind', [$this, 'propFind']);
         $server->on('validateTokens', [$this, 'validateTokens']);
 
     }

Indentation +253 added lines, -253 removed lines

@@ -20,258 +20,258 @@
  */
 class Plugin extends DAV\ServerPlugin {
 
-    /**
-     * Reference to server object
-     *
-     * @var DAV\Server
-     */
-    protected $server;
-
-    const SYNCTOKEN_PREFIX = 'http://sabre.io/ns/sync/';
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using \Sabre\DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'sync';
-
-    }
-
-    /**
-     * Initializes the plugin.
-     *
-     * This is when the plugin registers it's hooks.
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $server->xml->elementMap['{DAV:}sync-collection'] = 'Sabre\\DAV\\Xml\\Request\\SyncCollectionReport';
-
-        $self = $this;
-
-        $server->on('report', function($reportName, $dom, $uri) use ($self) {
-
-            if ($reportName === '{DAV:}sync-collection') {
-                $this->server->transactionType = 'report-sync-collection';
-                $self->syncCollection($uri, $dom);
-                return false;
-            }
-
-        });
-
-        $server->on('propFind',       [$this, 'propFind']);
-        $server->on('validateTokens', [$this, 'validateTokens']);
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually
-     * implement them
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getSupportedReportSet($uri) {
-
-        $node = $this->server->tree->getNodeForPath($uri);
-        if ($node instanceof ISyncCollection && $node->getSyncToken()) {
-            return [
-                '{DAV:}sync-collection',
-            ];
-        }
-
-        return [];
-
-    }
-
-
-    /**
-     * This method handles the {DAV:}sync-collection HTTP REPORT.
-     *
-     * @param string $uri
-     * @param SyncCollectionReport $report
-     * @return void
-     */
-    public function syncCollection($uri, SyncCollectionReport $report) {
-
-        // Getting the data
-        $node = $this->server->tree->getNodeForPath($uri);
-        if (!$node instanceof ISyncCollection) {
-            throw new DAV\Exception\ReportNotSupported('The {DAV:}sync-collection REPORT is not supported on this url.');
-        }
-        $token = $node->getSyncToken();
-        if (!$token) {
-            throw new DAV\Exception\ReportNotSupported('No sync information is available at this node');
-        }
-
-        $syncToken = $report->syncToken;
-        if (!is_null($syncToken)) {
-            // Sync-token must start with our prefix
-            if (substr($syncToken, 0, strlen(self::SYNCTOKEN_PREFIX)) !== self::SYNCTOKEN_PREFIX) {
-                throw new DAV\Exception\InvalidSyncToken('Invalid or unknown sync token');
-            }
-
-            $syncToken = substr($syncToken, strlen(self::SYNCTOKEN_PREFIX));
-
-        }
-        $changeInfo = $node->getChanges($syncToken, $report->syncLevel, $report->limit);
-
-        if (is_null($changeInfo)) {
-
-            throw new DAV\Exception\InvalidSyncToken('Invalid or unknown sync token');
-
-        }
-
-        // Encoding the response
-        $this->sendSyncCollectionResponse(
-            $changeInfo['syncToken'],
-            $uri,
-            $changeInfo['added'],
-            $changeInfo['modified'],
-            $changeInfo['deleted'],
-            $report->properties
-        );
-
-    }
-
-    /**
-     * Sends the response to a sync-collection request.
-     *
-     * @param string $syncToken
-     * @param string $collectionUrl
-     * @param array $added
-     * @param array $modified
-     * @param array $deleted
-     * @param array $properties
-     * @return void
-     */
-    protected function sendSyncCollectionResponse($syncToken, $collectionUrl, array $added, array $modified, array $deleted, array $properties) {
-
-
-        $fullPaths = [];
-
-        // Pre-fetching children, if this is possible.
-        foreach (array_merge($added, $modified) as $item) {
-            $fullPath = $collectionUrl . '/' . $item;
-            $fullPaths[] = $fullPath;
-        }
-
-        $responses = [];
-        foreach ($this->server->getPropertiesForMultiplePaths($fullPaths, $properties) as $fullPath => $props) {
-
-            // The 'Property_Response' class is responsible for generating a
-            // single {DAV:}response xml element.
-            $responses[] = new DAV\Xml\Element\Response($fullPath, $props);
-
-        }
-
-
-
-        // Deleted items also show up as 'responses'. They have no properties,
-        // and a single {DAV:}status element set as 'HTTP/1.1 404 Not Found'.
-        foreach ($deleted as $item) {
-
-            $fullPath = $collectionUrl . '/' . $item;
-            $responses[] = new DAV\Xml\Element\Response($fullPath, [], 404);
-
-        }
-        $multiStatus = new DAV\Xml\Response\MultiStatus($responses, self::SYNCTOKEN_PREFIX . $syncToken);
-
-        $this->server->httpResponse->setStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-        $this->server->httpResponse->setBody(
-            $this->server->xml->write('{DAV:}multistatus', $multiStatus, $this->server->getBaseUri())
-        );
-
-    }
-
-    /**
-     * This method is triggered whenever properties are requested for a node.
-     * We intercept this to see if we must return a {DAV:}sync-token.
-     *
-     * @param DAV\PropFind $propFind
-     * @param DAV\INode $node
-     * @return void
-     */
-    public function propFind(DAV\PropFind $propFind, DAV\INode $node) {
-
-        $propFind->handle('{DAV:}sync-token', function() use ($node) {
-            if (!$node instanceof ISyncCollection || !$token = $node->getSyncToken()) {
-                return;
-            }
-            return self::SYNCTOKEN_PREFIX . $token;
-        });
-
-    }
-
-    /**
-     * The validateTokens event is triggered before every request.
-     *
-     * It's a moment where this plugin can check all the supplied lock tokens
-     * in the If: header, and check if they are valid.
-     *
-     * @param RequestInterface $request
-     * @param array $conditions
-     * @return void
-     */
-    public function validateTokens(RequestInterface $request, &$conditions) {
-
-        foreach ($conditions as $kk => $condition) {
-
-            foreach ($condition['tokens'] as $ii => $token) {
-
-                // Sync-tokens must always start with our designated prefix.
-                if (substr($token['token'], 0, strlen(self::SYNCTOKEN_PREFIX)) !== self::SYNCTOKEN_PREFIX) {
-                    continue;
-                }
-
-                // Checking if the token is a match.
-                $node = $this->server->tree->getNodeForPath($condition['uri']);
-
-                if (
-                    $node instanceof ISyncCollection &&
-                    $node->getSyncToken() == substr($token['token'], strlen(self::SYNCTOKEN_PREFIX))
-                ) {
-                    $conditions[$kk]['tokens'][$ii]['validToken'] = true;
-                }
-
-            }
-
-        }
-
-    }
-
-    /**
-     * Returns a bunch of meta-data about the plugin.
-     *
-     * Providing this information is optional, and is mainly displayed by the
-     * Browser plugin.
-     *
-     * The description key in the returned array may contain html and will not
-     * be sanitized.
-     *
-     * @return array
-     */
-    public function getPluginInfo() {
-
-        return [
-            'name'        => $this->getPluginName(),
-            'description' => 'Adds support for WebDAV Collection Sync (rfc6578)',
-            'link'        => 'http://sabre.io/dav/sync/',
-        ];
-
-    }
+	/**
+	 * Reference to server object
+	 *
+	 * @var DAV\Server
+	 */
+	protected $server;
+
+	const SYNCTOKEN_PREFIX = 'http://sabre.io/ns/sync/';
+
+	/**
+	 * Returns a plugin name.
+	 *
+	 * Using this name other plugins will be able to access other plugins
+	 * using \Sabre\DAV\Server::getPlugin
+	 *
+	 * @return string
+	 */
+	public function getPluginName() {
+
+		return 'sync';
+
+	}
+
+	/**
+	 * Initializes the plugin.
+	 *
+	 * This is when the plugin registers it's hooks.
+	 *
+	 * @param DAV\Server $server
+	 * @return void
+	 */
+	public function initialize(DAV\Server $server) {
+
+		$this->server = $server;
+		$server->xml->elementMap['{DAV:}sync-collection'] = 'Sabre\\DAV\\Xml\\Request\\SyncCollectionReport';
+
+		$self = $this;
+
+		$server->on('report', function($reportName, $dom, $uri) use ($self) {
+
+			if ($reportName === '{DAV:}sync-collection') {
+				$this->server->transactionType = 'report-sync-collection';
+				$self->syncCollection($uri, $dom);
+				return false;
+			}
+
+		});
+
+		$server->on('propFind',       [$this, 'propFind']);
+		$server->on('validateTokens', [$this, 'validateTokens']);
+
+	}
+
+	/**
+	 * Returns a list of reports this plugin supports.
+	 *
+	 * This will be used in the {DAV:}supported-report-set property.
+	 * Note that you still need to subscribe to the 'report' event to actually
+	 * implement them
+	 *
+	 * @param string $uri
+	 * @return array
+	 */
+	public function getSupportedReportSet($uri) {
+
+		$node = $this->server->tree->getNodeForPath($uri);
+		if ($node instanceof ISyncCollection && $node->getSyncToken()) {
+			return [
+				'{DAV:}sync-collection',
+			];
+		}
+
+		return [];
+
+	}
+
+
+	/**
+	 * This method handles the {DAV:}sync-collection HTTP REPORT.
+	 *
+	 * @param string $uri
+	 * @param SyncCollectionReport $report
+	 * @return void
+	 */
+	public function syncCollection($uri, SyncCollectionReport $report) {
+
+		// Getting the data
+		$node = $this->server->tree->getNodeForPath($uri);
+		if (!$node instanceof ISyncCollection) {
+			throw new DAV\Exception\ReportNotSupported('The {DAV:}sync-collection REPORT is not supported on this url.');
+		}
+		$token = $node->getSyncToken();
+		if (!$token) {
+			throw new DAV\Exception\ReportNotSupported('No sync information is available at this node');
+		}
+
+		$syncToken = $report->syncToken;
+		if (!is_null($syncToken)) {
+			// Sync-token must start with our prefix
+			if (substr($syncToken, 0, strlen(self::SYNCTOKEN_PREFIX)) !== self::SYNCTOKEN_PREFIX) {
+				throw new DAV\Exception\InvalidSyncToken('Invalid or unknown sync token');
+			}
+
+			$syncToken = substr($syncToken, strlen(self::SYNCTOKEN_PREFIX));
+
+		}
+		$changeInfo = $node->getChanges($syncToken, $report->syncLevel, $report->limit);
+
+		if (is_null($changeInfo)) {
+
+			throw new DAV\Exception\InvalidSyncToken('Invalid or unknown sync token');
+
+		}
+
+		// Encoding the response
+		$this->sendSyncCollectionResponse(
+			$changeInfo['syncToken'],
+			$uri,
+			$changeInfo['added'],
+			$changeInfo['modified'],
+			$changeInfo['deleted'],
+			$report->properties
+		);
+
+	}
+
+	/**
+	 * Sends the response to a sync-collection request.
+	 *
+	 * @param string $syncToken
+	 * @param string $collectionUrl
+	 * @param array $added
+	 * @param array $modified
+	 * @param array $deleted
+	 * @param array $properties
+	 * @return void
+	 */
+	protected function sendSyncCollectionResponse($syncToken, $collectionUrl, array $added, array $modified, array $deleted, array $properties) {
+
+
+		$fullPaths = [];
+
+		// Pre-fetching children, if this is possible.
+		foreach (array_merge($added, $modified) as $item) {
+			$fullPath = $collectionUrl . '/' . $item;
+			$fullPaths[] = $fullPath;
+		}
+
+		$responses = [];
+		foreach ($this->server->getPropertiesForMultiplePaths($fullPaths, $properties) as $fullPath => $props) {
+
+			// The 'Property_Response' class is responsible for generating a
+			// single {DAV:}response xml element.
+			$responses[] = new DAV\Xml\Element\Response($fullPath, $props);
+
+		}
+
+
+
+		// Deleted items also show up as 'responses'. They have no properties,
+		// and a single {DAV:}status element set as 'HTTP/1.1 404 Not Found'.
+		foreach ($deleted as $item) {
+
+			$fullPath = $collectionUrl . '/' . $item;
+			$responses[] = new DAV\Xml\Element\Response($fullPath, [], 404);
+
+		}
+		$multiStatus = new DAV\Xml\Response\MultiStatus($responses, self::SYNCTOKEN_PREFIX . $syncToken);
+
+		$this->server->httpResponse->setStatus(207);
+		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		$this->server->httpResponse->setBody(
+			$this->server->xml->write('{DAV:}multistatus', $multiStatus, $this->server->getBaseUri())
+		);
+
+	}
+
+	/**
+	 * This method is triggered whenever properties are requested for a node.
+	 * We intercept this to see if we must return a {DAV:}sync-token.
+	 *
+	 * @param DAV\PropFind $propFind
+	 * @param DAV\INode $node
+	 * @return void
+	 */
+	public function propFind(DAV\PropFind $propFind, DAV\INode $node) {
+
+		$propFind->handle('{DAV:}sync-token', function() use ($node) {
+			if (!$node instanceof ISyncCollection || !$token = $node->getSyncToken()) {
+				return;
+			}
+			return self::SYNCTOKEN_PREFIX . $token;
+		});
+
+	}
+
+	/**
+	 * The validateTokens event is triggered before every request.
+	 *
+	 * It's a moment where this plugin can check all the supplied lock tokens
+	 * in the If: header, and check if they are valid.
+	 *
+	 * @param RequestInterface $request
+	 * @param array $conditions
+	 * @return void
+	 */
+	public function validateTokens(RequestInterface $request, &$conditions) {
+
+		foreach ($conditions as $kk => $condition) {
+
+			foreach ($condition['tokens'] as $ii => $token) {
+
+				// Sync-tokens must always start with our designated prefix.
+				if (substr($token['token'], 0, strlen(self::SYNCTOKEN_PREFIX)) !== self::SYNCTOKEN_PREFIX) {
+					continue;
+				}
+
+				// Checking if the token is a match.
+				$node = $this->server->tree->getNodeForPath($condition['uri']);
+
+				if (
+					$node instanceof ISyncCollection &&
+					$node->getSyncToken() == substr($token['token'], strlen(self::SYNCTOKEN_PREFIX))
+				) {
+					$conditions[$kk]['tokens'][$ii]['validToken'] = true;
+				}
+
+			}
+
+		}
+
+	}
+
+	/**
+	 * Returns a bunch of meta-data about the plugin.
+	 *
+	 * Providing this information is optional, and is mainly displayed by the
+	 * Browser plugin.
+	 *
+	 * The description key in the returned array may contain html and will not
+	 * be sanitized.
+	 *
+	 * @return array
+	 */
+	public function getPluginInfo() {
+
+		return [
+			'name'        => $this->getPluginName(),
+			'description' => 'Adds support for WebDAV Collection Sync (rfc6578)',
+			'link'        => 'http://sabre.io/dav/sync/',
+		];
+
+	}
 
 }