Dolibarr / dolibarr

htdocs/includes/sabre/sabre/dav/lib/DAV/Browser/HtmlOutputHelper.php

Indentation +90 added lines, -90 removed lines

@@ -17,102 +17,102 @@
  */
 class HtmlOutputHelper
 {
-    /**
-     * Link to the root of the application.
-     *
-     * @var string
-     */
-    protected $baseUri;
+	/**
+	 * Link to the root of the application.
+	 *
+	 * @var string
+	 */
+	protected $baseUri;
 
-    /**
-     * List of xml namespaces.
-     *
-     * @var array
-     */
-    protected $namespaceMap;
+	/**
+	 * List of xml namespaces.
+	 *
+	 * @var array
+	 */
+	protected $namespaceMap;
 
-    /**
-     * Creates the object.
-     *
-     * baseUri must point to the root of the application. This will be used to
-     * easily generate links.
-     *
-     * The namespaceMap contains an array with the list of xml namespaces and
-     * their prefixes. WebDAV uses a lot of XML with complex namespaces, so
-     * that can be used to make output a lot shorter.
-     *
-     * @param string $baseUri
-     */
-    public function __construct($baseUri, array $namespaceMap)
-    {
-        $this->baseUri = $baseUri;
-        $this->namespaceMap = $namespaceMap;
-    }
+	/**
+	 * Creates the object.
+	 *
+	 * baseUri must point to the root of the application. This will be used to
+	 * easily generate links.
+	 *
+	 * The namespaceMap contains an array with the list of xml namespaces and
+	 * their prefixes. WebDAV uses a lot of XML with complex namespaces, so
+	 * that can be used to make output a lot shorter.
+	 *
+	 * @param string $baseUri
+	 */
+	public function __construct($baseUri, array $namespaceMap)
+	{
+		$this->baseUri = $baseUri;
+		$this->namespaceMap = $namespaceMap;
+	}
 
-    /**
-     * Generates a 'full' url based on a relative one.
-     *
-     * For relative urls, the base of the application is taken as the reference
-     * url, not the 'current url of the current request'.
-     *
-     * Absolute urls are left alone.
-     *
-     * @param string $path
-     *
-     * @return string
-     */
-    public function fullUrl($path)
-    {
-        return Uri\resolve($this->baseUri, $path);
-    }
+	/**
+	 * Generates a 'full' url based on a relative one.
+	 *
+	 * For relative urls, the base of the application is taken as the reference
+	 * url, not the 'current url of the current request'.
+	 *
+	 * Absolute urls are left alone.
+	 *
+	 * @param string $path
+	 *
+	 * @return string
+	 */
+	public function fullUrl($path)
+	{
+		return Uri\resolve($this->baseUri, $path);
+	}
 
-    /**
-     * Escape string for HTML output.
-     *
-     * @param scalar $input
-     *
-     * @return string
-     */
-    public function h($input)
-    {
-        return htmlspecialchars((string) $input, ENT_COMPAT, 'UTF-8');
-    }
+	/**
+	 * Escape string for HTML output.
+	 *
+	 * @param scalar $input
+	 *
+	 * @return string
+	 */
+	public function h($input)
+	{
+		return htmlspecialchars((string) $input, ENT_COMPAT, 'UTF-8');
+	}
 
-    /**
-     * Generates a full <a>-tag.
-     *
-     * Url is automatically expanded. If label is not specified, we re-use the
-     * url.
-     *
-     * @param string $url
-     * @param string $label
-     *
-     * @return string
-     */
-    public function link($url, $label = null)
-    {
-        $url = $this->h($this->fullUrl($url));
+	/**
+	 * Generates a full <a>-tag.
+	 *
+	 * Url is automatically expanded. If label is not specified, we re-use the
+	 * url.
+	 *
+	 * @param string $url
+	 * @param string $label
+	 *
+	 * @return string
+	 */
+	public function link($url, $label = null)
+	{
+		$url = $this->h($this->fullUrl($url));
 
-        return '<a href="'.$url.'">'.($label ? $this->h($label) : $url).'</a>';
-    }
+		return '<a href="'.$url.'">'.($label ? $this->h($label) : $url).'</a>';
+	}
 
-    /**
-     * This method takes an xml element in clark-notation, and turns it into a
-     * shortened version with a prefix, if it was a known namespace.
-     *
-     * @param string $element
-     *
-     * @return string
-     */
-    public function xmlName($element)
-    {
-        list($ns, $localName) = XmlService::parseClarkNotation($element);
-        if (isset($this->namespaceMap[$ns])) {
-            $propName = $this->namespaceMap[$ns].':'.$localName;
-        } else {
-            $propName = $element;
-        }
+	/**
+	 * This method takes an xml element in clark-notation, and turns it into a
+	 * shortened version with a prefix, if it was a known namespace.
+	 *
+	 * @param string $element
+	 *
+	 * @return string
+	 */
+	public function xmlName($element)
+	{
+		list($ns, $localName) = XmlService::parseClarkNotation($element);
+		if (isset($this->namespaceMap[$ns])) {
+			$propName = $this->namespaceMap[$ns].':'.$localName;
+		} else {
+			$propName = $element;
+		}
 
-        return '<span title="'.$this->h($element).'">'.$this->h($propName).'</span>';
-    }
+		return '<span title="'.$this->h($element).'">'.$this->h($propName).'</span>';
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Browser/PropFindAll.php

Indentation +103 added lines, -103 removed lines

@@ -16,113 +16,113 @@
  */
 class PropFindAll extends PropFind
 {
-    /**
-     * Creates the PROPFIND object.
-     *
-     * @param string $path
-     */
-    public function __construct($path)
-    {
-        parent::__construct($path, []);
-    }
+	/**
+	 * Creates the PROPFIND object.
+	 *
+	 * @param string $path
+	 */
+	public function __construct($path)
+	{
+		parent::__construct($path, []);
+	}
 
-    /**
-     * Handles a specific property.
-     *
-     * This method checks whether the specified property was requested in this
-     * PROPFIND request, and if so, it will call the callback and use the
-     * return value for it's value.
-     *
-     * Example:
-     *
-     * $propFind->handle('{DAV:}displayname', function() {
-     *      return 'hello';
-     * });
-     *
-     * Note that handle will only work the first time. If null is returned, the
-     * value is ignored.
-     *
-     * It's also possible to not pass a callback, but immediately pass a value
-     *
-     * @param string $propertyName
-     * @param mixed  $valueOrCallBack
-     */
-    public function handle($propertyName, $valueOrCallBack)
-    {
-        if (is_callable($valueOrCallBack)) {
-            $value = $valueOrCallBack();
-        } else {
-            $value = $valueOrCallBack;
-        }
-        if (!is_null($value)) {
-            $this->result[$propertyName] = [200, $value];
-        }
-    }
+	/**
+	 * Handles a specific property.
+	 *
+	 * This method checks whether the specified property was requested in this
+	 * PROPFIND request, and if so, it will call the callback and use the
+	 * return value for it's value.
+	 *
+	 * Example:
+	 *
+	 * $propFind->handle('{DAV:}displayname', function() {
+	 *      return 'hello';
+	 * });
+	 *
+	 * Note that handle will only work the first time. If null is returned, the
+	 * value is ignored.
+	 *
+	 * It's also possible to not pass a callback, but immediately pass a value
+	 *
+	 * @param string $propertyName
+	 * @param mixed  $valueOrCallBack
+	 */
+	public function handle($propertyName, $valueOrCallBack)
+	{
+		if (is_callable($valueOrCallBack)) {
+			$value = $valueOrCallBack();
+		} else {
+			$value = $valueOrCallBack;
+		}
+		if (!is_null($value)) {
+			$this->result[$propertyName] = [200, $value];
+		}
+	}
 
-    /**
-     * Sets the value of the property.
-     *
-     * If status is not supplied, the status will default to 200 for non-null
-     * properties, and 404 for null properties.
-     *
-     * @param string $propertyName
-     * @param mixed  $value
-     * @param int    $status
-     */
-    public function set($propertyName, $value, $status = null)
-    {
-        if (is_null($status)) {
-            $status = is_null($value) ? 404 : 200;
-        }
-        $this->result[$propertyName] = [$status, $value];
-    }
+	/**
+	 * Sets the value of the property.
+	 *
+	 * If status is not supplied, the status will default to 200 for non-null
+	 * properties, and 404 for null properties.
+	 *
+	 * @param string $propertyName
+	 * @param mixed  $value
+	 * @param int    $status
+	 */
+	public function set($propertyName, $value, $status = null)
+	{
+		if (is_null($status)) {
+			$status = is_null($value) ? 404 : 200;
+		}
+		$this->result[$propertyName] = [$status, $value];
+	}
 
-    /**
-     * Returns the current value for a property.
-     *
-     * @param string $propertyName
-     *
-     * @return mixed
-     */
-    public function get($propertyName)
-    {
-        return isset($this->result[$propertyName]) ? $this->result[$propertyName][1] : null;
-    }
+	/**
+	 * Returns the current value for a property.
+	 *
+	 * @param string $propertyName
+	 *
+	 * @return mixed
+	 */
+	public function get($propertyName)
+	{
+		return isset($this->result[$propertyName]) ? $this->result[$propertyName][1] : null;
+	}
 
-    /**
-     * Returns the current status code for a property name.
-     *
-     * If the property does not appear in the list of requested properties,
-     * null will be returned.
-     *
-     * @param string $propertyName
-     *
-     * @return int|null
-     */
-    public function getStatus($propertyName)
-    {
-        return isset($this->result[$propertyName]) ? $this->result[$propertyName][0] : 404;
-    }
+	/**
+	 * Returns the current status code for a property name.
+	 *
+	 * If the property does not appear in the list of requested properties,
+	 * null will be returned.
+	 *
+	 * @param string $propertyName
+	 *
+	 * @return int|null
+	 */
+	public function getStatus($propertyName)
+	{
+		return isset($this->result[$propertyName]) ? $this->result[$propertyName][0] : 404;
+	}
 
-    /**
-     * Returns all propertynames that have a 404 status, and thus don't have a
-     * value yet.
-     *
-     * @return array
-     */
-    public function get404Properties()
-    {
-        $result = [];
-        foreach ($this->result as $propertyName => $stuff) {
-            if (404 === $stuff[0]) {
-                $result[] = $propertyName;
-            }
-        }
-        // If there's nothing in this list, we're adding one fictional item.
-        if (!$result) {
-            $result[] = '{http://sabredav.org/ns}idk';
-        }
+	/**
+	 * Returns all propertynames that have a 404 status, and thus don't have a
+	 * value yet.
+	 *
+	 * @return array
+	 */
+	public function get404Properties()
+	{
+		$result = [];
+		foreach ($this->result as $propertyName => $stuff) {
+			if (404 === $stuff[0]) {
+				$result[] = $propertyName;
+			}
+		}
+		// If there's nothing in this list, we're adding one fictional item.
+		if (!$result) {
+			$result[] = '{http://sabredav.org/ns}idk';
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Browser/GuessContentType.php

Indentation +57 added lines, -57 removed lines

@@ -26,68 +26,68 @@
  */
 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',
+	/**
+	 * 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',
+		// groupware
+		'ics' => 'text/calendar',
+		'vcf' => 'text/vcard',
 
-        // text
-        'txt' => 'text/plain',
-    ];
+		// text
+		'txt' => 'text/plain',
+	];
 
-    /**
-     * Initializes the plugin.
-     */
-    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);
-    }
+	/**
+	 * Initializes the plugin.
+	 */
+	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.
-     */
-    public function propFind(PropFind $propFind, INode $node)
-    {
-        $propFind->handle('{DAV:}getcontenttype', function () use ($propFind) {
-            list(, $fileName) = Uri\split($propFind->getPath());
+	/**
+	 * Our PROPFIND handler.
+	 *
+	 * Here we set a contenttype, if the node didn't already have one.
+	 */
+	public function propFind(PropFind $propFind, INode $node)
+	{
+		$propFind->handle('{DAV:}getcontenttype', function () use ($propFind) {
+			list(, $fileName) = Uri\split($propFind->getPath());
 
-            return $this->getContentType($fileName);
-        });
-    }
+			return $this->getContentType($fileName);
+		});
+	}
 
-    /**
-     * Simple method to return the contenttype.
-     *
-     * @param string $fileName
-     *
-     * @return string
-     */
-    protected function getContentType($fileName)
-    {
-        if (null !== $fileName) {
-            // Just grabbing the extension
-            $extension = strtolower(substr($fileName, strrpos($fileName, '.') + 1));
-            if (isset($this->extensionMap[$extension])) {
-                return $this->extensionMap[$extension];
-            }
-        }
+	/**
+	 * Simple method to return the contenttype.
+	 *
+	 * @param string $fileName
+	 *
+	 * @return string
+	 */
+	protected function getContentType($fileName)
+	{
+		if (null !== $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';
-    }
+		return 'application/octet-stream';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
      */
     public function propFind(PropFind $propFind, INode $node)
     {
-        $propFind->handle('{DAV:}getcontenttype', function () use ($propFind) {
+        $propFind->handle('{DAV:}getcontenttype', function() use ($propFind) {
             list(, $fileName) = Uri\split($propFind->getPath());
 
             return $this->getContentType($fileName);

htdocs/includes/sabre/sabre/dav/lib/DAV/ICollection.php

Indentation +57 added lines, -57 removed lines

@@ -15,65 +15,65 @@
  */
 interface ICollection extends INode
 {
-    /**
-     * Creates a new file in the directory.
-     *
-     * Data will either be supplied as a stream resource, or in certain cases
-     * as a string. Keep in mind that you may have to support either.
-     *
-     * After successful creation of the file, you may choose to return the ETag
-     * of the new file here.
-     *
-     * The returned ETag must be surrounded by double-quotes (The quotes should
-     * be part of the actual string).
-     *
-     * If you cannot accurately determine the ETag, you should not return it.
-     * If you don't store the file exactly as-is (you're transforming it
-     * somehow) you should also not return an ETag.
-     *
-     * This means that if a subsequent GET to this new file does not exactly
-     * return the same contents of what was submitted here, you are strongly
-     * recommended to omit the ETag.
-     *
-     * @param string          $name Name of the file
-     * @param resource|string $data Initial payload
-     *
-     * @return string|null
-     */
-    public function createFile($name, $data = null);
+	/**
+	 * Creates a new file in the directory.
+	 *
+	 * Data will either be supplied as a stream resource, or in certain cases
+	 * as a string. Keep in mind that you may have to support either.
+	 *
+	 * After successful creation of the file, you may choose to return the ETag
+	 * of the new file here.
+	 *
+	 * The returned ETag must be surrounded by double-quotes (The quotes should
+	 * be part of the actual string).
+	 *
+	 * If you cannot accurately determine the ETag, you should not return it.
+	 * If you don't store the file exactly as-is (you're transforming it
+	 * somehow) you should also not return an ETag.
+	 *
+	 * This means that if a subsequent GET to this new file does not exactly
+	 * return the same contents of what was submitted here, you are strongly
+	 * recommended to omit the ETag.
+	 *
+	 * @param string          $name Name of the file
+	 * @param resource|string $data Initial payload
+	 *
+	 * @return string|null
+	 */
+	public function createFile($name, $data = null);
 
-    /**
-     * Creates a new subdirectory.
-     *
-     * @param string $name
-     */
-    public function createDirectory($name);
+	/**
+	 * Creates a new subdirectory.
+	 *
+	 * @param string $name
+	 */
+	public function createDirectory($name);
 
-    /**
-     * Returns a specific child node, referenced by its name.
-     *
-     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
-     * exist.
-     *
-     * @param string $name
-     *
-     * @return INode
-     */
-    public function getChild($name);
+	/**
+	 * Returns a specific child node, referenced by its name.
+	 *
+	 * This method must throw Sabre\DAV\Exception\NotFound if the node does not
+	 * exist.
+	 *
+	 * @param string $name
+	 *
+	 * @return INode
+	 */
+	public function getChild($name);
 
-    /**
-     * Returns an array with all the child nodes.
-     *
-     * @return INode[]
-     */
-    public function getChildren();
+	/**
+	 * Returns an array with all the child nodes.
+	 *
+	 * @return INode[]
+	 */
+	public function getChildren();
 
-    /**
-     * Checks if a child-node with the specified name exists.
-     *
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function childExists($name);
+	/**
+	 * Checks if a child-node with the specified name exists.
+	 *
+	 * @param string $name
+	 *
+	 * @return bool
+	 */
+	public function childExists($name);
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/UUIDUtil.php

Indentation +41 added lines, -41 removed lines

@@ -17,50 +17,50 @@
  */
 class UUIDUtil
 {
-    /**
-     * Returns a pseudo-random v4 UUID.
-     *
-     * This function is based on a comment by Andrew Moore on php.net
-     *
-     * @see http://www.php.net/manual/en/function.uniqid.php#94959
-     *
-     * @return string
-     */
-    public static function getUUID()
-    {
-        return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-            // 32 bits for "time_low"
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff),
+	/**
+	 * Returns a pseudo-random v4 UUID.
+	 *
+	 * This function is based on a comment by Andrew Moore on php.net
+	 *
+	 * @see http://www.php.net/manual/en/function.uniqid.php#94959
+	 *
+	 * @return string
+	 */
+	public static function getUUID()
+	{
+		return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+			// 32 bits for "time_low"
+			mt_rand(0, 0xffff), mt_rand(0, 0xffff),
 
-            // 16 bits for "time_mid"
-            mt_rand(0, 0xffff),
+			// 16 bits for "time_mid"
+			mt_rand(0, 0xffff),
 
-            // 16 bits for "time_hi_and_version",
-            // four most significant bits holds version number 4
-            mt_rand(0, 0x0fff) | 0x4000,
+			// 16 bits for "time_hi_and_version",
+			// four most significant bits holds version number 4
+			mt_rand(0, 0x0fff) | 0x4000,
 
-            // 16 bits, 8 bits for "clk_seq_hi_res",
-            // 8 bits for "clk_seq_low",
-            // two most significant bits holds zero and one for variant DCE1.1
-            mt_rand(0, 0x3fff) | 0x8000,
+			// 16 bits, 8 bits for "clk_seq_hi_res",
+			// 8 bits for "clk_seq_low",
+			// two most significant bits holds zero and one for variant DCE1.1
+			mt_rand(0, 0x3fff) | 0x8000,
 
-            // 48 bits for "node"
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
-        );
-    }
+			// 48 bits for "node"
+			mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
+		);
+	}
 
-    /**
-     * Checks if a string is a valid UUID.
-     *
-     * @param string $uuid
-     *
-     * @return bool
-     */
-    public static function validateUUID($uuid)
-    {
-        return 0 !== preg_match(
-            '/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i',
-            $uuid
-        );
-    }
+	/**
+	 * Checks if a string is a valid UUID.
+	 *
+	 * @param string $uuid
+	 *
+	 * @return bool
+	 */
+	public static function validateUUID($uuid)
+	{
+		return 0 !== preg_match(
+			'/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i',
+			$uuid
+		);
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/Sharing/Plugin.php

Indentation +269 added lines, -269 removed lines

@@ -28,231 +28,231 @@ 
  */
 class Plugin extends ServerPlugin
 {
-    const ACCESS_NOTSHARED = 0;
-    const ACCESS_SHAREDOWNER = 1;
-    const ACCESS_READ = 2;
-    const ACCESS_READWRITE = 3;
-    const ACCESS_NOACCESS = 4;
-
-    const INVITE_NORESPONSE = 1;
-    const INVITE_ACCEPTED = 2;
-    const INVITE_DECLINED = 3;
-    const INVITE_INVALID = 4;
-
-    /**
-     * Reference to SabreDAV server object.
-     *
-     * @var Server
-     */
-    protected $server;
-
-    /**
-     * This method should return a list of server-features.
-     *
-     * This is for example 'versioning' and is added to the DAV: header
-     * in an OPTIONS response.
-     *
-     * @return array
-     */
-    public function getFeatures()
-    {
-        return ['resource-sharing'];
-    }
-
-    /**
-     * 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 'sharing';
-    }
-
-    /**
-     * 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.
-     */
-    public function initialize(Server $server)
-    {
-        $this->server = $server;
-
-        $server->xml->elementMap['{DAV:}share-resource'] = 'Sabre\\DAV\\Xml\\Request\\ShareResource';
-
-        array_push(
-            $server->protectedProperties,
-            '{DAV:}share-mode'
-        );
-
-        $server->on('method:POST', [$this, 'httpPost']);
-        $server->on('propFind', [$this, 'propFind']);
-        $server->on('getSupportedPrivilegeSet', [$this, 'getSupportedPrivilegeSet']);
-        $server->on('onHTMLActionsPanel', [$this, 'htmlActionsPanel']);
-        $server->on('onBrowserPostAction', [$this, 'browserPostAction']);
-    }
-
-    /**
-     * Updates the list of sharees on a shared resource.
-     *
-     * The sharees  array is a list of people that are to be added modified
-     * or removed in the list of shares.
-     *
-     * @param string   $path
-     * @param Sharee[] $sharees
-     */
-    public function shareResource($path, array $sharees)
-    {
-        $node = $this->server->tree->getNodeForPath($path);
-
-        if (!$node instanceof ISharedNode) {
-            throw new Forbidden('Sharing is not allowed on this node');
-        }
-
-        // Getting ACL info
-        $acl = $this->server->getPlugin('acl');
-
-        // If there's no ACL support, we allow everything
-        if ($acl) {
-            $acl->checkPrivileges($path, '{DAV:}share');
-        }
-
-        foreach ($sharees as $sharee) {
-            // We're going to attempt to get a local principal uri for a share
-            // href by emitting the getPrincipalByUri event.
-            $principal = null;
-            $this->server->emit('getPrincipalByUri', [$sharee->href, &$principal]);
-            $sharee->principal = $principal;
-        }
-        $node->updateInvites($sharees);
-    }
-
-    /**
-     * This event is triggered when properties are requested for nodes.
-     *
-     * This allows us to inject any sharings-specific properties.
-     */
-    public function propFind(PropFind $propFind, INode $node)
-    {
-        if ($node instanceof ISharedNode) {
-            $propFind->handle('{DAV:}share-access', function () use ($node) {
-                return new Property\ShareAccess($node->getShareAccess());
-            });
-            $propFind->handle('{DAV:}invite', function () use ($node) {
-                return new Property\Invite($node->getInvites());
-            });
-            $propFind->handle('{DAV:}share-resource-uri', function () use ($node) {
-                return new Property\Href($node->getShareResourceUri());
-            });
-        }
-    }
-
-    /**
-     * We intercept this to handle POST requests on shared resources.
-     *
-     * @return bool|null
-     */
-    public function httpPost(RequestInterface $request, ResponseInterface $response)
-    {
-        $path = $request->getPath();
-        $contentType = $request->getHeader('Content-Type');
-        if (null === $contentType) {
-            return;
-        }
-
-        // We're only interested in the davsharing content type.
-        if (false === strpos($contentType, 'application/davsharing+xml')) {
-            return;
-        }
-
-        $message = $this->server->xml->parse(
-            $request->getBody(),
-            $request->getUrl(),
-            $documentType
-        );
-
-        switch ($documentType) {
-            case '{DAV:}share-resource':
-                $this->shareResource($path, $message->sharees);
-                $response->setStatus(200);
-                // Adding this because sending a response body may cause issues,
-                // and I wanted some type of indicator the response was handled.
-                $response->setHeader('X-Sabre-Status', 'everything-went-well');
-
-                // Breaking the event chain
-                return false;
-
-            default:
-                throw new BadRequest('Unexpected document type: '.$documentType.' for this Content-Type');
-        }
-    }
-
-    /**
-     * This method is triggered whenever a subsystem reqeuests the privileges
-     * hat are supported on a particular node.
-     *
-     * We need to add a number of privileges for scheduling purposes.
-     */
-    public function getSupportedPrivilegeSet(INode $node, array &$supportedPrivilegeSet)
-    {
-        if ($node instanceof ISharedNode) {
-            $supportedPrivilegeSet['{DAV:}share'] = [
-                'abstract' => false,
-                'aggregates' => [],
-            ];
-        }
-    }
-
-    /**
-     * 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 implements WebDAV resource sharing',
-            'link' => 'https://github.com/evert/webdav-sharing',
-        ];
-    }
-
-    /**
-     * This method is used to generate HTML output for the
-     * DAV\Browser\Plugin.
-     *
-     * @param string $output
-     * @param string $path
-     *
-     * @return bool|null
-     */
-    public function htmlActionsPanel(INode $node, &$output, $path)
-    {
-        if (!$node instanceof ISharedNode) {
-            return;
-        }
-
-        $aclPlugin = $this->server->getPlugin('acl');
-        if ($aclPlugin) {
-            if (!$aclPlugin->checkPrivileges($path, '{DAV:}share', \Sabre\DAVACL\Plugin::R_PARENT, false)) {
-                // Sharing is not permitted, we will not draw this interface.
-                return;
-            }
-        }
-
-        $output .= '<tr><td colspan="2"><form method="post" action="">
+	const ACCESS_NOTSHARED = 0;
+	const ACCESS_SHAREDOWNER = 1;
+	const ACCESS_READ = 2;
+	const ACCESS_READWRITE = 3;
+	const ACCESS_NOACCESS = 4;
+
+	const INVITE_NORESPONSE = 1;
+	const INVITE_ACCEPTED = 2;
+	const INVITE_DECLINED = 3;
+	const INVITE_INVALID = 4;
+
+	/**
+	 * Reference to SabreDAV server object.
+	 *
+	 * @var Server
+	 */
+	protected $server;
+
+	/**
+	 * This method should return a list of server-features.
+	 *
+	 * This is for example 'versioning' and is added to the DAV: header
+	 * in an OPTIONS response.
+	 *
+	 * @return array
+	 */
+	public function getFeatures()
+	{
+		return ['resource-sharing'];
+	}
+
+	/**
+	 * 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 'sharing';
+	}
+
+	/**
+	 * 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.
+	 */
+	public function initialize(Server $server)
+	{
+		$this->server = $server;
+
+		$server->xml->elementMap['{DAV:}share-resource'] = 'Sabre\\DAV\\Xml\\Request\\ShareResource';
+
+		array_push(
+			$server->protectedProperties,
+			'{DAV:}share-mode'
+		);
+
+		$server->on('method:POST', [$this, 'httpPost']);
+		$server->on('propFind', [$this, 'propFind']);
+		$server->on('getSupportedPrivilegeSet', [$this, 'getSupportedPrivilegeSet']);
+		$server->on('onHTMLActionsPanel', [$this, 'htmlActionsPanel']);
+		$server->on('onBrowserPostAction', [$this, 'browserPostAction']);
+	}
+
+	/**
+	 * Updates the list of sharees on a shared resource.
+	 *
+	 * The sharees  array is a list of people that are to be added modified
+	 * or removed in the list of shares.
+	 *
+	 * @param string   $path
+	 * @param Sharee[] $sharees
+	 */
+	public function shareResource($path, array $sharees)
+	{
+		$node = $this->server->tree->getNodeForPath($path);
+
+		if (!$node instanceof ISharedNode) {
+			throw new Forbidden('Sharing is not allowed on this node');
+		}
+
+		// Getting ACL info
+		$acl = $this->server->getPlugin('acl');
+
+		// If there's no ACL support, we allow everything
+		if ($acl) {
+			$acl->checkPrivileges($path, '{DAV:}share');
+		}
+
+		foreach ($sharees as $sharee) {
+			// We're going to attempt to get a local principal uri for a share
+			// href by emitting the getPrincipalByUri event.
+			$principal = null;
+			$this->server->emit('getPrincipalByUri', [$sharee->href, &$principal]);
+			$sharee->principal = $principal;
+		}
+		$node->updateInvites($sharees);
+	}
+
+	/**
+	 * This event is triggered when properties are requested for nodes.
+	 *
+	 * This allows us to inject any sharings-specific properties.
+	 */
+	public function propFind(PropFind $propFind, INode $node)
+	{
+		if ($node instanceof ISharedNode) {
+			$propFind->handle('{DAV:}share-access', function () use ($node) {
+				return new Property\ShareAccess($node->getShareAccess());
+			});
+			$propFind->handle('{DAV:}invite', function () use ($node) {
+				return new Property\Invite($node->getInvites());
+			});
+			$propFind->handle('{DAV:}share-resource-uri', function () use ($node) {
+				return new Property\Href($node->getShareResourceUri());
+			});
+		}
+	}
+
+	/**
+	 * We intercept this to handle POST requests on shared resources.
+	 *
+	 * @return bool|null
+	 */
+	public function httpPost(RequestInterface $request, ResponseInterface $response)
+	{
+		$path = $request->getPath();
+		$contentType = $request->getHeader('Content-Type');
+		if (null === $contentType) {
+			return;
+		}
+
+		// We're only interested in the davsharing content type.
+		if (false === strpos($contentType, 'application/davsharing+xml')) {
+			return;
+		}
+
+		$message = $this->server->xml->parse(
+			$request->getBody(),
+			$request->getUrl(),
+			$documentType
+		);
+
+		switch ($documentType) {
+			case '{DAV:}share-resource':
+				$this->shareResource($path, $message->sharees);
+				$response->setStatus(200);
+				// Adding this because sending a response body may cause issues,
+				// and I wanted some type of indicator the response was handled.
+				$response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+				// Breaking the event chain
+				return false;
+
+			default:
+				throw new BadRequest('Unexpected document type: '.$documentType.' for this Content-Type');
+		}
+	}
+
+	/**
+	 * This method is triggered whenever a subsystem reqeuests the privileges
+	 * hat are supported on a particular node.
+	 *
+	 * We need to add a number of privileges for scheduling purposes.
+	 */
+	public function getSupportedPrivilegeSet(INode $node, array &$supportedPrivilegeSet)
+	{
+		if ($node instanceof ISharedNode) {
+			$supportedPrivilegeSet['{DAV:}share'] = [
+				'abstract' => false,
+				'aggregates' => [],
+			];
+		}
+	}
+
+	/**
+	 * 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 implements WebDAV resource sharing',
+			'link' => 'https://github.com/evert/webdav-sharing',
+		];
+	}
+
+	/**
+	 * This method is used to generate HTML output for the
+	 * DAV\Browser\Plugin.
+	 *
+	 * @param string $output
+	 * @param string $path
+	 *
+	 * @return bool|null
+	 */
+	public function htmlActionsPanel(INode $node, &$output, $path)
+	{
+		if (!$node instanceof ISharedNode) {
+			return;
+		}
+
+		$aclPlugin = $this->server->getPlugin('acl');
+		if ($aclPlugin) {
+			if (!$aclPlugin->checkPrivileges($path, '{DAV:}share', \Sabre\DAVACL\Plugin::R_PARENT, false)) {
+				// Sharing is not permitted, we will not draw this interface.
+				return;
+			}
+		}
+
+		$output .= '<tr><td colspan="2"><form method="post" action="">
             <h3>Share this resource</h3>
             <input type="hidden" name="sabreAction" value="share" />
             <label>Share with (uri):</label> <input type="text" name="href" placeholder="mailto:user@example.org"/><br />
@@ -265,48 +265,48 @@ 
              <input type="submit" value="share" />
             </form>
             </td></tr>';
-    }
-
-    /**
-     * This method is triggered for POST actions generated by the browser
-     * plugin.
-     *
-     * @param string $path
-     * @param string $action
-     * @param array  $postVars
-     */
-    public function browserPostAction($path, $action, $postVars)
-    {
-        if ('share' !== $action) {
-            return;
-        }
-
-        if (empty($postVars['href'])) {
-            throw new BadRequest('The "href" POST parameter is required');
-        }
-        if (empty($postVars['access'])) {
-            throw new BadRequest('The "access" POST parameter is required');
-        }
-
-        $accessMap = [
-            'readwrite' => self::ACCESS_READWRITE,
-            'read' => self::ACCESS_READ,
-            'no-access' => self::ACCESS_NOACCESS,
-        ];
-
-        if (!isset($accessMap[$postVars['access']])) {
-            throw new BadRequest('The "access" POST must be readwrite, read or no-access');
-        }
-        $sharee = new Sharee([
-            'href' => $postVars['href'],
-            'access' => $accessMap[$postVars['access']],
-        ]);
-
-        $this->shareResource(
-            $path,
-            [$sharee]
-        );
-
-        return false;
-    }
+	}
+
+	/**
+	 * This method is triggered for POST actions generated by the browser
+	 * plugin.
+	 *
+	 * @param string $path
+	 * @param string $action
+	 * @param array  $postVars
+	 */
+	public function browserPostAction($path, $action, $postVars)
+	{
+		if ('share' !== $action) {
+			return;
+		}
+
+		if (empty($postVars['href'])) {
+			throw new BadRequest('The "href" POST parameter is required');
+		}
+		if (empty($postVars['access'])) {
+			throw new BadRequest('The "access" POST parameter is required');
+		}
+
+		$accessMap = [
+			'readwrite' => self::ACCESS_READWRITE,
+			'read' => self::ACCESS_READ,
+			'no-access' => self::ACCESS_NOACCESS,
+		];
+
+		if (!isset($accessMap[$postVars['access']])) {
+			throw new BadRequest('The "access" POST must be readwrite, read or no-access');
+		}
+		$sharee = new Sharee([
+			'href' => $postVars['href'],
+			'access' => $accessMap[$postVars['access']],
+		]);
+
+		$this->shareResource(
+			$path,
+			[$sharee]
+		);
+
+		return false;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -141,13 +141,13 @@
     public function propFind(PropFind $propFind, INode $node)
     {
         if ($node instanceof ISharedNode) {
-            $propFind->handle('{DAV:}share-access', function () use ($node) {
+            $propFind->handle('{DAV:}share-access', function() use ($node) {
                 return new Property\ShareAccess($node->getShareAccess());
             });
-            $propFind->handle('{DAV:}invite', function () use ($node) {
+            $propFind->handle('{DAV:}invite', function() use ($node) {
                 return new Property\Invite($node->getInvites());
             });
-            $propFind->handle('{DAV:}share-resource-uri', function () use ($node) {
+            $propFind->handle('{DAV:}share-resource-uri', function() use ($node) {
                 return new Property\Href($node->getShareResourceUri());
             });
         }

htdocs/includes/sabre/sabre/dav/lib/DAV/Sharing/ISharedNode.php

Indentation +46 added lines, -46 removed lines

@@ -17,53 +17,53 @@
  */
 interface ISharedNode extends INode
 {
-    /**
-     * Returns the 'access level' for the instance of this shared resource.
-     *
-     * The value should be one of the Sabre\DAV\Sharing\Plugin::ACCESS_
-     * constants.
-     *
-     * @return int
-     */
-    public function getShareAccess();
+	/**
+	 * Returns the 'access level' for the instance of this shared resource.
+	 *
+	 * The value should be one of the Sabre\DAV\Sharing\Plugin::ACCESS_
+	 * constants.
+	 *
+	 * @return int
+	 */
+	public function getShareAccess();
 
-    /**
-     * This function must return a URI that uniquely identifies the shared
-     * resource. This URI should be identical across instances, and is
-     * also used in several other XML bodies to connect invites to
-     * resources.
-     *
-     * This may simply be a relative reference to the original shared instance,
-     * but it could also be a urn. As long as it's a valid URI and unique.
-     *
-     * @return string
-     */
-    public function getShareResourceUri();
+	/**
+	 * This function must return a URI that uniquely identifies the shared
+	 * resource. This URI should be identical across instances, and is
+	 * also used in several other XML bodies to connect invites to
+	 * resources.
+	 *
+	 * This may simply be a relative reference to the original shared instance,
+	 * but it could also be a urn. As long as it's a valid URI and unique.
+	 *
+	 * @return string
+	 */
+	public function getShareResourceUri();
 
-    /**
-     * Updates the list of sharees.
-     *
-     * Every item must be a Sharee object.
-     *
-     * @param \Sabre\DAV\Xml\Element\Sharee[] $sharees
-     */
-    public function updateInvites(array $sharees);
+	/**
+	 * Updates the list of sharees.
+	 *
+	 * Every item must be a Sharee object.
+	 *
+	 * @param \Sabre\DAV\Xml\Element\Sharee[] $sharees
+	 */
+	public function updateInvites(array $sharees);
 
-    /**
-     * Returns the list of people whom this resource is shared with.
-     *
-     * Every item in the returned array must be a Sharee object with
-     * at least the following properties set:
-     *
-     * * $href
-     * * $shareAccess
-     * * $inviteStatus
-     *
-     * and optionally:
-     *
-     * * $properties
-     *
-     * @return \Sabre\DAV\Xml\Element\Sharee[]
-     */
-    public function getInvites();
+	/**
+	 * Returns the list of people whom this resource is shared with.
+	 *
+	 * Every item in the returned array must be a Sharee object with
+	 * at least the following properties set:
+	 *
+	 * * $href
+	 * * $shareAccess
+	 * * $inviteStatus
+	 *
+	 * and optionally:
+	 *
+	 * * $properties
+	 *
+	 * @return \Sabre\DAV\Xml\Element\Sharee[]
+	 */
+	public function getInvites();
 }

htdocs/includes/sabre/sabre/dav/lib/DAV/INode.php

Indentation +25 added lines, -25 removed lines

@@ -13,32 +13,32 @@
  */
 interface INode
 {
-    /**
-     * Deleted the current node.
-     */
-    public function delete();
+	/**
+	 * Deleted the current node.
+	 */
+	public function delete();
 
-    /**
-     * Returns the name of the node.
-     *
-     * This is used to generate the url.
-     *
-     * @return string
-     */
-    public function getName();
+	/**
+	 * Returns the name of the node.
+	 *
+	 * This is used to generate the url.
+	 *
+	 * @return string
+	 */
+	public function getName();
 
-    /**
-     * Renames the node.
-     *
-     * @param string $name The new name
-     */
-    public function setName($name);
+	/**
+	 * Renames the node.
+	 *
+	 * @param string $name The new name
+	 */
+	public function setName($name);
 
-    /**
-     * Returns the last modification time, as a unix timestamp. Return null
-     * if the information is not available.
-     *
-     * @return int|null
-     */
-    public function getLastModified();
+	/**
+	 * Returns the last modification time, as a unix timestamp. Return null
+	 * if the information is not available.
+	 *
+	 * @return int|null
+	 */
+	public function getLastModified();
 }

htdocs/includes/sabre/sabre/vobject/lib/TimeZoneUtil.php

Indentation +223 added lines, -223 removed lines

@@ -24,249 +24,249 @@
  */
 class TimeZoneUtil
 {
-    /** @var self */
-    private static $instance = null;
+	/** @var self */
+	private static $instance = null;
 
-    /** @var TimezoneGuesser[] */
-    private $timezoneGuessers = [];
+	/** @var TimezoneGuesser[] */
+	private $timezoneGuessers = [];
 
-    /** @var TimezoneFinder[] */
-    private $timezoneFinders = [];
+	/** @var TimezoneFinder[] */
+	private $timezoneFinders = [];
 
-    private function __construct()
-    {
-        $this->addGuesser('lic', new GuessFromLicEntry());
-        $this->addGuesser('msTzId', new GuessFromMsTzId());
-        $this->addFinder('tzid', new FindFromTimezoneIdentifier());
-        $this->addFinder('tzmap', new FindFromTimezoneMap());
-        $this->addFinder('offset', new FindFromOffset());
-    }
+	private function __construct()
+	{
+		$this->addGuesser('lic', new GuessFromLicEntry());
+		$this->addGuesser('msTzId', new GuessFromMsTzId());
+		$this->addFinder('tzid', new FindFromTimezoneIdentifier());
+		$this->addFinder('tzmap', new FindFromTimezoneMap());
+		$this->addFinder('offset', new FindFromOffset());
+	}
 
-    private static function getInstance(): self
-    {
-        if (null === self::$instance) {
-            self::$instance = new self();
-        }
+	private static function getInstance(): self
+	{
+		if (null === self::$instance) {
+			self::$instance = new self();
+		}
 
-        return self::$instance;
-    }
+		return self::$instance;
+	}
 
-    private function addGuesser(string $key, TimezoneGuesser $guesser): void
-    {
-        $this->timezoneGuessers[$key] = $guesser;
-    }
+	private function addGuesser(string $key, TimezoneGuesser $guesser): void
+	{
+		$this->timezoneGuessers[$key] = $guesser;
+	}
 
-    private function addFinder(string $key, TimezoneFinder $finder): void
-    {
-        $this->timezoneFinders[$key] = $finder;
-    }
+	private function addFinder(string $key, TimezoneFinder $finder): void
+	{
+		$this->timezoneFinders[$key] = $finder;
+	}
 
-    /**
-     * This method will try to find out the correct timezone for an iCalendar
-     * date-time value.
-     *
-     * You must pass the contents of the TZID parameter, as well as the full
-     * calendar.
-     *
-     * If the lookup fails, this method will return the default PHP timezone
-     * (as configured using date_default_timezone_set, or the date.timezone ini
-     * setting).
-     *
-     * Alternatively, if $failIfUncertain is set to true, it will throw an
-     * exception if we cannot accurately determine the timezone.
-     */
-    private function findTimeZone(string $tzid, Component $vcalendar = null, bool $failIfUncertain = false): DateTimeZone
-    {
-        foreach ($this->timezoneFinders as $timezoneFinder) {
-            $timezone = $timezoneFinder->find($tzid, $failIfUncertain);
-            if (!$timezone instanceof DateTimeZone) {
-                continue;
-            }
+	/**
+	 * This method will try to find out the correct timezone for an iCalendar
+	 * date-time value.
+	 *
+	 * You must pass the contents of the TZID parameter, as well as the full
+	 * calendar.
+	 *
+	 * If the lookup fails, this method will return the default PHP timezone
+	 * (as configured using date_default_timezone_set, or the date.timezone ini
+	 * setting).
+	 *
+	 * Alternatively, if $failIfUncertain is set to true, it will throw an
+	 * exception if we cannot accurately determine the timezone.
+	 */
+	private function findTimeZone(string $tzid, Component $vcalendar = null, bool $failIfUncertain = false): DateTimeZone
+	{
+		foreach ($this->timezoneFinders as $timezoneFinder) {
+			$timezone = $timezoneFinder->find($tzid, $failIfUncertain);
+			if (!$timezone instanceof DateTimeZone) {
+				continue;
+			}
 
-            return $timezone;
-        }
+			return $timezone;
+		}
 
-        if ($vcalendar) {
-            // If that didn't work, we will scan VTIMEZONE objects
-            foreach ($vcalendar->select('VTIMEZONE') as $vtimezone) {
-                if ((string) $vtimezone->TZID === $tzid) {
-                    foreach ($this->timezoneGuessers as $timezoneGuesser) {
-                        $timezone = $timezoneGuesser->guess($vtimezone, $failIfUncertain);
-                        if (!$timezone instanceof DateTimeZone) {
-                            continue;
-                        }
+		if ($vcalendar) {
+			// If that didn't work, we will scan VTIMEZONE objects
+			foreach ($vcalendar->select('VTIMEZONE') as $vtimezone) {
+				if ((string) $vtimezone->TZID === $tzid) {
+					foreach ($this->timezoneGuessers as $timezoneGuesser) {
+						$timezone = $timezoneGuesser->guess($vtimezone, $failIfUncertain);
+						if (!$timezone instanceof DateTimeZone) {
+							continue;
+						}
 
-                        return $timezone;
-                    }
-                }
-            }
-        }
+						return $timezone;
+					}
+				}
+			}
+		}
 
-        if ($failIfUncertain) {
-            throw new InvalidArgumentException('We were unable to determine the correct PHP timezone for tzid: '.$tzid);
-        }
+		if ($failIfUncertain) {
+			throw new InvalidArgumentException('We were unable to determine the correct PHP timezone for tzid: '.$tzid);
+		}
 
-        // If we got all the way here, we default to whatever has been set as the PHP default timezone.
-        return new DateTimeZone(date_default_timezone_get());
-    }
+		// If we got all the way here, we default to whatever has been set as the PHP default timezone.
+		return new DateTimeZone(date_default_timezone_get());
+	}
 
-    public static function addTimezoneGuesser(string $key, TimezoneGuesser $guesser): void
-    {
-        self::getInstance()->addGuesser($key, $guesser);
-    }
+	public static function addTimezoneGuesser(string $key, TimezoneGuesser $guesser): void
+	{
+		self::getInstance()->addGuesser($key, $guesser);
+	}
 
-    public static function addTimezoneFinder(string $key, TimezoneFinder $finder): void
-    {
-        self::getInstance()->addFinder($key, $finder);
-    }
+	public static function addTimezoneFinder(string $key, TimezoneFinder $finder): void
+	{
+		self::getInstance()->addFinder($key, $finder);
+	}
 
-    /**
-     * @param string $tzid
-     * @param false  $failIfUncertain
-     *
-     * @return DateTimeZone
-     */
-    public static function getTimeZone($tzid, Component $vcalendar = null, $failIfUncertain = false)
-    {
-        return self::getInstance()->findTimeZone($tzid, $vcalendar, $failIfUncertain);
-    }
+	/**
+	 * @param string $tzid
+	 * @param false  $failIfUncertain
+	 *
+	 * @return DateTimeZone
+	 */
+	public static function getTimeZone($tzid, Component $vcalendar = null, $failIfUncertain = false)
+	{
+		return self::getInstance()->findTimeZone($tzid, $vcalendar, $failIfUncertain);
+	}
 
-    public static function clean(): void
-    {
-        self::$instance = null;
-    }
+	public static function clean(): void
+	{
+		self::$instance = null;
+	}
 
-    // Keeping things for backwards compatibility
-    /**
-     * @var array|null
-     *
-     * @deprecated
-     */
-    public static $map = null;
+	// Keeping things for backwards compatibility
+	/**
+	 * @var array|null
+	 *
+	 * @deprecated
+	 */
+	public static $map = null;
 
-    /**
-     * List of microsoft exchange timezone ids.
-     *
-     * Source: http://msdn.microsoft.com/en-us/library/aa563018(loband).aspx
-     *
-     * @deprecated
-     */
-    public static $microsoftExchangeMap = [
-        0 => 'UTC',
-        31 => 'Africa/Casablanca',
-        // Insanely, id #2 is used for both Europe/Lisbon, and Europe/Sarajevo.
-        // I'm not even kidding.. We handle this special case in the
-        // getTimeZone method.
-        2 => 'Europe/Lisbon',
-        1 => 'Europe/London',
-        4 => 'Europe/Berlin',
-        6 => 'Europe/Prague',
-        3 => 'Europe/Paris',
-        69 => 'Africa/Luanda', // This was a best guess
-        7 => 'Europe/Athens',
-        5 => 'Europe/Bucharest',
-        49 => 'Africa/Cairo',
-        50 => 'Africa/Harare',
-        59 => 'Europe/Helsinki',
-        27 => 'Asia/Jerusalem',
-        26 => 'Asia/Baghdad',
-        74 => 'Asia/Kuwait',
-        51 => 'Europe/Moscow',
-        56 => 'Africa/Nairobi',
-        25 => 'Asia/Tehran',
-        24 => 'Asia/Muscat', // Best guess
-        54 => 'Asia/Baku',
-        48 => 'Asia/Kabul',
-        58 => 'Asia/Yekaterinburg',
-        47 => 'Asia/Karachi',
-        23 => 'Asia/Calcutta',
-        62 => 'Asia/Kathmandu',
-        46 => 'Asia/Almaty',
-        71 => 'Asia/Dhaka',
-        66 => 'Asia/Colombo',
-        61 => 'Asia/Rangoon',
-        22 => 'Asia/Bangkok',
-        64 => 'Asia/Krasnoyarsk',
-        45 => 'Asia/Shanghai',
-        63 => 'Asia/Irkutsk',
-        21 => 'Asia/Singapore',
-        73 => 'Australia/Perth',
-        75 => 'Asia/Taipei',
-        20 => 'Asia/Tokyo',
-        72 => 'Asia/Seoul',
-        70 => 'Asia/Yakutsk',
-        19 => 'Australia/Adelaide',
-        44 => 'Australia/Darwin',
-        18 => 'Australia/Brisbane',
-        76 => 'Australia/Sydney',
-        43 => 'Pacific/Guam',
-        42 => 'Australia/Hobart',
-        68 => 'Asia/Vladivostok',
-        41 => 'Asia/Magadan',
-        17 => 'Pacific/Auckland',
-        40 => 'Pacific/Fiji',
-        67 => 'Pacific/Tongatapu',
-        29 => 'Atlantic/Azores',
-        53 => 'Atlantic/Cape_Verde',
-        30 => 'America/Noronha',
-         8 => 'America/Sao_Paulo', // Best guess
-        32 => 'America/Argentina/Buenos_Aires',
-        60 => 'America/Godthab',
-        28 => 'America/St_Johns',
-         9 => 'America/Halifax',
-        33 => 'America/Caracas',
-        65 => 'America/Santiago',
-        35 => 'America/Bogota',
-        10 => 'America/New_York',
-        34 => 'America/Indiana/Indianapolis',
-        55 => 'America/Guatemala',
-        11 => 'America/Chicago',
-        37 => 'America/Mexico_City',
-        36 => 'America/Edmonton',
-        38 => 'America/Phoenix',
-        12 => 'America/Denver', // Best guess
-        13 => 'America/Los_Angeles', // Best guess
-        14 => 'America/Anchorage',
-        15 => 'Pacific/Honolulu',
-        16 => 'Pacific/Midway',
-        39 => 'Pacific/Kwajalein',
-    ];
+	/**
+	 * List of microsoft exchange timezone ids.
+	 *
+	 * Source: http://msdn.microsoft.com/en-us/library/aa563018(loband).aspx
+	 *
+	 * @deprecated
+	 */
+	public static $microsoftExchangeMap = [
+		0 => 'UTC',
+		31 => 'Africa/Casablanca',
+		// Insanely, id #2 is used for both Europe/Lisbon, and Europe/Sarajevo.
+		// I'm not even kidding.. We handle this special case in the
+		// getTimeZone method.
+		2 => 'Europe/Lisbon',
+		1 => 'Europe/London',
+		4 => 'Europe/Berlin',
+		6 => 'Europe/Prague',
+		3 => 'Europe/Paris',
+		69 => 'Africa/Luanda', // This was a best guess
+		7 => 'Europe/Athens',
+		5 => 'Europe/Bucharest',
+		49 => 'Africa/Cairo',
+		50 => 'Africa/Harare',
+		59 => 'Europe/Helsinki',
+		27 => 'Asia/Jerusalem',
+		26 => 'Asia/Baghdad',
+		74 => 'Asia/Kuwait',
+		51 => 'Europe/Moscow',
+		56 => 'Africa/Nairobi',
+		25 => 'Asia/Tehran',
+		24 => 'Asia/Muscat', // Best guess
+		54 => 'Asia/Baku',
+		48 => 'Asia/Kabul',
+		58 => 'Asia/Yekaterinburg',
+		47 => 'Asia/Karachi',
+		23 => 'Asia/Calcutta',
+		62 => 'Asia/Kathmandu',
+		46 => 'Asia/Almaty',
+		71 => 'Asia/Dhaka',
+		66 => 'Asia/Colombo',
+		61 => 'Asia/Rangoon',
+		22 => 'Asia/Bangkok',
+		64 => 'Asia/Krasnoyarsk',
+		45 => 'Asia/Shanghai',
+		63 => 'Asia/Irkutsk',
+		21 => 'Asia/Singapore',
+		73 => 'Australia/Perth',
+		75 => 'Asia/Taipei',
+		20 => 'Asia/Tokyo',
+		72 => 'Asia/Seoul',
+		70 => 'Asia/Yakutsk',
+		19 => 'Australia/Adelaide',
+		44 => 'Australia/Darwin',
+		18 => 'Australia/Brisbane',
+		76 => 'Australia/Sydney',
+		43 => 'Pacific/Guam',
+		42 => 'Australia/Hobart',
+		68 => 'Asia/Vladivostok',
+		41 => 'Asia/Magadan',
+		17 => 'Pacific/Auckland',
+		40 => 'Pacific/Fiji',
+		67 => 'Pacific/Tongatapu',
+		29 => 'Atlantic/Azores',
+		53 => 'Atlantic/Cape_Verde',
+		30 => 'America/Noronha',
+		 8 => 'America/Sao_Paulo', // Best guess
+		32 => 'America/Argentina/Buenos_Aires',
+		60 => 'America/Godthab',
+		28 => 'America/St_Johns',
+		 9 => 'America/Halifax',
+		33 => 'America/Caracas',
+		65 => 'America/Santiago',
+		35 => 'America/Bogota',
+		10 => 'America/New_York',
+		34 => 'America/Indiana/Indianapolis',
+		55 => 'America/Guatemala',
+		11 => 'America/Chicago',
+		37 => 'America/Mexico_City',
+		36 => 'America/Edmonton',
+		38 => 'America/Phoenix',
+		12 => 'America/Denver', // Best guess
+		13 => 'America/Los_Angeles', // Best guess
+		14 => 'America/Anchorage',
+		15 => 'Pacific/Honolulu',
+		16 => 'Pacific/Midway',
+		39 => 'Pacific/Kwajalein',
+	];
 
-    /**
-     * This method will load in all the tz mapping information, if it's not yet
-     * done.
-     *
-     * @deprecated
-     */
-    public static function loadTzMaps()
-    {
-        if (!is_null(self::$map)) {
-            return;
-        }
+	/**
+	 * This method will load in all the tz mapping information, if it's not yet
+	 * done.
+	 *
+	 * @deprecated
+	 */
+	public static function loadTzMaps()
+	{
+		if (!is_null(self::$map)) {
+			return;
+		}
 
-        self::$map = array_merge(
-            include __DIR__.'/timezonedata/windowszones.php',
-            include __DIR__.'/timezonedata/lotuszones.php',
-            include __DIR__.'/timezonedata/exchangezones.php',
-            include __DIR__.'/timezonedata/php-workaround.php'
-        );
-    }
+		self::$map = array_merge(
+			include __DIR__.'/timezonedata/windowszones.php',
+			include __DIR__.'/timezonedata/lotuszones.php',
+			include __DIR__.'/timezonedata/exchangezones.php',
+			include __DIR__.'/timezonedata/php-workaround.php'
+		);
+	}
 
-    /**
-     * This method returns an array of timezone identifiers, that are supported
-     * by DateTimeZone(), but not returned by DateTimeZone::listIdentifiers().
-     *
-     * We're not using DateTimeZone::listIdentifiers(DateTimeZone::ALL_WITH_BC) because:
-     * - It's not supported by some PHP versions as well as HHVM.
-     * - It also returns identifiers, that are invalid values for new DateTimeZone() on some PHP versions.
-     * (See timezonedata/php-bc.php and timezonedata php-workaround.php)
-     *
-     * @return array
-     *
-     * @deprecated
-     */
-    public static function getIdentifiersBC()
-    {
-        return include __DIR__.'/timezonedata/php-bc.php';
-    }
+	/**
+	 * This method returns an array of timezone identifiers, that are supported
+	 * by DateTimeZone(), but not returned by DateTimeZone::listIdentifiers().
+	 *
+	 * We're not using DateTimeZone::listIdentifiers(DateTimeZone::ALL_WITH_BC) because:
+	 * - It's not supported by some PHP versions as well as HHVM.
+	 * - It also returns identifiers, that are invalid values for new DateTimeZone() on some PHP versions.
+	 * (See timezonedata/php-bc.php and timezonedata php-workaround.php)
+	 *
+	 * @return array
+	 *
+	 * @deprecated
+	 */
+	public static function getIdentifiersBC()
+	{
+		return include __DIR__.'/timezonedata/php-bc.php';
+	}
 }