Dolibarr / dolibarr

htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/DomainPart.php

Indentation +406 added lines, -406 removed lines

@@ -34,410 +34,410 @@
 
 class DomainPart extends Parser
 {
-    const DOMAIN_MAX_LENGTH = 254;
-    const LABEL_MAX_LENGTH = 63;
-
-    /**
-     * @var string
-     */
-    protected $domainPart = '';
-
-    public function parse($domainPart)
-    {
-        $this->lexer->moveNext();
-
-        $this->performDomainStartChecks();
-
-        $domain = $this->doParseDomainPart();
-
-        $prev = $this->lexer->getPrevious();
-        $length = strlen($domain);
-
-        if ($prev['type'] === EmailLexer::S_DOT) {
-            throw new DotAtEnd();
-        }
-        if ($prev['type'] === EmailLexer::S_HYPHEN) {
-            throw new DomainHyphened();
-        }
-        if ($length > self::DOMAIN_MAX_LENGTH) {
-            $this->warnings[DomainTooLong::CODE] = new DomainTooLong();
-        }
-        if ($prev['type'] === EmailLexer::S_CR) {
-            throw new CRLFAtTheEnd();
-        }
-        $this->domainPart = $domain;
-    }
-
-    private function performDomainStartChecks()
-    {
-        $this->checkInvalidTokensAfterAT();
-        $this->checkEmptyDomain();
-
-        if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
-            $this->warnings[DeprecatedComment::CODE] = new DeprecatedComment();
-            $this->parseDomainComments();
-        }
-    }
-
-    private function checkEmptyDomain()
-    {
-        $thereIsNoDomain = $this->lexer->token['type'] === EmailLexer::S_EMPTY ||
-            ($this->lexer->token['type'] === EmailLexer::S_SP &&
-            !$this->lexer->isNextToken(EmailLexer::GENERIC));
-
-        if ($thereIsNoDomain) {
-            throw new NoDomainPart();
-        }
-    }
-
-    private function checkInvalidTokensAfterAT()
-    {
-        if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
-            throw new DotAtStart();
-        }
-        if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN) {
-            throw new DomainHyphened();
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function getDomainPart()
-    {
-        return $this->domainPart;
-    }
-
-    /**
-     * @param string $addressLiteral
-     * @param int $maxGroups
-     */
-    public function checkIPV6Tag($addressLiteral, $maxGroups = 8)
-    {
-        $prev = $this->lexer->getPrevious();
-        if ($prev['type'] === EmailLexer::S_COLON) {
-            $this->warnings[IPV6ColonEnd::CODE] = new IPV6ColonEnd();
-        }
-
-        $IPv6       = substr($addressLiteral, 5);
-        //Daniel Marschall's new IPv6 testing strategy
-        $matchesIP  = explode(':', $IPv6);
-        $groupCount = count($matchesIP);
-        $colons     = strpos($IPv6, '::');
-
-        if (count(preg_grep('/^[0-9A-Fa-f]{0,4}$/', $matchesIP, PREG_GREP_INVERT)) !== 0) {
-            $this->warnings[IPV6BadChar::CODE] = new IPV6BadChar();
-        }
-
-        if ($colons === false) {
-            // We need exactly the right number of groups
-            if ($groupCount !== $maxGroups) {
-                $this->warnings[IPV6GroupCount::CODE] = new IPV6GroupCount();
-            }
-            return;
-        }
-
-        if ($colons !== strrpos($IPv6, '::')) {
-            $this->warnings[IPV6DoubleColon::CODE] = new IPV6DoubleColon();
-            return;
-        }
-
-        if ($colons === 0 || $colons === (strlen($IPv6) - 2)) {
-            // RFC 4291 allows :: at the start or end of an address
-            //with 7 other groups in addition
-            ++$maxGroups;
-        }
-
-        if ($groupCount > $maxGroups) {
-            $this->warnings[IPV6MaxGroups::CODE] = new IPV6MaxGroups();
-        } elseif ($groupCount === $maxGroups) {
-            $this->warnings[IPV6Deprecated::CODE] = new IPV6Deprecated();
-        }
-    }
-
-    /**
-     * @return string
-     */
-    protected function doParseDomainPart()
-    {
-        $domain = '';
-        $label = '';
-        $openedParenthesis = 0;
-        do {
-            $prev = $this->lexer->getPrevious();
-
-            $this->checkNotAllowedChars($this->lexer->token);
-
-            if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
-                $this->parseComments();
-                $openedParenthesis += $this->getOpenedParenthesis();
-                $this->lexer->moveNext();
-                $tmpPrev = $this->lexer->getPrevious();
-                if ($tmpPrev['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
-                    $openedParenthesis--;
-                }
-            }
-            if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
-                if ($openedParenthesis === 0) {
-                    throw new UnopenedComment();
-                } else {
-                    $openedParenthesis--;
-                }
-            }
-
-            $this->checkConsecutiveDots();
-            $this->checkDomainPartExceptions($prev);
-
-            if ($this->hasBrackets()) {
-                $this->parseDomainLiteral();
-            }
-
-            if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
-                $this->checkLabelLength($label);
-                $label = '';
-            } else {
-                $label .= $this->lexer->token['value'];
-            }
-
-            if ($this->isFWS()) {
-                $this->parseFWS();
-            }
-
-            $domain .= $this->lexer->token['value'];
-            $this->lexer->moveNext();
-            if ($this->lexer->token['type'] === EmailLexer::S_SP) {
-                throw new CharNotAllowed();
-            }
-        } while (null !== $this->lexer->token['type']);
-
-        $this->checkLabelLength($label);
-
-        return $domain;
-    }
-
-    private function checkNotAllowedChars(array $token)
-    {
-        $notAllowed = [EmailLexer::S_BACKSLASH => true, EmailLexer::S_SLASH=> true];
-        if (isset($notAllowed[$token['type']])) {
-            throw new CharNotAllowed();
-        }
-    }
-
-    /**
-     * @return string|false
-     */
-    protected function parseDomainLiteral()
-    {
-        if ($this->lexer->isNextToken(EmailLexer::S_COLON)) {
-            $this->warnings[IPV6ColonStart::CODE] = new IPV6ColonStart();
-        }
-        if ($this->lexer->isNextToken(EmailLexer::S_IPV6TAG)) {
-            $lexer = clone $this->lexer;
-            $lexer->moveNext();
-            if ($lexer->isNextToken(EmailLexer::S_DOUBLECOLON)) {
-                $this->warnings[IPV6ColonStart::CODE] = new IPV6ColonStart();
-            }
-        }
-
-        return $this->doParseDomainLiteral();
-    }
-
-    /**
-     * @return string|false
-     */
-    protected function doParseDomainLiteral()
-    {
-        $IPv6TAG = false;
-        $addressLiteral = '';
-        do {
-            if ($this->lexer->token['type'] === EmailLexer::C_NUL) {
-                throw new ExpectingDTEXT();
-            }
-
-            if ($this->lexer->token['type'] === EmailLexer::INVALID ||
-                $this->lexer->token['type'] === EmailLexer::C_DEL   ||
-                $this->lexer->token['type'] === EmailLexer::S_LF
-            ) {
-                $this->warnings[ObsoleteDTEXT::CODE] = new ObsoleteDTEXT();
-            }
-
-            if ($this->lexer->isNextTokenAny(array(EmailLexer::S_OPENQBRACKET, EmailLexer::S_OPENBRACKET))) {
-                throw new ExpectingDTEXT();
-            }
-
-            if ($this->lexer->isNextTokenAny(
-                array(EmailLexer::S_HTAB, EmailLexer::S_SP, $this->lexer->token['type'] === EmailLexer::CRLF)
-            )) {
-                $this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
-                $this->parseFWS();
-            }
-
-            if ($this->lexer->isNextToken(EmailLexer::S_CR)) {
-                throw new CRNoLF();
-            }
-
-            if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH) {
-                $this->warnings[ObsoleteDTEXT::CODE] = new ObsoleteDTEXT();
-                $addressLiteral .= $this->lexer->token['value'];
-                $this->lexer->moveNext();
-                $this->validateQuotedPair();
-            }
-            if ($this->lexer->token['type'] === EmailLexer::S_IPV6TAG) {
-                $IPv6TAG = true;
-            }
-            if ($this->lexer->token['type'] === EmailLexer::S_CLOSEQBRACKET) {
-                break;
-            }
-
-            $addressLiteral .= $this->lexer->token['value'];
-
-        } while ($this->lexer->moveNext());
-
-        $addressLiteral = str_replace('[', '', $addressLiteral);
-        $addressLiteral = $this->checkIPV4Tag($addressLiteral);
-
-        if (false === $addressLiteral) {
-            return $addressLiteral;
-        }
-
-        if (!$IPv6TAG) {
-            $this->warnings[DomainLiteral::CODE] = new DomainLiteral();
-            return $addressLiteral;
-        }
-
-        $this->warnings[AddressLiteral::CODE] = new AddressLiteral();
-
-        $this->checkIPV6Tag($addressLiteral);
-
-        return $addressLiteral;
-    }
-
-    /**
-     * @param string $addressLiteral
-     *
-     * @return string|false
-     */
-    protected function checkIPV4Tag($addressLiteral)
-    {
-        $matchesIP  = array();
-
-        // Extract IPv4 part from the end of the address-literal (if there is one)
-        if (preg_match(
-            '/\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/',
-            $addressLiteral,
-            $matchesIP
-        ) > 0
-        ) {
-            $index = strrpos($addressLiteral, $matchesIP[0]);
-            if ($index === 0) {
-                $this->warnings[AddressLiteral::CODE] = new AddressLiteral();
-                return false;
-            }
-            // Convert IPv4 part to IPv6 format for further testing
-            $addressLiteral = substr($addressLiteral, 0, (int) $index) . '0:0';
-        }
-
-        return $addressLiteral;
-    }
-
-    protected function checkDomainPartExceptions(array $prev)
-    {
-        $invalidDomainTokens = array(
-            EmailLexer::S_DQUOTE => true,
-            EmailLexer::S_SQUOTE => true,
-            EmailLexer::S_BACKTICK => true,
-            EmailLexer::S_SEMICOLON => true,
-            EmailLexer::S_GREATERTHAN => true,
-            EmailLexer::S_LOWERTHAN => true,
-        );
-
-        if (isset($invalidDomainTokens[$this->lexer->token['type']])) {
-            throw new ExpectingATEXT();
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_COMMA) {
-            throw new CommaInDomain();
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_AT) {
-            throw new ConsecutiveAt();
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_OPENQBRACKET && $prev['type'] !== EmailLexer::S_AT) {
-            throw new ExpectingATEXT();
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
-            throw new DomainHyphened();
-        }
-
-        if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH
-            && $this->lexer->isNextToken(EmailLexer::GENERIC)) {
-            throw new ExpectingATEXT();
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    protected function hasBrackets()
-    {
-        if ($this->lexer->token['type'] !== EmailLexer::S_OPENBRACKET) {
-            return false;
-        }
-
-        try {
-            $this->lexer->find(EmailLexer::S_CLOSEBRACKET);
-        } catch (\RuntimeException $e) {
-            throw new ExpectingDomainLiteralClose();
-        }
-
-        return true;
-    }
-
-    /**
-     * @param string $label
-     */
-    protected function checkLabelLength($label)
-    {
-        if ($this->isLabelTooLong($label)) {
-            $this->warnings[LabelTooLong::CODE] = new LabelTooLong();
-        }
-    }
-
-    /**
-     * @param string $label
-     * @return bool
-     */
-    private function isLabelTooLong($label)
-    {
-        if (preg_match('/[^\x00-\x7F]/', $label)) {
-            idn_to_ascii($label, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46, $idnaInfo);
-
-            return (bool) ($idnaInfo['errors'] & IDNA_ERROR_LABEL_TOO_LONG);
-        }
-
-        return strlen($label) > self::LABEL_MAX_LENGTH;
-    }
-
-    protected function parseDomainComments()
-    {
-        $this->isUnclosedComment();
-        while (!$this->lexer->isNextToken(EmailLexer::S_CLOSEPARENTHESIS)) {
-            $this->warnEscaping();
-            $this->lexer->moveNext();
-        }
-
-        $this->lexer->moveNext();
-        if ($this->lexer->isNextToken(EmailLexer::S_DOT)) {
-            throw new ExpectingATEXT();
-        }
-    }
-
-    protected function addTLDWarnings()
-    {
-        if ($this->warnings[DomainLiteral::CODE]) {
-            $this->warnings[TLD::CODE] = new TLD();
-        }
-    }
+	const DOMAIN_MAX_LENGTH = 254;
+	const LABEL_MAX_LENGTH = 63;
+
+	/**
+	 * @var string
+	 */
+	protected $domainPart = '';
+
+	public function parse($domainPart)
+	{
+		$this->lexer->moveNext();
+
+		$this->performDomainStartChecks();
+
+		$domain = $this->doParseDomainPart();
+
+		$prev = $this->lexer->getPrevious();
+		$length = strlen($domain);
+
+		if ($prev['type'] === EmailLexer::S_DOT) {
+			throw new DotAtEnd();
+		}
+		if ($prev['type'] === EmailLexer::S_HYPHEN) {
+			throw new DomainHyphened();
+		}
+		if ($length > self::DOMAIN_MAX_LENGTH) {
+			$this->warnings[DomainTooLong::CODE] = new DomainTooLong();
+		}
+		if ($prev['type'] === EmailLexer::S_CR) {
+			throw new CRLFAtTheEnd();
+		}
+		$this->domainPart = $domain;
+	}
+
+	private function performDomainStartChecks()
+	{
+		$this->checkInvalidTokensAfterAT();
+		$this->checkEmptyDomain();
+
+		if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
+			$this->warnings[DeprecatedComment::CODE] = new DeprecatedComment();
+			$this->parseDomainComments();
+		}
+	}
+
+	private function checkEmptyDomain()
+	{
+		$thereIsNoDomain = $this->lexer->token['type'] === EmailLexer::S_EMPTY ||
+			($this->lexer->token['type'] === EmailLexer::S_SP &&
+			!$this->lexer->isNextToken(EmailLexer::GENERIC));
+
+		if ($thereIsNoDomain) {
+			throw new NoDomainPart();
+		}
+	}
+
+	private function checkInvalidTokensAfterAT()
+	{
+		if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
+			throw new DotAtStart();
+		}
+		if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN) {
+			throw new DomainHyphened();
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDomainPart()
+	{
+		return $this->domainPart;
+	}
+
+	/**
+	 * @param string $addressLiteral
+	 * @param int $maxGroups
+	 */
+	public function checkIPV6Tag($addressLiteral, $maxGroups = 8)
+	{
+		$prev = $this->lexer->getPrevious();
+		if ($prev['type'] === EmailLexer::S_COLON) {
+			$this->warnings[IPV6ColonEnd::CODE] = new IPV6ColonEnd();
+		}
+
+		$IPv6       = substr($addressLiteral, 5);
+		//Daniel Marschall's new IPv6 testing strategy
+		$matchesIP  = explode(':', $IPv6);
+		$groupCount = count($matchesIP);
+		$colons     = strpos($IPv6, '::');
+
+		if (count(preg_grep('/^[0-9A-Fa-f]{0,4}$/', $matchesIP, PREG_GREP_INVERT)) !== 0) {
+			$this->warnings[IPV6BadChar::CODE] = new IPV6BadChar();
+		}
+
+		if ($colons === false) {
+			// We need exactly the right number of groups
+			if ($groupCount !== $maxGroups) {
+				$this->warnings[IPV6GroupCount::CODE] = new IPV6GroupCount();
+			}
+			return;
+		}
+
+		if ($colons !== strrpos($IPv6, '::')) {
+			$this->warnings[IPV6DoubleColon::CODE] = new IPV6DoubleColon();
+			return;
+		}
+
+		if ($colons === 0 || $colons === (strlen($IPv6) - 2)) {
+			// RFC 4291 allows :: at the start or end of an address
+			//with 7 other groups in addition
+			++$maxGroups;
+		}
+
+		if ($groupCount > $maxGroups) {
+			$this->warnings[IPV6MaxGroups::CODE] = new IPV6MaxGroups();
+		} elseif ($groupCount === $maxGroups) {
+			$this->warnings[IPV6Deprecated::CODE] = new IPV6Deprecated();
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function doParseDomainPart()
+	{
+		$domain = '';
+		$label = '';
+		$openedParenthesis = 0;
+		do {
+			$prev = $this->lexer->getPrevious();
+
+			$this->checkNotAllowedChars($this->lexer->token);
+
+			if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
+				$this->parseComments();
+				$openedParenthesis += $this->getOpenedParenthesis();
+				$this->lexer->moveNext();
+				$tmpPrev = $this->lexer->getPrevious();
+				if ($tmpPrev['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
+					$openedParenthesis--;
+				}
+			}
+			if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
+				if ($openedParenthesis === 0) {
+					throw new UnopenedComment();
+				} else {
+					$openedParenthesis--;
+				}
+			}
+
+			$this->checkConsecutiveDots();
+			$this->checkDomainPartExceptions($prev);
+
+			if ($this->hasBrackets()) {
+				$this->parseDomainLiteral();
+			}
+
+			if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
+				$this->checkLabelLength($label);
+				$label = '';
+			} else {
+				$label .= $this->lexer->token['value'];
+			}
+
+			if ($this->isFWS()) {
+				$this->parseFWS();
+			}
+
+			$domain .= $this->lexer->token['value'];
+			$this->lexer->moveNext();
+			if ($this->lexer->token['type'] === EmailLexer::S_SP) {
+				throw new CharNotAllowed();
+			}
+		} while (null !== $this->lexer->token['type']);
+
+		$this->checkLabelLength($label);
+
+		return $domain;
+	}
+
+	private function checkNotAllowedChars(array $token)
+	{
+		$notAllowed = [EmailLexer::S_BACKSLASH => true, EmailLexer::S_SLASH=> true];
+		if (isset($notAllowed[$token['type']])) {
+			throw new CharNotAllowed();
+		}
+	}
+
+	/**
+	 * @return string|false
+	 */
+	protected function parseDomainLiteral()
+	{
+		if ($this->lexer->isNextToken(EmailLexer::S_COLON)) {
+			$this->warnings[IPV6ColonStart::CODE] = new IPV6ColonStart();
+		}
+		if ($this->lexer->isNextToken(EmailLexer::S_IPV6TAG)) {
+			$lexer = clone $this->lexer;
+			$lexer->moveNext();
+			if ($lexer->isNextToken(EmailLexer::S_DOUBLECOLON)) {
+				$this->warnings[IPV6ColonStart::CODE] = new IPV6ColonStart();
+			}
+		}
+
+		return $this->doParseDomainLiteral();
+	}
+
+	/**
+	 * @return string|false
+	 */
+	protected function doParseDomainLiteral()
+	{
+		$IPv6TAG = false;
+		$addressLiteral = '';
+		do {
+			if ($this->lexer->token['type'] === EmailLexer::C_NUL) {
+				throw new ExpectingDTEXT();
+			}
+
+			if ($this->lexer->token['type'] === EmailLexer::INVALID ||
+				$this->lexer->token['type'] === EmailLexer::C_DEL   ||
+				$this->lexer->token['type'] === EmailLexer::S_LF
+			) {
+				$this->warnings[ObsoleteDTEXT::CODE] = new ObsoleteDTEXT();
+			}
+
+			if ($this->lexer->isNextTokenAny(array(EmailLexer::S_OPENQBRACKET, EmailLexer::S_OPENBRACKET))) {
+				throw new ExpectingDTEXT();
+			}
+
+			if ($this->lexer->isNextTokenAny(
+				array(EmailLexer::S_HTAB, EmailLexer::S_SP, $this->lexer->token['type'] === EmailLexer::CRLF)
+			)) {
+				$this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
+				$this->parseFWS();
+			}
+
+			if ($this->lexer->isNextToken(EmailLexer::S_CR)) {
+				throw new CRNoLF();
+			}
+
+			if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH) {
+				$this->warnings[ObsoleteDTEXT::CODE] = new ObsoleteDTEXT();
+				$addressLiteral .= $this->lexer->token['value'];
+				$this->lexer->moveNext();
+				$this->validateQuotedPair();
+			}
+			if ($this->lexer->token['type'] === EmailLexer::S_IPV6TAG) {
+				$IPv6TAG = true;
+			}
+			if ($this->lexer->token['type'] === EmailLexer::S_CLOSEQBRACKET) {
+				break;
+			}
+
+			$addressLiteral .= $this->lexer->token['value'];
+
+		} while ($this->lexer->moveNext());
+
+		$addressLiteral = str_replace('[', '', $addressLiteral);
+		$addressLiteral = $this->checkIPV4Tag($addressLiteral);
+
+		if (false === $addressLiteral) {
+			return $addressLiteral;
+		}
+
+		if (!$IPv6TAG) {
+			$this->warnings[DomainLiteral::CODE] = new DomainLiteral();
+			return $addressLiteral;
+		}
+
+		$this->warnings[AddressLiteral::CODE] = new AddressLiteral();
+
+		$this->checkIPV6Tag($addressLiteral);
+
+		return $addressLiteral;
+	}
+
+	/**
+	 * @param string $addressLiteral
+	 *
+	 * @return string|false
+	 */
+	protected function checkIPV4Tag($addressLiteral)
+	{
+		$matchesIP  = array();
+
+		// Extract IPv4 part from the end of the address-literal (if there is one)
+		if (preg_match(
+			'/\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/',
+			$addressLiteral,
+			$matchesIP
+		) > 0
+		) {
+			$index = strrpos($addressLiteral, $matchesIP[0]);
+			if ($index === 0) {
+				$this->warnings[AddressLiteral::CODE] = new AddressLiteral();
+				return false;
+			}
+			// Convert IPv4 part to IPv6 format for further testing
+			$addressLiteral = substr($addressLiteral, 0, (int) $index) . '0:0';
+		}
+
+		return $addressLiteral;
+	}
+
+	protected function checkDomainPartExceptions(array $prev)
+	{
+		$invalidDomainTokens = array(
+			EmailLexer::S_DQUOTE => true,
+			EmailLexer::S_SQUOTE => true,
+			EmailLexer::S_BACKTICK => true,
+			EmailLexer::S_SEMICOLON => true,
+			EmailLexer::S_GREATERTHAN => true,
+			EmailLexer::S_LOWERTHAN => true,
+		);
+
+		if (isset($invalidDomainTokens[$this->lexer->token['type']])) {
+			throw new ExpectingATEXT();
+		}
+
+		if ($this->lexer->token['type'] === EmailLexer::S_COMMA) {
+			throw new CommaInDomain();
+		}
+
+		if ($this->lexer->token['type'] === EmailLexer::S_AT) {
+			throw new ConsecutiveAt();
+		}
+
+		if ($this->lexer->token['type'] === EmailLexer::S_OPENQBRACKET && $prev['type'] !== EmailLexer::S_AT) {
+			throw new ExpectingATEXT();
+		}
+
+		if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
+			throw new DomainHyphened();
+		}
+
+		if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH
+			&& $this->lexer->isNextToken(EmailLexer::GENERIC)) {
+			throw new ExpectingATEXT();
+		}
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function hasBrackets()
+	{
+		if ($this->lexer->token['type'] !== EmailLexer::S_OPENBRACKET) {
+			return false;
+		}
+
+		try {
+			$this->lexer->find(EmailLexer::S_CLOSEBRACKET);
+		} catch (\RuntimeException $e) {
+			throw new ExpectingDomainLiteralClose();
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param string $label
+	 */
+	protected function checkLabelLength($label)
+	{
+		if ($this->isLabelTooLong($label)) {
+			$this->warnings[LabelTooLong::CODE] = new LabelTooLong();
+		}
+	}
+
+	/**
+	 * @param string $label
+	 * @return bool
+	 */
+	private function isLabelTooLong($label)
+	{
+		if (preg_match('/[^\x00-\x7F]/', $label)) {
+			idn_to_ascii($label, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46, $idnaInfo);
+
+			return (bool) ($idnaInfo['errors'] & IDNA_ERROR_LABEL_TOO_LONG);
+		}
+
+		return strlen($label) > self::LABEL_MAX_LENGTH;
+	}
+
+	protected function parseDomainComments()
+	{
+		$this->isUnclosedComment();
+		while (!$this->lexer->isNextToken(EmailLexer::S_CLOSEPARENTHESIS)) {
+			$this->warnEscaping();
+			$this->lexer->moveNext();
+		}
+
+		$this->lexer->moveNext();
+		if ($this->lexer->isNextToken(EmailLexer::S_DOT)) {
+			throw new ExpectingATEXT();
+		}
+	}
+
+	protected function addTLDWarnings()
+	{
+		if ($this->warnings[DomainLiteral::CODE]) {
+			$this->warnings[TLD::CODE] = new TLD();
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -255,7 +255,7 @@ 
             }
 
             if ($this->lexer->token['type'] === EmailLexer::INVALID ||
-                $this->lexer->token['type'] === EmailLexer::C_DEL   ||
+                $this->lexer->token['type'] === EmailLexer::C_DEL ||
                 $this->lexer->token['type'] === EmailLexer::S_LF
             ) {
                 $this->warnings[ObsoleteDTEXT::CODE] = new ObsoleteDTEXT();
@@ -319,7 +319,7 @@ 
      */
     protected function checkIPV4Tag($addressLiteral)
     {
-        $matchesIP  = array();
+        $matchesIP = array();
 
         // Extract IPv4 part from the end of the address-literal (if there is one)
         if (preg_match(
@@ -334,7 +334,7 @@ 
                 return false;
             }
             // Convert IPv4 part to IPv6 format for further testing
-            $addressLiteral = substr($addressLiteral, 0, (int) $index) . '0:0';
+            $addressLiteral = substr($addressLiteral, 0, (int) $index).'0:0';
         }
 
         return $addressLiteral;

htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailValidator.php

Indentation +49 added lines, -49 removed lines

@@ -7,61 +7,61 @@
 
 class EmailValidator
 {
-    /**
-     * @var EmailLexer
-     */
-    private $lexer;
+	/**
+	 * @var EmailLexer
+	 */
+	private $lexer;
 
-    /**
-     * @var Warning\Warning[]
-     */
-    protected $warnings = [];
+	/**
+	 * @var Warning\Warning[]
+	 */
+	protected $warnings = [];
 
-    /**
-     * @var InvalidEmail|null
-     */
-    protected $error;
+	/**
+	 * @var InvalidEmail|null
+	 */
+	protected $error;
 
-    public function __construct()
-    {
-        $this->lexer = new EmailLexer();
-    }
+	public function __construct()
+	{
+		$this->lexer = new EmailLexer();
+	}
 
-    /**
-     * @param string          $email
-     * @param EmailValidation $emailValidation
-     * @return bool
-     */
-    public function isValid($email, EmailValidation $emailValidation)
-    {
-        $isValid = $emailValidation->isValid($email, $this->lexer);
-        $this->warnings = $emailValidation->getWarnings();
-        $this->error = $emailValidation->getError();
+	/**
+	 * @param string          $email
+	 * @param EmailValidation $emailValidation
+	 * @return bool
+	 */
+	public function isValid($email, EmailValidation $emailValidation)
+	{
+		$isValid = $emailValidation->isValid($email, $this->lexer);
+		$this->warnings = $emailValidation->getWarnings();
+		$this->error = $emailValidation->getError();
 
-        return $isValid;
-    }
+		return $isValid;
+	}
 
-    /**
-     * @return boolean
-     */
-    public function hasWarnings()
-    {
-        return !empty($this->warnings);
-    }
+	/**
+	 * @return boolean
+	 */
+	public function hasWarnings()
+	{
+		return !empty($this->warnings);
+	}
 
-    /**
-     * @return array
-     */
-    public function getWarnings()
-    {
-        return $this->warnings;
-    }
+	/**
+	 * @return array
+	 */
+	public function getWarnings()
+	{
+		return $this->warnings;
+	}
 
-    /**
-     * @return InvalidEmail|null
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
+	/**
+	 * @return InvalidEmail|null
+	 */
+	public function getError()
+	{
+		return $this->error;
+	}
 }

htdocs/includes/swiftmailer/egulias/email-validator/AutoLoader.php

Indentation +64 added lines, -64 removed lines

@@ -9,74 +9,74 @@
  */
 class EguliasAutoLoader
 {
-    /**
-     * @var string The namespace prefix for this instance.
-     */
-    protected $namespace = '';
+	/**
+	 * @var string The namespace prefix for this instance.
+	 */
+	protected $namespace = '';
 
-    /**
-     * @var string The filesystem prefix to use for this instance
-     */
-    protected $path = '';
+	/**
+	 * @var string The filesystem prefix to use for this instance
+	 */
+	protected $path = '';
 
-    /**
-     * Build the instance of the autoloader
-     *
-     * @param string $namespace The prefixed namespace this instance will load
-     * @param string $path      The filesystem path to the root of the namespace
-     */
-    public function __construct($namespace, $path)
-    {
-        $this->namespace = ltrim($namespace, '\\');
-        $this->path = rtrim($path, '/\\') . DIRECTORY_SEPARATOR;
-    }
+	/**
+	 * Build the instance of the autoloader
+	 *
+	 * @param string $namespace The prefixed namespace this instance will load
+	 * @param string $path      The filesystem path to the root of the namespace
+	 */
+	public function __construct($namespace, $path)
+	{
+		$this->namespace = ltrim($namespace, '\\');
+		$this->path = rtrim($path, '/\\') . DIRECTORY_SEPARATOR;
+	}
 
-    /**
-     * Try to load a class
-     *
-     * @param string $class The class name to load
-     *
-     * @return boolean If the loading was successful
-     */
-    public function load($class)
-    {
-        $class = ltrim($class, '\\');
-        if (strpos($class, $this->namespace) === 0) {
-            $nsparts = explode('\\', $class);
-            $class = array_pop($nsparts);
-            $path = $this->path . 'swiftmailer/egulias/email-validator/EmailValidator/';
-            $max=count($nsparts);
-            for ($i=2; $i<$max;$i++) {
-                $path .= $nsparts[$i].'/';
-            }
-            $nsparts = array();
-            $path .= str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
-            if (file_exists($path)) {
-                require $path;
-                return true;
-            }
-        }
+	/**
+	 * Try to load a class
+	 *
+	 * @param string $class The class name to load
+	 *
+	 * @return boolean If the loading was successful
+	 */
+	public function load($class)
+	{
+		$class = ltrim($class, '\\');
+		if (strpos($class, $this->namespace) === 0) {
+			$nsparts = explode('\\', $class);
+			$class = array_pop($nsparts);
+			$path = $this->path . 'swiftmailer/egulias/email-validator/EmailValidator/';
+			$max=count($nsparts);
+			for ($i=2; $i<$max;$i++) {
+				$path .= $nsparts[$i].'/';
+			}
+			$nsparts = array();
+			$path .= str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
+			if (file_exists($path)) {
+				require $path;
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Register the autoloader to PHP
-     *
-     * @return boolean The status of the registration
-     */
-    public function register()
-    {
-        return spl_autoload_register(array($this, 'load'));
-    }
+	/**
+	 * Register the autoloader to PHP
+	 *
+	 * @return boolean The status of the registration
+	 */
+	public function register()
+	{
+		return spl_autoload_register(array($this, 'load'));
+	}
 
-    /**
-     * Unregister the autoloader to PHP
-     *
-     * @return boolean The status of the unregistration
-     */
-    public function unregister()
-    {
-        return spl_autoload_unregister(array($this, 'load'));
-    }
+	/**
+	 * Unregister the autoloader to PHP
+	 *
+	 * @return boolean The status of the unregistration
+	 */
+	public function unregister()
+	{
+		return spl_autoload_unregister(array($this, 'load'));
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
     public function __construct($namespace, $path)
     {
         $this->namespace = ltrim($namespace, '\\');
-        $this->path = rtrim($path, '/\\') . DIRECTORY_SEPARATOR;
+        $this->path = rtrim($path, '/\\').DIRECTORY_SEPARATOR;
     }
 
     /**
@@ -44,13 +44,13 @@ 
         if (strpos($class, $this->namespace) === 0) {
             $nsparts = explode('\\', $class);
             $class = array_pop($nsparts);
-            $path = $this->path . 'swiftmailer/egulias/email-validator/EmailValidator/';
-            $max=count($nsparts);
-            for ($i=2; $i<$max;$i++) {
+            $path = $this->path.'swiftmailer/egulias/email-validator/EmailValidator/';
+            $max = count($nsparts);
+            for ($i = 2; $i < $max; $i++) {
                 $path .= $nsparts[$i].'/';
             }
             $nsparts = array();
-            $path .= str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
+            $path .= str_replace('_', DIRECTORY_SEPARATOR, $class).'.php';
             if (file_exists($path)) {
                 require $path;
                 return true;

htdocs/includes/swiftmailer/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php

Indentation +300 added lines, -300 removed lines

@@ -29,304 +29,304 @@
  */
 abstract class AbstractLexer
 {
-    /**
-     * Lexer original input string.
-     *
-     * @var string
-     */
-    private $input;
-
-    /**
-     * Array of scanned tokens.
-     *
-     * Each token is an associative array containing three items:
-     *  - 'value'    : the string value of the token in the input string
-     *  - 'type'     : the type of the token (identifier, numeric, string, input
-     *                 parameter, none)
-     *  - 'position' : the position of the token in the input string
-     *
-     * @var array
-     */
-    private $tokens = array();
-
-    /**
-     * Current lexer position in input string.
-     *
-     * @var integer
-     */
-    private $position = 0;
-
-    /**
-     * Current peek of current lexer position.
-     *
-     * @var integer
-     */
-    private $peek = 0;
-
-    /**
-     * The next token in the input.
-     *
-     * @var array
-     */
-    public $lookahead;
-
-    /**
-     * The last matched/seen token.
-     *
-     * @var array
-     */
-    public $token;
-
-    /**
-     * Sets the input data to be tokenized.
-     *
-     * The Lexer is immediately reset and the new input tokenized.
-     * Any unprocessed tokens from any previous input are lost.
-     *
-     * @param string $input The input to be tokenized.
-     *
-     * @return void
-     */
-    public function setInput($input)
-    {
-        $this->input  = $input;
-        $this->tokens = array();
-
-        $this->reset();
-        $this->scan($input);
-    }
-
-    /**
-     * Resets the lexer.
-     *
-     * @return void
-     */
-    public function reset()
-    {
-        $this->lookahead = null;
-        $this->token = null;
-        $this->peek = 0;
-        $this->position = 0;
-    }
-
-    /**
-     * Resets the peek pointer to 0.
-     *
-     * @return void
-     */
-    public function resetPeek()
-    {
-        $this->peek = 0;
-    }
-
-    /**
-     * Resets the lexer position on the input to the given position.
-     *
-     * @param integer $position Position to place the lexical scanner.
-     *
-     * @return void
-     */
-    public function resetPosition($position = 0)
-    {
-        $this->position = $position;
-    }
-
-    /**
-     * Retrieve the original lexer's input until a given position. 
-     *
-     * @param integer $position
-     *
-     * @return string
-     */
-    public function getInputUntilPosition($position)
-    {
-        return substr($this->input, 0, $position);
-    }
-
-    /**
-     * Checks whether a given token matches the current lookahead.
-     *
-     * @param integer|string $token
-     *
-     * @return boolean
-     */
-    public function isNextToken($token)
-    {
-        return null !== $this->lookahead && $this->lookahead['type'] === $token;
-    }
-
-    /**
-     * Checks whether any of the given tokens matches the current lookahead.
-     *
-     * @param array $tokens
-     *
-     * @return boolean
-     */
-    public function isNextTokenAny(array $tokens)
-    {
-        return null !== $this->lookahead && in_array($this->lookahead['type'], $tokens, true);
-    }
-
-    /**
-     * Moves to the next token in the input string.
-     *
-     * @return boolean
-     */
-    public function moveNext()
-    {
-        $this->peek = 0;
-        $this->token = $this->lookahead;
-        $this->lookahead = (isset($this->tokens[$this->position]))
-            ? $this->tokens[$this->position++] : null;
-
-        return $this->lookahead !== null;
-    }
-
-    /**
-     * Tells the lexer to skip input tokens until it sees a token with the given value.
-     *
-     * @param string $type The token type to skip until.
-     *
-     * @return void
-     */
-    public function skipUntil($type)
-    {
-        while ($this->lookahead !== null && $this->lookahead['type'] !== $type) {
-            $this->moveNext();
-        }
-    }
-
-    /**
-     * Checks if given value is identical to the given token.
-     *
-     * @param mixed   $value
-     * @param integer $token
-     *
-     * @return boolean
-     */
-    public function isA($value, $token)
-    {
-        return $this->getType($value) === $token;
-    }
-
-    /**
-     * Moves the lookahead token forward.
-     *
-     * @return array|null The next token or NULL if there are no more tokens ahead.
-     */
-    public function peek()
-    {
-        if (isset($this->tokens[$this->position + $this->peek])) {
-            return $this->tokens[$this->position + $this->peek++];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Peeks at the next token, returns it and immediately resets the peek.
-     *
-     * @return array|null The next token or NULL if there are no more tokens ahead.
-     */
-    public function glimpse()
-    {
-        $peek = $this->peek();
-        $this->peek = 0;
-        return $peek;
-    }
-
-    /**
-     * Scans the input string for tokens.
-     *
-     * @param string $input A query string.
-     *
-     * @return void
-     */
-    protected function scan($input)
-    {
-        static $regex;
-
-        if ( ! isset($regex)) {
-            $regex = sprintf(
-                '/(%s)|%s/%s',
-                implode(')|(', $this->getCatchablePatterns()),
-                implode('|', $this->getNonCatchablePatterns()),
-                $this->getModifiers()
-            );
-        }
-
-        $flags = PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE;
-        $matches = preg_split($regex, $input, -1, $flags);
-
-        if (false === $matches) {
-            // Work around https://bugs.php.net/78122
-            $matches = array(array($input, 0));
-        }
-
-        foreach ($matches as $match) {
-            // Must remain before 'value' assignment since it can change content
-            $type = $this->getType($match[0]);
-
-            $this->tokens[] = array(
-                'value' => $match[0],
-                'type'  => $type,
-                'position' => $match[1],
-            );
-        }
-    }
-
-    /**
-     * Gets the literal for a given token.
-     *
-     * @param integer $token
-     *
-     * @return string
-     */
-    public function getLiteral($token)
-    {
-        $className = get_class($this);
-        $reflClass = new \ReflectionClass($className);
-        $constants = $reflClass->getConstants();
-
-        foreach ($constants as $name => $value) {
-            if ($value === $token) {
-                return $className . '::' . $name;
-            }
-        }
-
-        return $token;
-    }
-
-    /**
-     * Regex modifiers
-     *
-     * @return string
-     */
-    protected function getModifiers()
-    {
-        return 'i';
-    }
-
-    /**
-     * Lexical catchable patterns.
-     *
-     * @return array
-     */
-    abstract protected function getCatchablePatterns();
-
-    /**
-     * Lexical non-catchable patterns.
-     *
-     * @return array
-     */
-    abstract protected function getNonCatchablePatterns();
-
-    /**
-     * Retrieve token type. Also processes the token value if necessary.
-     *
-     * @param string $value
-     *
-     * @return integer
-     */
-    abstract protected function getType(&$value);
+	/**
+	 * Lexer original input string.
+	 *
+	 * @var string
+	 */
+	private $input;
+
+	/**
+	 * Array of scanned tokens.
+	 *
+	 * Each token is an associative array containing three items:
+	 *  - 'value'    : the string value of the token in the input string
+	 *  - 'type'     : the type of the token (identifier, numeric, string, input
+	 *                 parameter, none)
+	 *  - 'position' : the position of the token in the input string
+	 *
+	 * @var array
+	 */
+	private $tokens = array();
+
+	/**
+	 * Current lexer position in input string.
+	 *
+	 * @var integer
+	 */
+	private $position = 0;
+
+	/**
+	 * Current peek of current lexer position.
+	 *
+	 * @var integer
+	 */
+	private $peek = 0;
+
+	/**
+	 * The next token in the input.
+	 *
+	 * @var array
+	 */
+	public $lookahead;
+
+	/**
+	 * The last matched/seen token.
+	 *
+	 * @var array
+	 */
+	public $token;
+
+	/**
+	 * Sets the input data to be tokenized.
+	 *
+	 * The Lexer is immediately reset and the new input tokenized.
+	 * Any unprocessed tokens from any previous input are lost.
+	 *
+	 * @param string $input The input to be tokenized.
+	 *
+	 * @return void
+	 */
+	public function setInput($input)
+	{
+		$this->input  = $input;
+		$this->tokens = array();
+
+		$this->reset();
+		$this->scan($input);
+	}
+
+	/**
+	 * Resets the lexer.
+	 *
+	 * @return void
+	 */
+	public function reset()
+	{
+		$this->lookahead = null;
+		$this->token = null;
+		$this->peek = 0;
+		$this->position = 0;
+	}
+
+	/**
+	 * Resets the peek pointer to 0.
+	 *
+	 * @return void
+	 */
+	public function resetPeek()
+	{
+		$this->peek = 0;
+	}
+
+	/**
+	 * Resets the lexer position on the input to the given position.
+	 *
+	 * @param integer $position Position to place the lexical scanner.
+	 *
+	 * @return void
+	 */
+	public function resetPosition($position = 0)
+	{
+		$this->position = $position;
+	}
+
+	/**
+	 * Retrieve the original lexer's input until a given position. 
+	 *
+	 * @param integer $position
+	 *
+	 * @return string
+	 */
+	public function getInputUntilPosition($position)
+	{
+		return substr($this->input, 0, $position);
+	}
+
+	/**
+	 * Checks whether a given token matches the current lookahead.
+	 *
+	 * @param integer|string $token
+	 *
+	 * @return boolean
+	 */
+	public function isNextToken($token)
+	{
+		return null !== $this->lookahead && $this->lookahead['type'] === $token;
+	}
+
+	/**
+	 * Checks whether any of the given tokens matches the current lookahead.
+	 *
+	 * @param array $tokens
+	 *
+	 * @return boolean
+	 */
+	public function isNextTokenAny(array $tokens)
+	{
+		return null !== $this->lookahead && in_array($this->lookahead['type'], $tokens, true);
+	}
+
+	/**
+	 * Moves to the next token in the input string.
+	 *
+	 * @return boolean
+	 */
+	public function moveNext()
+	{
+		$this->peek = 0;
+		$this->token = $this->lookahead;
+		$this->lookahead = (isset($this->tokens[$this->position]))
+			? $this->tokens[$this->position++] : null;
+
+		return $this->lookahead !== null;
+	}
+
+	/**
+	 * Tells the lexer to skip input tokens until it sees a token with the given value.
+	 *
+	 * @param string $type The token type to skip until.
+	 *
+	 * @return void
+	 */
+	public function skipUntil($type)
+	{
+		while ($this->lookahead !== null && $this->lookahead['type'] !== $type) {
+			$this->moveNext();
+		}
+	}
+
+	/**
+	 * Checks if given value is identical to the given token.
+	 *
+	 * @param mixed   $value
+	 * @param integer $token
+	 *
+	 * @return boolean
+	 */
+	public function isA($value, $token)
+	{
+		return $this->getType($value) === $token;
+	}
+
+	/**
+	 * Moves the lookahead token forward.
+	 *
+	 * @return array|null The next token or NULL if there are no more tokens ahead.
+	 */
+	public function peek()
+	{
+		if (isset($this->tokens[$this->position + $this->peek])) {
+			return $this->tokens[$this->position + $this->peek++];
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Peeks at the next token, returns it and immediately resets the peek.
+	 *
+	 * @return array|null The next token or NULL if there are no more tokens ahead.
+	 */
+	public function glimpse()
+	{
+		$peek = $this->peek();
+		$this->peek = 0;
+		return $peek;
+	}
+
+	/**
+	 * Scans the input string for tokens.
+	 *
+	 * @param string $input A query string.
+	 *
+	 * @return void
+	 */
+	protected function scan($input)
+	{
+		static $regex;
+
+		if ( ! isset($regex)) {
+			$regex = sprintf(
+				'/(%s)|%s/%s',
+				implode(')|(', $this->getCatchablePatterns()),
+				implode('|', $this->getNonCatchablePatterns()),
+				$this->getModifiers()
+			);
+		}
+
+		$flags = PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE;
+		$matches = preg_split($regex, $input, -1, $flags);
+
+		if (false === $matches) {
+			// Work around https://bugs.php.net/78122
+			$matches = array(array($input, 0));
+		}
+
+		foreach ($matches as $match) {
+			// Must remain before 'value' assignment since it can change content
+			$type = $this->getType($match[0]);
+
+			$this->tokens[] = array(
+				'value' => $match[0],
+				'type'  => $type,
+				'position' => $match[1],
+			);
+		}
+	}
+
+	/**
+	 * Gets the literal for a given token.
+	 *
+	 * @param integer $token
+	 *
+	 * @return string
+	 */
+	public function getLiteral($token)
+	{
+		$className = get_class($this);
+		$reflClass = new \ReflectionClass($className);
+		$constants = $reflClass->getConstants();
+
+		foreach ($constants as $name => $value) {
+			if ($value === $token) {
+				return $className . '::' . $name;
+			}
+		}
+
+		return $token;
+	}
+
+	/**
+	 * Regex modifiers
+	 *
+	 * @return string
+	 */
+	protected function getModifiers()
+	{
+		return 'i';
+	}
+
+	/**
+	 * Lexical catchable patterns.
+	 *
+	 * @return array
+	 */
+	abstract protected function getCatchablePatterns();
+
+	/**
+	 * Lexical non-catchable patterns.
+	 *
+	 * @return array
+	 */
+	abstract protected function getNonCatchablePatterns();
+
+	/**
+	 * Retrieve token type. Also processes the token value if necessary.
+	 *
+	 * @param string $value
+	 *
+	 * @return integer
+	 */
+	abstract protected function getType(&$value);
 }

Spacing +2 added lines, -2 removed lines

@@ -246,7 +246,7 @@ 
     {
         static $regex;
 
-        if ( ! isset($regex)) {
+        if (!isset($regex)) {
             $regex = sprintf(
                 '/(%s)|%s/%s',
                 implode(')|(', $this->getCatchablePatterns()),
@@ -290,7 +290,7 @@ 
 
         foreach ($constants as $name => $value) {
             if ($value === $token) {
-                return $className . '::' . $name;
+                return $className.'::'.$name;
             }
         }
 

htdocs/includes/sabre/psr/log/Psr/Log/LogLevel.php

Indentation +8 added lines, -8 removed lines

@@ -7,12 +7,12 @@
  */
 class LogLevel
 {
-    const EMERGENCY = 'emergency';
-    const ALERT     = 'alert';
-    const CRITICAL  = 'critical';
-    const ERROR     = 'error';
-    const WARNING   = 'warning';
-    const NOTICE    = 'notice';
-    const INFO      = 'info';
-    const DEBUG     = 'debug';
+	const EMERGENCY = 'emergency';
+	const ALERT     = 'alert';
+	const CRITICAL  = 'critical';
+	const ERROR     = 'error';
+	const WARNING   = 'warning';
+	const NOTICE    = 'notice';
+	const INFO      = 'info';
+	const DEBUG     = 'debug';
 }

htdocs/includes/sabre/psr/log/Psr/Log/LoggerAwareInterface.php

Indentation +8 added lines, -8 removed lines

@@ -7,12 +7,12 @@
  */
 interface LoggerAwareInterface
 {
-    /**
-     * Sets a logger instance on the object.
-     *
-     * @param LoggerInterface $logger
-     *
-     * @return void
-     */
-    public function setLogger(LoggerInterface $logger);
+	/**
+	 * Sets a logger instance on the object.
+	 *
+	 * @param LoggerInterface $logger
+	 *
+	 * @return void
+	 */
+	public function setLogger(LoggerInterface $logger);
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Plugin.php

Indentation +969 added lines, -969 removed lines

@@ -30,918 +30,918 @@ 
  */
 class Plugin extends DAV\ServerPlugin
 {
-    /**
-     * This is the official CalDAV namespace.
-     */
-    const NS_CALDAV = 'urn:ietf:params:xml:ns:caldav';
-
-    /**
-     * This is the namespace for the proprietary calendarserver extensions.
-     */
-    const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
-
-    /**
-     * The hardcoded root for calendar objects. It is unfortunate
-     * that we're stuck with it, but it will have to do for now.
-     */
-    const CALENDAR_ROOT = 'calendars';
-
-    /**
-     * Reference to server object.
-     *
-     * @var DAV\Server
-     */
-    protected $server;
-
-    /**
-     * The default PDO storage uses a MySQL MEDIUMBLOB for iCalendar data,
-     * which can hold up to 2^24 = 16777216 bytes. This is plenty. We're
-     * capping it to 10M here.
-     */
-    protected $maxResourceSize = 10000000;
-
-    /**
-     * Use this method to tell the server this plugin defines additional
-     * HTTP methods.
-     *
-     * This method is passed a uri. It should only return HTTP methods that are
-     * available for the specified uri.
-     *
-     * @param string $uri
-     *
-     * @return array
-     */
-    public function getHTTPMethods($uri)
-    {
-        // The MKCALENDAR is only available on unmapped uri's, whose
-        // parents extend IExtendedCollection
-        list($parent, $name) = Uri\split($uri);
-
-        if ('' === $uri) {
-            $parent = '';
-        }
-
-        $node = $this->server->tree->getNodeForPath($parent);
-
-        if ($node instanceof DAV\IExtendedCollection) {
-            try {
-                $node->getChild($name);
-            } catch (DAV\Exception\NotFound $e) {
-                return ['MKCALENDAR'];
-            }
-        }
-
-        return [];
-    }
-
-    /**
-     * Returns the path to a principal's calendar home.
-     *
-     * The return url must not end with a slash.
-     * This function should return null in case a principal did not have
-     * a calendar home.
-     *
-     * @param string $principalUrl
-     *
-     * @return string
-     */
-    public function getCalendarHomeForPrincipal($principalUrl)
-    {
-        // The default behavior for most sabre/dav servers is that there is a
-        // principals root node, which contains users directly under it.
-        //
-        // This function assumes that there are two components in a principal
-        // path. If there's more, we don't return a calendar home. This
-        // excludes things like the calendar-proxy-read principal (which it
-        // should).
-        $parts = explode('/', trim($principalUrl, '/'));
-        if (2 !== count($parts)) {
-            return;
-        }
-        if ('principals' !== $parts[0]) {
-            return;
-        }
-
-        return self::CALENDAR_ROOT.'/'.$parts[1];
-    }
-
-    /**
-     * Returns a list of features for the DAV: HTTP header.
-     *
-     * @return array
-     */
-    public function getFeatures()
-    {
-        return ['calendar-access', 'calendar-proxy'];
-    }
-
-    /**
-     * 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 'caldav';
-    }
-
-    /**
-     * 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);
-
-        $reports = [];
-        if ($node instanceof ICalendarObjectContainer || $node instanceof ICalendarObject) {
-            $reports[] = '{'.self::NS_CALDAV.'}calendar-multiget';
-            $reports[] = '{'.self::NS_CALDAV.'}calendar-query';
-        }
-        if ($node instanceof ICalendar) {
-            $reports[] = '{'.self::NS_CALDAV.'}free-busy-query';
-        }
-        // iCal has a bug where it assumes that sync support is enabled, only
-        // if we say we support it on the calendar-home, even though this is
-        // not actually the case.
-        if ($node instanceof CalendarHome && $this->server->getPlugin('sync')) {
-            $reports[] = '{DAV:}sync-collection';
-        }
-
-        return $reports;
-    }
-
-    /**
-     * Initializes the plugin.
-     */
-    public function initialize(DAV\Server $server)
-    {
-        $this->server = $server;
-
-        $server->on('method:MKCALENDAR', [$this, 'httpMkCalendar']);
-        $server->on('report', [$this, 'report']);
-        $server->on('propFind', [$this, 'propFind']);
-        $server->on('onHTMLActionsPanel', [$this, 'htmlActionsPanel']);
-        $server->on('beforeCreateFile', [$this, 'beforeCreateFile']);
-        $server->on('beforeWriteContent', [$this, 'beforeWriteContent']);
-        $server->on('afterMethod:GET', [$this, 'httpAfterGET']);
-        $server->on('getSupportedPrivilegeSet', [$this, 'getSupportedPrivilegeSet']);
-
-        $server->xml->namespaceMap[self::NS_CALDAV] = 'cal';
-        $server->xml->namespaceMap[self::NS_CALENDARSERVER] = 'cs';
-
-        $server->xml->elementMap['{'.self::NS_CALDAV.'}supported-calendar-component-set'] = 'Sabre\\CalDAV\\Xml\\Property\\SupportedCalendarComponentSet';
-        $server->xml->elementMap['{'.self::NS_CALDAV.'}calendar-query'] = 'Sabre\\CalDAV\\Xml\\Request\\CalendarQueryReport';
-        $server->xml->elementMap['{'.self::NS_CALDAV.'}calendar-multiget'] = 'Sabre\\CalDAV\\Xml\\Request\\CalendarMultiGetReport';
-        $server->xml->elementMap['{'.self::NS_CALDAV.'}free-busy-query'] = 'Sabre\\CalDAV\\Xml\\Request\\FreeBusyQueryReport';
-        $server->xml->elementMap['{'.self::NS_CALDAV.'}mkcalendar'] = 'Sabre\\CalDAV\\Xml\\Request\\MkCalendar';
-        $server->xml->elementMap['{'.self::NS_CALDAV.'}schedule-calendar-transp'] = 'Sabre\\CalDAV\\Xml\\Property\\ScheduleCalendarTransp';
-        $server->xml->elementMap['{'.self::NS_CALDAV.'}supported-calendar-component-set'] = 'Sabre\\CalDAV\\Xml\\Property\\SupportedCalendarComponentSet';
-
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\ICalendar'] = '{urn:ietf:params:xml:ns:caldav}calendar';
-
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Principal\\IProxyRead'] = '{http://calendarserver.org/ns/}calendar-proxy-read';
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Principal\\IProxyWrite'] = '{http://calendarserver.org/ns/}calendar-proxy-write';
-
-        array_push($server->protectedProperties,
-            '{'.self::NS_CALDAV.'}supported-calendar-component-set',
-            '{'.self::NS_CALDAV.'}supported-calendar-data',
-            '{'.self::NS_CALDAV.'}max-resource-size',
-            '{'.self::NS_CALDAV.'}min-date-time',
-            '{'.self::NS_CALDAV.'}max-date-time',
-            '{'.self::NS_CALDAV.'}max-instances',
-            '{'.self::NS_CALDAV.'}max-attendees-per-instance',
-            '{'.self::NS_CALDAV.'}calendar-home-set',
-            '{'.self::NS_CALDAV.'}supported-collation-set',
-            '{'.self::NS_CALDAV.'}calendar-data',
-
-            // CalendarServer extensions
-            '{'.self::NS_CALENDARSERVER.'}getctag',
-            '{'.self::NS_CALENDARSERVER.'}calendar-proxy-read-for',
-            '{'.self::NS_CALENDARSERVER.'}calendar-proxy-write-for'
-        );
-
-        if ($aclPlugin = $server->getPlugin('acl')) {
-            $aclPlugin->principalSearchPropertySet['{'.self::NS_CALDAV.'}calendar-user-address-set'] = 'Calendar address';
-        }
-    }
-
-    /**
-     * This functions handles REPORT requests specific to CalDAV.
-     *
-     * @param string $reportName
-     * @param mixed  $report
-     * @param mixed  $path
-     *
-     * @return bool|null
-     */
-    public function report($reportName, $report, $path)
-    {
-        switch ($reportName) {
-            case '{'.self::NS_CALDAV.'}calendar-multiget':
-                $this->server->transactionType = 'report-calendar-multiget';
-                $this->calendarMultiGetReport($report);
-
-                return false;
-            case '{'.self::NS_CALDAV.'}calendar-query':
-                $this->server->transactionType = 'report-calendar-query';
-                $this->calendarQueryReport($report);
-
-                return false;
-            case '{'.self::NS_CALDAV.'}free-busy-query':
-                $this->server->transactionType = 'report-free-busy-query';
-                $this->freeBusyQueryReport($report);
-
-                return false;
-        }
-    }
-
-    /**
-     * This function handles the MKCALENDAR HTTP method, which creates
-     * a new calendar.
-     *
-     * @return bool
-     */
-    public function httpMkCalendar(RequestInterface $request, ResponseInterface $response)
-    {
-        $body = $request->getBodyAsString();
-        $path = $request->getPath();
-
-        $properties = [];
-
-        if ($body) {
-            try {
-                $mkcalendar = $this->server->xml->expect(
-                    '{urn:ietf:params:xml:ns:caldav}mkcalendar',
-                    $body
-                );
-            } catch (\Sabre\Xml\ParseException $e) {
-                throw new BadRequest($e->getMessage(), 0, $e);
-            }
-            $properties = $mkcalendar->getProperties();
-        }
-
-        // iCal abuses MKCALENDAR since iCal 10.9.2 to create server-stored
-        // subscriptions. Before that it used MKCOL which was the correct way
-        // to do this.
-        //
-        // If the body had a {DAV:}resourcetype, it means we stumbled upon this
-        // request, and we simply use it instead of the pre-defined list.
-        if (isset($properties['{DAV:}resourcetype'])) {
-            $resourceType = $properties['{DAV:}resourcetype']->getValue();
-        } else {
-            $resourceType = ['{DAV:}collection', '{urn:ietf:params:xml:ns:caldav}calendar'];
-        }
-
-        $this->server->createCollection($path, new MkCol($resourceType, $properties));
-
-        $response->setStatus(201);
-        $response->setHeader('Content-Length', 0);
-
-        // This breaks the method chain.
-        return false;
-    }
-
-    /**
-     * PropFind.
-     *
-     * This method handler is invoked before any after properties for a
-     * resource are fetched. This allows us to add in any CalDAV specific
-     * properties.
-     */
-    public function propFind(DAV\PropFind $propFind, DAV\INode $node)
-    {
-        $ns = '{'.self::NS_CALDAV.'}';
-
-        if ($node instanceof ICalendarObjectContainer) {
-            $propFind->handle($ns.'max-resource-size', $this->maxResourceSize);
-            $propFind->handle($ns.'supported-calendar-data', function () {
-                return new Xml\Property\SupportedCalendarData();
-            });
-            $propFind->handle($ns.'supported-collation-set', function () {
-                return new Xml\Property\SupportedCollationSet();
-            });
-        }
-
-        if ($node instanceof DAVACL\IPrincipal) {
-            $principalUrl = $node->getPrincipalUrl();
-
-            $propFind->handle('{'.self::NS_CALDAV.'}calendar-home-set', function () use ($principalUrl) {
-                $calendarHomePath = $this->getCalendarHomeForPrincipal($principalUrl);
-                if (is_null($calendarHomePath)) {
-                    return null;
-                }
-
-                return new LocalHref($calendarHomePath.'/');
-            });
-            // The calendar-user-address-set property is basically mapped to
-            // the {DAV:}alternate-URI-set property.
-            $propFind->handle('{'.self::NS_CALDAV.'}calendar-user-address-set', function () use ($node) {
-                $addresses = $node->getAlternateUriSet();
-                $addresses[] = $this->server->getBaseUri().$node->getPrincipalUrl().'/';
-
-                return new LocalHref($addresses);
-            });
-            // For some reason somebody thought it was a good idea to add
-            // another one of these properties. We're supporting it too.
-            $propFind->handle('{'.self::NS_CALENDARSERVER.'}email-address-set', function () use ($node) {
-                $addresses = $node->getAlternateUriSet();
-                $emails = [];
-                foreach ($addresses as $address) {
-                    if ('mailto:' === substr($address, 0, 7)) {
-                        $emails[] = substr($address, 7);
-                    }
-                }
-
-                return new Xml\Property\EmailAddressSet($emails);
-            });
-
-            // These two properties are shortcuts for ical to easily find
-            // other principals this principal has access to.
-            $propRead = '{'.self::NS_CALENDARSERVER.'}calendar-proxy-read-for';
-            $propWrite = '{'.self::NS_CALENDARSERVER.'}calendar-proxy-write-for';
-
-            if (404 === $propFind->getStatus($propRead) || 404 === $propFind->getStatus($propWrite)) {
-                $aclPlugin = $this->server->getPlugin('acl');
-                $membership = $aclPlugin->getPrincipalMembership($propFind->getPath());
-                $readList = [];
-                $writeList = [];
-
-                foreach ($membership as $group) {
-                    $groupNode = $this->server->tree->getNodeForPath($group);
-
-                    $listItem = Uri\split($group)[0].'/';
-
-                    // If the node is either ap proxy-read or proxy-write
-                    // group, we grab the parent principal and add it to the
-                    // list.
-                    if ($groupNode instanceof Principal\IProxyRead) {
-                        $readList[] = $listItem;
-                    }
-                    if ($groupNode instanceof Principal\IProxyWrite) {
-                        $writeList[] = $listItem;
-                    }
-                }
-
-                $propFind->set($propRead, new LocalHref($readList));
-                $propFind->set($propWrite, new LocalHref($writeList));
-            }
-        } // instanceof IPrincipal
-
-        if ($node instanceof ICalendarObject) {
-            // The calendar-data property is not supposed to be a 'real'
-            // property, but in large chunks of the spec it does act as such.
-            // Therefore we simply expose it as a property.
-            $propFind->handle('{'.self::NS_CALDAV.'}calendar-data', function () use ($node) {
-                $val = $node->get();
-                if (is_resource($val)) {
-                    $val = stream_get_contents($val);
-                }
-
-                // Taking out \r to not screw up the xml output
-                return str_replace("\r", '', $val);
-            });
-        }
-    }
-
-    /**
-     * This function handles the calendar-multiget REPORT.
-     *
-     * This report is used by the client to fetch the content of a series
-     * of urls. Effectively avoiding a lot of redundant requests.
-     *
-     * @param CalendarMultiGetReport $report
-     */
-    public function calendarMultiGetReport($report)
-    {
-        $needsJson = 'application/calendar+json' === $report->contentType;
-
-        $timeZones = [];
-        $propertyList = [];
-
-        $paths = array_map(
-            [$this->server, 'calculateUri'],
-            $report->hrefs
-        );
-
-        foreach ($this->server->getPropertiesForMultiplePaths($paths, $report->properties) as $uri => $objProps) {
-            if (($needsJson || $report->expand) && isset($objProps[200]['{'.self::NS_CALDAV.'}calendar-data'])) {
-                $vObject = VObject\Reader::read($objProps[200]['{'.self::NS_CALDAV.'}calendar-data']);
-
-                if ($report->expand) {
-                    // We're expanding, and for that we need to figure out the
-                    // calendar's timezone.
-                    list($calendarPath) = Uri\split($uri);
-                    if (!isset($timeZones[$calendarPath])) {
-                        // Checking the calendar-timezone property.
-                        $tzProp = '{'.self::NS_CALDAV.'}calendar-timezone';
-                        $tzResult = $this->server->getProperties($calendarPath, [$tzProp]);
-                        if (isset($tzResult[$tzProp])) {
-                            // This property contains a VCALENDAR with a single
-                            // VTIMEZONE.
-                            $vtimezoneObj = VObject\Reader::read($tzResult[$tzProp]);
-                            $timeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
-                        } else {
-                            // Defaulting to UTC.
-                            $timeZone = new DateTimeZone('UTC');
-                        }
-                        $timeZones[$calendarPath] = $timeZone;
-                    }
-
-                    $vObject = $vObject->expand($report->expand['start'], $report->expand['end'], $timeZones[$calendarPath]);
-                }
-                if ($needsJson) {
-                    $objProps[200]['{'.self::NS_CALDAV.'}calendar-data'] = json_encode($vObject->jsonSerialize());
-                } else {
-                    $objProps[200]['{'.self::NS_CALDAV.'}calendar-data'] = $vObject->serialize();
-                }
-                // Destroy circular references so PHP will garbage collect the
-                // object.
-                $vObject->destroy();
-            }
-
-            $propertyList[] = $objProps;
-        }
-
-        $prefer = $this->server->getHTTPPrefer();
-
-        $this->server->httpResponse->setStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-        $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
-        $this->server->httpResponse->setBody($this->server->generateMultiStatus($propertyList, 'minimal' === $prefer['return']));
-    }
-
-    /**
-     * This function handles the calendar-query REPORT.
-     *
-     * This report is used by clients to request calendar objects based on
-     * complex conditions.
-     *
-     * @param Xml\Request\CalendarQueryReport $report
-     */
-    public function calendarQueryReport($report)
-    {
-        $path = $this->server->getRequestUri();
-
-        $needsJson = 'application/calendar+json' === $report->contentType;
-
-        $node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
-        $depth = $this->server->getHTTPDepth(0);
-
-        // The default result is an empty array
-        $result = [];
-
-        $calendarTimeZone = null;
-        if ($report->expand) {
-            // We're expanding, and for that we need to figure out the
-            // calendar's timezone.
-            $tzProp = '{'.self::NS_CALDAV.'}calendar-timezone';
-            $tzResult = $this->server->getProperties($path, [$tzProp]);
-            if (isset($tzResult[$tzProp])) {
-                // This property contains a VCALENDAR with a single
-                // VTIMEZONE.
-                $vtimezoneObj = VObject\Reader::read($tzResult[$tzProp]);
-                $calendarTimeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
-
-                // Destroy circular references so PHP will garbage collect the
-                // object.
-                $vtimezoneObj->destroy();
-            } else {
-                // Defaulting to UTC.
-                $calendarTimeZone = new DateTimeZone('UTC');
-            }
-        }
-
-        // The calendarobject was requested directly. In this case we handle
-        // this locally.
-        if (0 == $depth && $node instanceof ICalendarObject) {
-            $requestedCalendarData = true;
-            $requestedProperties = $report->properties;
-
-            if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar-data', $requestedProperties)) {
-                // We always retrieve calendar-data, as we need it for filtering.
-                $requestedProperties[] = '{urn:ietf:params:xml:ns:caldav}calendar-data';
-
-                // If calendar-data wasn't explicitly requested, we need to remove
-                // it after processing.
-                $requestedCalendarData = false;
-            }
-
-            $properties = $this->server->getPropertiesForPath(
-                $path,
-                $requestedProperties,
-                0
-            );
-
-            // This array should have only 1 element, the first calendar
-            // object.
-            $properties = current($properties);
-
-            // If there wasn't any calendar-data returned somehow, we ignore
-            // this.
-            if (isset($properties[200]['{urn:ietf:params:xml:ns:caldav}calendar-data'])) {
-                $validator = new CalendarQueryValidator();
-
-                $vObject = VObject\Reader::read($properties[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
-                if ($validator->validate($vObject, $report->filters)) {
-                    // If the client didn't require the calendar-data property,
-                    // we won't give it back.
-                    if (!$requestedCalendarData) {
-                        unset($properties[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
-                    } else {
-                        if ($report->expand) {
-                            $vObject = $vObject->expand($report->expand['start'], $report->expand['end'], $calendarTimeZone);
-                        }
-                        if ($needsJson) {
-                            $properties[200]['{'.self::NS_CALDAV.'}calendar-data'] = json_encode($vObject->jsonSerialize());
-                        } elseif ($report->expand) {
-                            $properties[200]['{'.self::NS_CALDAV.'}calendar-data'] = $vObject->serialize();
-                        }
-                    }
-
-                    $result = [$properties];
-                }
-                // Destroy circular references so PHP will garbage collect the
-                // object.
-                $vObject->destroy();
-            }
-        }
-
-        if ($node instanceof ICalendarObjectContainer && 0 === $depth) {
-            if (0 === strpos((string) $this->server->httpRequest->getHeader('User-Agent'), 'MSFT-')) {
-                // Microsoft clients incorrectly supplied depth as 0, when it actually
-                // should have set depth to 1. We're implementing a workaround here
-                // to deal with this.
-                //
-                // This targets at least the following clients:
-                //   Windows 10
-                //   Windows Phone 8, 10
-                $depth = 1;
-            } else {
-                throw new BadRequest('A calendar-query REPORT on a calendar with a Depth: 0 is undefined. Set Depth to 1');
-            }
-        }
-
-        // If we're dealing with a calendar, the calendar itself is responsible
-        // for the calendar-query.
-        if ($node instanceof ICalendarObjectContainer && 1 == $depth) {
-            $nodePaths = $node->calendarQuery($report->filters);
-
-            foreach ($nodePaths as $path) {
-                list($properties) =
-                    $this->server->getPropertiesForPath($this->server->getRequestUri().'/'.$path, $report->properties);
-
-                if (($needsJson || $report->expand)) {
-                    $vObject = VObject\Reader::read($properties[200]['{'.self::NS_CALDAV.'}calendar-data']);
-
-                    if ($report->expand) {
-                        $vObject = $vObject->expand($report->expand['start'], $report->expand['end'], $calendarTimeZone);
-                    }
-
-                    if ($needsJson) {
-                        $properties[200]['{'.self::NS_CALDAV.'}calendar-data'] = json_encode($vObject->jsonSerialize());
-                    } else {
-                        $properties[200]['{'.self::NS_CALDAV.'}calendar-data'] = $vObject->serialize();
-                    }
-
-                    // Destroy circular references so PHP will garbage collect the
-                    // object.
-                    $vObject->destroy();
-                }
-                $result[] = $properties;
-            }
-        }
-
-        $prefer = $this->server->getHTTPPrefer();
-
-        $this->server->httpResponse->setStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-        $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
-        $this->server->httpResponse->setBody($this->server->generateMultiStatus($result, 'minimal' === $prefer['return']));
-    }
-
-    /**
-     * This method is responsible for parsing the request and generating the
-     * response for the CALDAV:free-busy-query REPORT.
-     */
-    protected function freeBusyQueryReport(Xml\Request\FreeBusyQueryReport $report)
-    {
-        $uri = $this->server->getRequestUri();
-
-        $acl = $this->server->getPlugin('acl');
-        if ($acl) {
-            $acl->checkPrivileges($uri, '{'.self::NS_CALDAV.'}read-free-busy');
-        }
-
-        $calendar = $this->server->tree->getNodeForPath($uri);
-        if (!$calendar instanceof ICalendar) {
-            throw new DAV\Exception\NotImplemented('The free-busy-query REPORT is only implemented on calendars');
-        }
-
-        $tzProp = '{'.self::NS_CALDAV.'}calendar-timezone';
-
-        // Figuring out the default timezone for the calendar, for floating
-        // times.
-        $calendarProps = $this->server->getProperties($uri, [$tzProp]);
-
-        if (isset($calendarProps[$tzProp])) {
-            $vtimezoneObj = VObject\Reader::read($calendarProps[$tzProp]);
-            $calendarTimeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
-            // Destroy circular references so PHP will garbage collect the object.
-            $vtimezoneObj->destroy();
-        } else {
-            $calendarTimeZone = new DateTimeZone('UTC');
-        }
-
-        // Doing a calendar-query first, to make sure we get the most
-        // performance.
-        $urls = $calendar->calendarQuery([
-            'name' => 'VCALENDAR',
-            'comp-filters' => [
-                [
-                    'name' => 'VEVENT',
-                    'comp-filters' => [],
-                    'prop-filters' => [],
-                    'is-not-defined' => false,
-                    'time-range' => [
-                        'start' => $report->start,
-                        'end' => $report->end,
-                    ],
-                ],
-            ],
-            'prop-filters' => [],
-            'is-not-defined' => false,
-            'time-range' => null,
-        ]);
-
-        $objects = array_map(function ($url) use ($calendar) {
-            $obj = $calendar->getChild($url)->get();
-
-            return $obj;
-        }, $urls);
-
-        $generator = new VObject\FreeBusyGenerator();
-        $generator->setObjects($objects);
-        $generator->setTimeRange($report->start, $report->end);
-        $generator->setTimeZone($calendarTimeZone);
-        $result = $generator->getResult();
-        $result = $result->serialize();
-
-        $this->server->httpResponse->setStatus(200);
-        $this->server->httpResponse->setHeader('Content-Type', 'text/calendar');
-        $this->server->httpResponse->setHeader('Content-Length', strlen($result));
-        $this->server->httpResponse->setBody($result);
-    }
-
-    /**
-     * This method is triggered before a file gets updated with new content.
-     *
-     * This plugin uses this method to ensure that CalDAV objects receive
-     * valid calendar data.
-     *
-     * @param string   $path
-     * @param resource $data
-     * @param bool     $modified should be set to true, if this event handler
-     *                           changed &$data
-     */
-    public function beforeWriteContent($path, DAV\IFile $node, &$data, &$modified)
-    {
-        if (!$node instanceof ICalendarObject) {
-            return;
-        }
-
-        // We're onyl interested in ICalendarObject nodes that are inside of a
-        // real calendar. This is to avoid triggering validation and scheduling
-        // for non-calendars (such as an inbox).
-        list($parent) = Uri\split($path);
-        $parentNode = $this->server->tree->getNodeForPath($parent);
-
-        if (!$parentNode instanceof ICalendar) {
-            return;
-        }
-
-        $this->validateICalendar(
-            $data,
-            $path,
-            $modified,
-            $this->server->httpRequest,
-            $this->server->httpResponse,
-            false
-        );
-    }
-
-    /**
-     * This method is triggered before a new file is created.
-     *
-     * This plugin uses this method to ensure that newly created calendar
-     * objects contain valid calendar data.
-     *
-     * @param string   $path
-     * @param resource $data
-     * @param bool     $modified should be set to true, if this event handler
-     *                           changed &$data
-     */
-    public function beforeCreateFile($path, &$data, DAV\ICollection $parentNode, &$modified)
-    {
-        if (!$parentNode instanceof ICalendar) {
-            return;
-        }
-
-        $this->validateICalendar(
-            $data,
-            $path,
-            $modified,
-            $this->server->httpRequest,
-            $this->server->httpResponse,
-            true
-        );
-    }
-
-    /**
-     * Checks if the submitted iCalendar data is in fact, valid.
-     *
-     * An exception is thrown if it's not.
-     *
-     * @param resource|string   $data
-     * @param string            $path
-     * @param bool              $modified should be set to true, if this event handler
-     *                                    changed &$data
-     * @param RequestInterface  $request  the http request
-     * @param ResponseInterface $response the http response
-     * @param bool              $isNew    is the item a new one, or an update
-     */
-    protected function validateICalendar(&$data, $path, &$modified, RequestInterface $request, ResponseInterface $response, $isNew)
-    {
-        // If it's a stream, we convert it to a string first.
-        if (is_resource($data)) {
-            $data = stream_get_contents($data);
-        }
-
-        $before = $data;
-
-        try {
-            // If the data starts with a [, we can reasonably assume we're dealing
-            // with a jCal object.
-            if ('[' === substr($data, 0, 1)) {
-                $vobj = VObject\Reader::readJson($data);
-
-                // Converting $data back to iCalendar, as that's what we
-                // technically support everywhere.
-                $data = $vobj->serialize();
-                $modified = true;
-            } else {
-                $vobj = VObject\Reader::read($data);
-            }
-        } catch (VObject\ParseException $e) {
-            throw new DAV\Exception\UnsupportedMediaType('This resource only supports valid iCalendar 2.0 data. Parse error: '.$e->getMessage());
-        }
-
-        if ('VCALENDAR' !== $vobj->name) {
-            throw new DAV\Exception\UnsupportedMediaType('This collection can only support iCalendar objects.');
-        }
-
-        $sCCS = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
-
-        // Get the Supported Components for the target calendar
-        list($parentPath) = Uri\split($path);
-        $calendarProperties = $this->server->getProperties($parentPath, [$sCCS]);
-
-        if (isset($calendarProperties[$sCCS])) {
-            $supportedComponents = $calendarProperties[$sCCS]->getValue();
-        } else {
-            $supportedComponents = ['VJOURNAL', 'VTODO', 'VEVENT'];
-        }
-
-        $foundType = null;
-
-        foreach ($vobj->getComponents() as $component) {
-            switch ($component->name) {
-                case 'VTIMEZONE':
-                    continue 2;
-                case 'VEVENT':
-                case 'VTODO':
-                case 'VJOURNAL':
-                    $foundType = $component->name;
-                    break;
-            }
-        }
-
-        if (!$foundType || !in_array($foundType, $supportedComponents)) {
-            throw new Exception\InvalidComponentType('iCalendar objects must at least have a component of type '.implode(', ', $supportedComponents));
-        }
-
-        $options = VObject\Node::PROFILE_CALDAV;
-        $prefer = $this->server->getHTTPPrefer();
-
-        if ('strict' !== $prefer['handling']) {
-            $options |= VObject\Node::REPAIR;
-        }
-
-        $messages = $vobj->validate($options);
-
-        $highestLevel = 0;
-        $warningMessage = null;
-
-        // $messages contains a list of problems with the vcard, along with
-        // their severity.
-        foreach ($messages as $message) {
-            if ($message['level'] > $highestLevel) {
-                // Recording the highest reported error level.
-                $highestLevel = $message['level'];
-                $warningMessage = $message['message'];
-            }
-            switch ($message['level']) {
-                case 1:
-                    // Level 1 means that there was a problem, but it was repaired.
-                    $modified = true;
-                    break;
-                case 2:
-                    // Level 2 means a warning, but not critical
-                    break;
-                case 3:
-                    // Level 3 means a critical error
-                    throw new DAV\Exception\UnsupportedMediaType('Validation error in iCalendar: '.$message['message']);
-            }
-        }
-        if ($warningMessage) {
-            $response->setHeader(
-                'X-Sabre-Ew-Gross',
-                'iCalendar validation warning: '.$warningMessage
-            );
-        }
-
-        // We use an extra variable to allow event handles to tell us whether
-        // the object was modified or not.
-        //
-        // This helps us determine if we need to re-serialize the object.
-        $subModified = false;
-
-        $this->server->emit(
-            'calendarObjectChange',
-            [
-                $request,
-                $response,
-                $vobj,
-                $parentPath,
-                &$subModified,
-                $isNew,
-            ]
-        );
-
-        if ($modified || $subModified) {
-            // An event handler told us that it modified the object.
-            $data = $vobj->serialize();
-
-            // Using md5 to figure out if there was an *actual* change.
-            if (!$modified && 0 !== strcmp($data, $before)) {
-                $modified = true;
-            }
-        }
-
-        // Destroy circular references so PHP will garbage collect the object.
-        $vobj->destroy();
-    }
-
-    /**
-     * This method is triggered whenever a subsystem reqeuests the privileges
-     * that are supported on a particular node.
-     */
-    public function getSupportedPrivilegeSet(INode $node, array &$supportedPrivilegeSet)
-    {
-        if ($node instanceof ICalendar) {
-            $supportedPrivilegeSet['{DAV:}read']['aggregates']['{'.self::NS_CALDAV.'}read-free-busy'] = [
-                'abstract' => false,
-                'aggregates' => [],
-            ];
-        }
-    }
-
-    /**
-     * This method is used to generate HTML output for the
-     * DAV\Browser\Plugin. This allows us to generate an interface users
-     * can use to create new calendars.
-     *
-     * @param string $output
-     *
-     * @return bool
-     */
-    public function htmlActionsPanel(DAV\INode $node, &$output)
-    {
-        if (!$node instanceof CalendarHome) {
-            return;
-        }
-
-        $output .= '<tr><td colspan="2"><form method="post" action="">
+	/**
+	 * This is the official CalDAV namespace.
+	 */
+	const NS_CALDAV = 'urn:ietf:params:xml:ns:caldav';
+
+	/**
+	 * This is the namespace for the proprietary calendarserver extensions.
+	 */
+	const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
+
+	/**
+	 * The hardcoded root for calendar objects. It is unfortunate
+	 * that we're stuck with it, but it will have to do for now.
+	 */
+	const CALENDAR_ROOT = 'calendars';
+
+	/**
+	 * Reference to server object.
+	 *
+	 * @var DAV\Server
+	 */
+	protected $server;
+
+	/**
+	 * The default PDO storage uses a MySQL MEDIUMBLOB for iCalendar data,
+	 * which can hold up to 2^24 = 16777216 bytes. This is plenty. We're
+	 * capping it to 10M here.
+	 */
+	protected $maxResourceSize = 10000000;
+
+	/**
+	 * Use this method to tell the server this plugin defines additional
+	 * HTTP methods.
+	 *
+	 * This method is passed a uri. It should only return HTTP methods that are
+	 * available for the specified uri.
+	 *
+	 * @param string $uri
+	 *
+	 * @return array
+	 */
+	public function getHTTPMethods($uri)
+	{
+		// The MKCALENDAR is only available on unmapped uri's, whose
+		// parents extend IExtendedCollection
+		list($parent, $name) = Uri\split($uri);
+
+		if ('' === $uri) {
+			$parent = '';
+		}
+
+		$node = $this->server->tree->getNodeForPath($parent);
+
+		if ($node instanceof DAV\IExtendedCollection) {
+			try {
+				$node->getChild($name);
+			} catch (DAV\Exception\NotFound $e) {
+				return ['MKCALENDAR'];
+			}
+		}
+
+		return [];
+	}
+
+	/**
+	 * Returns the path to a principal's calendar home.
+	 *
+	 * The return url must not end with a slash.
+	 * This function should return null in case a principal did not have
+	 * a calendar home.
+	 *
+	 * @param string $principalUrl
+	 *
+	 * @return string
+	 */
+	public function getCalendarHomeForPrincipal($principalUrl)
+	{
+		// The default behavior for most sabre/dav servers is that there is a
+		// principals root node, which contains users directly under it.
+		//
+		// This function assumes that there are two components in a principal
+		// path. If there's more, we don't return a calendar home. This
+		// excludes things like the calendar-proxy-read principal (which it
+		// should).
+		$parts = explode('/', trim($principalUrl, '/'));
+		if (2 !== count($parts)) {
+			return;
+		}
+		if ('principals' !== $parts[0]) {
+			return;
+		}
+
+		return self::CALENDAR_ROOT.'/'.$parts[1];
+	}
+
+	/**
+	 * Returns a list of features for the DAV: HTTP header.
+	 *
+	 * @return array
+	 */
+	public function getFeatures()
+	{
+		return ['calendar-access', 'calendar-proxy'];
+	}
+
+	/**
+	 * 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 'caldav';
+	}
+
+	/**
+	 * 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);
+
+		$reports = [];
+		if ($node instanceof ICalendarObjectContainer || $node instanceof ICalendarObject) {
+			$reports[] = '{'.self::NS_CALDAV.'}calendar-multiget';
+			$reports[] = '{'.self::NS_CALDAV.'}calendar-query';
+		}
+		if ($node instanceof ICalendar) {
+			$reports[] = '{'.self::NS_CALDAV.'}free-busy-query';
+		}
+		// iCal has a bug where it assumes that sync support is enabled, only
+		// if we say we support it on the calendar-home, even though this is
+		// not actually the case.
+		if ($node instanceof CalendarHome && $this->server->getPlugin('sync')) {
+			$reports[] = '{DAV:}sync-collection';
+		}
+
+		return $reports;
+	}
+
+	/**
+	 * Initializes the plugin.
+	 */
+	public function initialize(DAV\Server $server)
+	{
+		$this->server = $server;
+
+		$server->on('method:MKCALENDAR', [$this, 'httpMkCalendar']);
+		$server->on('report', [$this, 'report']);
+		$server->on('propFind', [$this, 'propFind']);
+		$server->on('onHTMLActionsPanel', [$this, 'htmlActionsPanel']);
+		$server->on('beforeCreateFile', [$this, 'beforeCreateFile']);
+		$server->on('beforeWriteContent', [$this, 'beforeWriteContent']);
+		$server->on('afterMethod:GET', [$this, 'httpAfterGET']);
+		$server->on('getSupportedPrivilegeSet', [$this, 'getSupportedPrivilegeSet']);
+
+		$server->xml->namespaceMap[self::NS_CALDAV] = 'cal';
+		$server->xml->namespaceMap[self::NS_CALENDARSERVER] = 'cs';
+
+		$server->xml->elementMap['{'.self::NS_CALDAV.'}supported-calendar-component-set'] = 'Sabre\\CalDAV\\Xml\\Property\\SupportedCalendarComponentSet';
+		$server->xml->elementMap['{'.self::NS_CALDAV.'}calendar-query'] = 'Sabre\\CalDAV\\Xml\\Request\\CalendarQueryReport';
+		$server->xml->elementMap['{'.self::NS_CALDAV.'}calendar-multiget'] = 'Sabre\\CalDAV\\Xml\\Request\\CalendarMultiGetReport';
+		$server->xml->elementMap['{'.self::NS_CALDAV.'}free-busy-query'] = 'Sabre\\CalDAV\\Xml\\Request\\FreeBusyQueryReport';
+		$server->xml->elementMap['{'.self::NS_CALDAV.'}mkcalendar'] = 'Sabre\\CalDAV\\Xml\\Request\\MkCalendar';
+		$server->xml->elementMap['{'.self::NS_CALDAV.'}schedule-calendar-transp'] = 'Sabre\\CalDAV\\Xml\\Property\\ScheduleCalendarTransp';
+		$server->xml->elementMap['{'.self::NS_CALDAV.'}supported-calendar-component-set'] = 'Sabre\\CalDAV\\Xml\\Property\\SupportedCalendarComponentSet';
+
+		$server->resourceTypeMapping['\\Sabre\\CalDAV\\ICalendar'] = '{urn:ietf:params:xml:ns:caldav}calendar';
+
+		$server->resourceTypeMapping['\\Sabre\\CalDAV\\Principal\\IProxyRead'] = '{http://calendarserver.org/ns/}calendar-proxy-read';
+		$server->resourceTypeMapping['\\Sabre\\CalDAV\\Principal\\IProxyWrite'] = '{http://calendarserver.org/ns/}calendar-proxy-write';
+
+		array_push($server->protectedProperties,
+			'{'.self::NS_CALDAV.'}supported-calendar-component-set',
+			'{'.self::NS_CALDAV.'}supported-calendar-data',
+			'{'.self::NS_CALDAV.'}max-resource-size',
+			'{'.self::NS_CALDAV.'}min-date-time',
+			'{'.self::NS_CALDAV.'}max-date-time',
+			'{'.self::NS_CALDAV.'}max-instances',
+			'{'.self::NS_CALDAV.'}max-attendees-per-instance',
+			'{'.self::NS_CALDAV.'}calendar-home-set',
+			'{'.self::NS_CALDAV.'}supported-collation-set',
+			'{'.self::NS_CALDAV.'}calendar-data',
+
+			// CalendarServer extensions
+			'{'.self::NS_CALENDARSERVER.'}getctag',
+			'{'.self::NS_CALENDARSERVER.'}calendar-proxy-read-for',
+			'{'.self::NS_CALENDARSERVER.'}calendar-proxy-write-for'
+		);
+
+		if ($aclPlugin = $server->getPlugin('acl')) {
+			$aclPlugin->principalSearchPropertySet['{'.self::NS_CALDAV.'}calendar-user-address-set'] = 'Calendar address';
+		}
+	}
+
+	/**
+	 * This functions handles REPORT requests specific to CalDAV.
+	 *
+	 * @param string $reportName
+	 * @param mixed  $report
+	 * @param mixed  $path
+	 *
+	 * @return bool|null
+	 */
+	public function report($reportName, $report, $path)
+	{
+		switch ($reportName) {
+			case '{'.self::NS_CALDAV.'}calendar-multiget':
+				$this->server->transactionType = 'report-calendar-multiget';
+				$this->calendarMultiGetReport($report);
+
+				return false;
+			case '{'.self::NS_CALDAV.'}calendar-query':
+				$this->server->transactionType = 'report-calendar-query';
+				$this->calendarQueryReport($report);
+
+				return false;
+			case '{'.self::NS_CALDAV.'}free-busy-query':
+				$this->server->transactionType = 'report-free-busy-query';
+				$this->freeBusyQueryReport($report);
+
+				return false;
+		}
+	}
+
+	/**
+	 * This function handles the MKCALENDAR HTTP method, which creates
+	 * a new calendar.
+	 *
+	 * @return bool
+	 */
+	public function httpMkCalendar(RequestInterface $request, ResponseInterface $response)
+	{
+		$body = $request->getBodyAsString();
+		$path = $request->getPath();
+
+		$properties = [];
+
+		if ($body) {
+			try {
+				$mkcalendar = $this->server->xml->expect(
+					'{urn:ietf:params:xml:ns:caldav}mkcalendar',
+					$body
+				);
+			} catch (\Sabre\Xml\ParseException $e) {
+				throw new BadRequest($e->getMessage(), 0, $e);
+			}
+			$properties = $mkcalendar->getProperties();
+		}
+
+		// iCal abuses MKCALENDAR since iCal 10.9.2 to create server-stored
+		// subscriptions. Before that it used MKCOL which was the correct way
+		// to do this.
+		//
+		// If the body had a {DAV:}resourcetype, it means we stumbled upon this
+		// request, and we simply use it instead of the pre-defined list.
+		if (isset($properties['{DAV:}resourcetype'])) {
+			$resourceType = $properties['{DAV:}resourcetype']->getValue();
+		} else {
+			$resourceType = ['{DAV:}collection', '{urn:ietf:params:xml:ns:caldav}calendar'];
+		}
+
+		$this->server->createCollection($path, new MkCol($resourceType, $properties));
+
+		$response->setStatus(201);
+		$response->setHeader('Content-Length', 0);
+
+		// This breaks the method chain.
+		return false;
+	}
+
+	/**
+	 * PropFind.
+	 *
+	 * This method handler is invoked before any after properties for a
+	 * resource are fetched. This allows us to add in any CalDAV specific
+	 * properties.
+	 */
+	public function propFind(DAV\PropFind $propFind, DAV\INode $node)
+	{
+		$ns = '{'.self::NS_CALDAV.'}';
+
+		if ($node instanceof ICalendarObjectContainer) {
+			$propFind->handle($ns.'max-resource-size', $this->maxResourceSize);
+			$propFind->handle($ns.'supported-calendar-data', function () {
+				return new Xml\Property\SupportedCalendarData();
+			});
+			$propFind->handle($ns.'supported-collation-set', function () {
+				return new Xml\Property\SupportedCollationSet();
+			});
+		}
+
+		if ($node instanceof DAVACL\IPrincipal) {
+			$principalUrl = $node->getPrincipalUrl();
+
+			$propFind->handle('{'.self::NS_CALDAV.'}calendar-home-set', function () use ($principalUrl) {
+				$calendarHomePath = $this->getCalendarHomeForPrincipal($principalUrl);
+				if (is_null($calendarHomePath)) {
+					return null;
+				}
+
+				return new LocalHref($calendarHomePath.'/');
+			});
+			// The calendar-user-address-set property is basically mapped to
+			// the {DAV:}alternate-URI-set property.
+			$propFind->handle('{'.self::NS_CALDAV.'}calendar-user-address-set', function () use ($node) {
+				$addresses = $node->getAlternateUriSet();
+				$addresses[] = $this->server->getBaseUri().$node->getPrincipalUrl().'/';
+
+				return new LocalHref($addresses);
+			});
+			// For some reason somebody thought it was a good idea to add
+			// another one of these properties. We're supporting it too.
+			$propFind->handle('{'.self::NS_CALENDARSERVER.'}email-address-set', function () use ($node) {
+				$addresses = $node->getAlternateUriSet();
+				$emails = [];
+				foreach ($addresses as $address) {
+					if ('mailto:' === substr($address, 0, 7)) {
+						$emails[] = substr($address, 7);
+					}
+				}
+
+				return new Xml\Property\EmailAddressSet($emails);
+			});
+
+			// These two properties are shortcuts for ical to easily find
+			// other principals this principal has access to.
+			$propRead = '{'.self::NS_CALENDARSERVER.'}calendar-proxy-read-for';
+			$propWrite = '{'.self::NS_CALENDARSERVER.'}calendar-proxy-write-for';
+
+			if (404 === $propFind->getStatus($propRead) || 404 === $propFind->getStatus($propWrite)) {
+				$aclPlugin = $this->server->getPlugin('acl');
+				$membership = $aclPlugin->getPrincipalMembership($propFind->getPath());
+				$readList = [];
+				$writeList = [];
+
+				foreach ($membership as $group) {
+					$groupNode = $this->server->tree->getNodeForPath($group);
+
+					$listItem = Uri\split($group)[0].'/';
+
+					// If the node is either ap proxy-read or proxy-write
+					// group, we grab the parent principal and add it to the
+					// list.
+					if ($groupNode instanceof Principal\IProxyRead) {
+						$readList[] = $listItem;
+					}
+					if ($groupNode instanceof Principal\IProxyWrite) {
+						$writeList[] = $listItem;
+					}
+				}
+
+				$propFind->set($propRead, new LocalHref($readList));
+				$propFind->set($propWrite, new LocalHref($writeList));
+			}
+		} // instanceof IPrincipal
+
+		if ($node instanceof ICalendarObject) {
+			// The calendar-data property is not supposed to be a 'real'
+			// property, but in large chunks of the spec it does act as such.
+			// Therefore we simply expose it as a property.
+			$propFind->handle('{'.self::NS_CALDAV.'}calendar-data', function () use ($node) {
+				$val = $node->get();
+				if (is_resource($val)) {
+					$val = stream_get_contents($val);
+				}
+
+				// Taking out \r to not screw up the xml output
+				return str_replace("\r", '', $val);
+			});
+		}
+	}
+
+	/**
+	 * This function handles the calendar-multiget REPORT.
+	 *
+	 * This report is used by the client to fetch the content of a series
+	 * of urls. Effectively avoiding a lot of redundant requests.
+	 *
+	 * @param CalendarMultiGetReport $report
+	 */
+	public function calendarMultiGetReport($report)
+	{
+		$needsJson = 'application/calendar+json' === $report->contentType;
+
+		$timeZones = [];
+		$propertyList = [];
+
+		$paths = array_map(
+			[$this->server, 'calculateUri'],
+			$report->hrefs
+		);
+
+		foreach ($this->server->getPropertiesForMultiplePaths($paths, $report->properties) as $uri => $objProps) {
+			if (($needsJson || $report->expand) && isset($objProps[200]['{'.self::NS_CALDAV.'}calendar-data'])) {
+				$vObject = VObject\Reader::read($objProps[200]['{'.self::NS_CALDAV.'}calendar-data']);
+
+				if ($report->expand) {
+					// We're expanding, and for that we need to figure out the
+					// calendar's timezone.
+					list($calendarPath) = Uri\split($uri);
+					if (!isset($timeZones[$calendarPath])) {
+						// Checking the calendar-timezone property.
+						$tzProp = '{'.self::NS_CALDAV.'}calendar-timezone';
+						$tzResult = $this->server->getProperties($calendarPath, [$tzProp]);
+						if (isset($tzResult[$tzProp])) {
+							// This property contains a VCALENDAR with a single
+							// VTIMEZONE.
+							$vtimezoneObj = VObject\Reader::read($tzResult[$tzProp]);
+							$timeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
+						} else {
+							// Defaulting to UTC.
+							$timeZone = new DateTimeZone('UTC');
+						}
+						$timeZones[$calendarPath] = $timeZone;
+					}
+
+					$vObject = $vObject->expand($report->expand['start'], $report->expand['end'], $timeZones[$calendarPath]);
+				}
+				if ($needsJson) {
+					$objProps[200]['{'.self::NS_CALDAV.'}calendar-data'] = json_encode($vObject->jsonSerialize());
+				} else {
+					$objProps[200]['{'.self::NS_CALDAV.'}calendar-data'] = $vObject->serialize();
+				}
+				// Destroy circular references so PHP will garbage collect the
+				// object.
+				$vObject->destroy();
+			}
+
+			$propertyList[] = $objProps;
+		}
+
+		$prefer = $this->server->getHTTPPrefer();
+
+		$this->server->httpResponse->setStatus(207);
+		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		$this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
+		$this->server->httpResponse->setBody($this->server->generateMultiStatus($propertyList, 'minimal' === $prefer['return']));
+	}
+
+	/**
+	 * This function handles the calendar-query REPORT.
+	 *
+	 * This report is used by clients to request calendar objects based on
+	 * complex conditions.
+	 *
+	 * @param Xml\Request\CalendarQueryReport $report
+	 */
+	public function calendarQueryReport($report)
+	{
+		$path = $this->server->getRequestUri();
+
+		$needsJson = 'application/calendar+json' === $report->contentType;
+
+		$node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
+		$depth = $this->server->getHTTPDepth(0);
+
+		// The default result is an empty array
+		$result = [];
+
+		$calendarTimeZone = null;
+		if ($report->expand) {
+			// We're expanding, and for that we need to figure out the
+			// calendar's timezone.
+			$tzProp = '{'.self::NS_CALDAV.'}calendar-timezone';
+			$tzResult = $this->server->getProperties($path, [$tzProp]);
+			if (isset($tzResult[$tzProp])) {
+				// This property contains a VCALENDAR with a single
+				// VTIMEZONE.
+				$vtimezoneObj = VObject\Reader::read($tzResult[$tzProp]);
+				$calendarTimeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
+
+				// Destroy circular references so PHP will garbage collect the
+				// object.
+				$vtimezoneObj->destroy();
+			} else {
+				// Defaulting to UTC.
+				$calendarTimeZone = new DateTimeZone('UTC');
+			}
+		}
+
+		// The calendarobject was requested directly. In this case we handle
+		// this locally.
+		if (0 == $depth && $node instanceof ICalendarObject) {
+			$requestedCalendarData = true;
+			$requestedProperties = $report->properties;
+
+			if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar-data', $requestedProperties)) {
+				// We always retrieve calendar-data, as we need it for filtering.
+				$requestedProperties[] = '{urn:ietf:params:xml:ns:caldav}calendar-data';
+
+				// If calendar-data wasn't explicitly requested, we need to remove
+				// it after processing.
+				$requestedCalendarData = false;
+			}
+
+			$properties = $this->server->getPropertiesForPath(
+				$path,
+				$requestedProperties,
+				0
+			);
+
+			// This array should have only 1 element, the first calendar
+			// object.
+			$properties = current($properties);
+
+			// If there wasn't any calendar-data returned somehow, we ignore
+			// this.
+			if (isset($properties[200]['{urn:ietf:params:xml:ns:caldav}calendar-data'])) {
+				$validator = new CalendarQueryValidator();
+
+				$vObject = VObject\Reader::read($properties[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
+				if ($validator->validate($vObject, $report->filters)) {
+					// If the client didn't require the calendar-data property,
+					// we won't give it back.
+					if (!$requestedCalendarData) {
+						unset($properties[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
+					} else {
+						if ($report->expand) {
+							$vObject = $vObject->expand($report->expand['start'], $report->expand['end'], $calendarTimeZone);
+						}
+						if ($needsJson) {
+							$properties[200]['{'.self::NS_CALDAV.'}calendar-data'] = json_encode($vObject->jsonSerialize());
+						} elseif ($report->expand) {
+							$properties[200]['{'.self::NS_CALDAV.'}calendar-data'] = $vObject->serialize();
+						}
+					}
+
+					$result = [$properties];
+				}
+				// Destroy circular references so PHP will garbage collect the
+				// object.
+				$vObject->destroy();
+			}
+		}
+
+		if ($node instanceof ICalendarObjectContainer && 0 === $depth) {
+			if (0 === strpos((string) $this->server->httpRequest->getHeader('User-Agent'), 'MSFT-')) {
+				// Microsoft clients incorrectly supplied depth as 0, when it actually
+				// should have set depth to 1. We're implementing a workaround here
+				// to deal with this.
+				//
+				// This targets at least the following clients:
+				//   Windows 10
+				//   Windows Phone 8, 10
+				$depth = 1;
+			} else {
+				throw new BadRequest('A calendar-query REPORT on a calendar with a Depth: 0 is undefined. Set Depth to 1');
+			}
+		}
+
+		// If we're dealing with a calendar, the calendar itself is responsible
+		// for the calendar-query.
+		if ($node instanceof ICalendarObjectContainer && 1 == $depth) {
+			$nodePaths = $node->calendarQuery($report->filters);
+
+			foreach ($nodePaths as $path) {
+				list($properties) =
+					$this->server->getPropertiesForPath($this->server->getRequestUri().'/'.$path, $report->properties);
+
+				if (($needsJson || $report->expand)) {
+					$vObject = VObject\Reader::read($properties[200]['{'.self::NS_CALDAV.'}calendar-data']);
+
+					if ($report->expand) {
+						$vObject = $vObject->expand($report->expand['start'], $report->expand['end'], $calendarTimeZone);
+					}
+
+					if ($needsJson) {
+						$properties[200]['{'.self::NS_CALDAV.'}calendar-data'] = json_encode($vObject->jsonSerialize());
+					} else {
+						$properties[200]['{'.self::NS_CALDAV.'}calendar-data'] = $vObject->serialize();
+					}
+
+					// Destroy circular references so PHP will garbage collect the
+					// object.
+					$vObject->destroy();
+				}
+				$result[] = $properties;
+			}
+		}
+
+		$prefer = $this->server->getHTTPPrefer();
+
+		$this->server->httpResponse->setStatus(207);
+		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		$this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
+		$this->server->httpResponse->setBody($this->server->generateMultiStatus($result, 'minimal' === $prefer['return']));
+	}
+
+	/**
+	 * This method is responsible for parsing the request and generating the
+	 * response for the CALDAV:free-busy-query REPORT.
+	 */
+	protected function freeBusyQueryReport(Xml\Request\FreeBusyQueryReport $report)
+	{
+		$uri = $this->server->getRequestUri();
+
+		$acl = $this->server->getPlugin('acl');
+		if ($acl) {
+			$acl->checkPrivileges($uri, '{'.self::NS_CALDAV.'}read-free-busy');
+		}
+
+		$calendar = $this->server->tree->getNodeForPath($uri);
+		if (!$calendar instanceof ICalendar) {
+			throw new DAV\Exception\NotImplemented('The free-busy-query REPORT is only implemented on calendars');
+		}
+
+		$tzProp = '{'.self::NS_CALDAV.'}calendar-timezone';
+
+		// Figuring out the default timezone for the calendar, for floating
+		// times.
+		$calendarProps = $this->server->getProperties($uri, [$tzProp]);
+
+		if (isset($calendarProps[$tzProp])) {
+			$vtimezoneObj = VObject\Reader::read($calendarProps[$tzProp]);
+			$calendarTimeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
+			// Destroy circular references so PHP will garbage collect the object.
+			$vtimezoneObj->destroy();
+		} else {
+			$calendarTimeZone = new DateTimeZone('UTC');
+		}
+
+		// Doing a calendar-query first, to make sure we get the most
+		// performance.
+		$urls = $calendar->calendarQuery([
+			'name' => 'VCALENDAR',
+			'comp-filters' => [
+				[
+					'name' => 'VEVENT',
+					'comp-filters' => [],
+					'prop-filters' => [],
+					'is-not-defined' => false,
+					'time-range' => [
+						'start' => $report->start,
+						'end' => $report->end,
+					],
+				],
+			],
+			'prop-filters' => [],
+			'is-not-defined' => false,
+			'time-range' => null,
+		]);
+
+		$objects = array_map(function ($url) use ($calendar) {
+			$obj = $calendar->getChild($url)->get();
+
+			return $obj;
+		}, $urls);
+
+		$generator = new VObject\FreeBusyGenerator();
+		$generator->setObjects($objects);
+		$generator->setTimeRange($report->start, $report->end);
+		$generator->setTimeZone($calendarTimeZone);
+		$result = $generator->getResult();
+		$result = $result->serialize();
+
+		$this->server->httpResponse->setStatus(200);
+		$this->server->httpResponse->setHeader('Content-Type', 'text/calendar');
+		$this->server->httpResponse->setHeader('Content-Length', strlen($result));
+		$this->server->httpResponse->setBody($result);
+	}
+
+	/**
+	 * This method is triggered before a file gets updated with new content.
+	 *
+	 * This plugin uses this method to ensure that CalDAV objects receive
+	 * valid calendar data.
+	 *
+	 * @param string   $path
+	 * @param resource $data
+	 * @param bool     $modified should be set to true, if this event handler
+	 *                           changed &$data
+	 */
+	public function beforeWriteContent($path, DAV\IFile $node, &$data, &$modified)
+	{
+		if (!$node instanceof ICalendarObject) {
+			return;
+		}
+
+		// We're onyl interested in ICalendarObject nodes that are inside of a
+		// real calendar. This is to avoid triggering validation and scheduling
+		// for non-calendars (such as an inbox).
+		list($parent) = Uri\split($path);
+		$parentNode = $this->server->tree->getNodeForPath($parent);
+
+		if (!$parentNode instanceof ICalendar) {
+			return;
+		}
+
+		$this->validateICalendar(
+			$data,
+			$path,
+			$modified,
+			$this->server->httpRequest,
+			$this->server->httpResponse,
+			false
+		);
+	}
+
+	/**
+	 * This method is triggered before a new file is created.
+	 *
+	 * This plugin uses this method to ensure that newly created calendar
+	 * objects contain valid calendar data.
+	 *
+	 * @param string   $path
+	 * @param resource $data
+	 * @param bool     $modified should be set to true, if this event handler
+	 *                           changed &$data
+	 */
+	public function beforeCreateFile($path, &$data, DAV\ICollection $parentNode, &$modified)
+	{
+		if (!$parentNode instanceof ICalendar) {
+			return;
+		}
+
+		$this->validateICalendar(
+			$data,
+			$path,
+			$modified,
+			$this->server->httpRequest,
+			$this->server->httpResponse,
+			true
+		);
+	}
+
+	/**
+	 * Checks if the submitted iCalendar data is in fact, valid.
+	 *
+	 * An exception is thrown if it's not.
+	 *
+	 * @param resource|string   $data
+	 * @param string            $path
+	 * @param bool              $modified should be set to true, if this event handler
+	 *                                    changed &$data
+	 * @param RequestInterface  $request  the http request
+	 * @param ResponseInterface $response the http response
+	 * @param bool              $isNew    is the item a new one, or an update
+	 */
+	protected function validateICalendar(&$data, $path, &$modified, RequestInterface $request, ResponseInterface $response, $isNew)
+	{
+		// If it's a stream, we convert it to a string first.
+		if (is_resource($data)) {
+			$data = stream_get_contents($data);
+		}
+
+		$before = $data;
+
+		try {
+			// If the data starts with a [, we can reasonably assume we're dealing
+			// with a jCal object.
+			if ('[' === substr($data, 0, 1)) {
+				$vobj = VObject\Reader::readJson($data);
+
+				// Converting $data back to iCalendar, as that's what we
+				// technically support everywhere.
+				$data = $vobj->serialize();
+				$modified = true;
+			} else {
+				$vobj = VObject\Reader::read($data);
+			}
+		} catch (VObject\ParseException $e) {
+			throw new DAV\Exception\UnsupportedMediaType('This resource only supports valid iCalendar 2.0 data. Parse error: '.$e->getMessage());
+		}
+
+		if ('VCALENDAR' !== $vobj->name) {
+			throw new DAV\Exception\UnsupportedMediaType('This collection can only support iCalendar objects.');
+		}
+
+		$sCCS = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
+
+		// Get the Supported Components for the target calendar
+		list($parentPath) = Uri\split($path);
+		$calendarProperties = $this->server->getProperties($parentPath, [$sCCS]);
+
+		if (isset($calendarProperties[$sCCS])) {
+			$supportedComponents = $calendarProperties[$sCCS]->getValue();
+		} else {
+			$supportedComponents = ['VJOURNAL', 'VTODO', 'VEVENT'];
+		}
+
+		$foundType = null;
+
+		foreach ($vobj->getComponents() as $component) {
+			switch ($component->name) {
+				case 'VTIMEZONE':
+					continue 2;
+				case 'VEVENT':
+				case 'VTODO':
+				case 'VJOURNAL':
+					$foundType = $component->name;
+					break;
+			}
+		}
+
+		if (!$foundType || !in_array($foundType, $supportedComponents)) {
+			throw new Exception\InvalidComponentType('iCalendar objects must at least have a component of type '.implode(', ', $supportedComponents));
+		}
+
+		$options = VObject\Node::PROFILE_CALDAV;
+		$prefer = $this->server->getHTTPPrefer();
+
+		if ('strict' !== $prefer['handling']) {
+			$options |= VObject\Node::REPAIR;
+		}
+
+		$messages = $vobj->validate($options);
+
+		$highestLevel = 0;
+		$warningMessage = null;
+
+		// $messages contains a list of problems with the vcard, along with
+		// their severity.
+		foreach ($messages as $message) {
+			if ($message['level'] > $highestLevel) {
+				// Recording the highest reported error level.
+				$highestLevel = $message['level'];
+				$warningMessage = $message['message'];
+			}
+			switch ($message['level']) {
+				case 1:
+					// Level 1 means that there was a problem, but it was repaired.
+					$modified = true;
+					break;
+				case 2:
+					// Level 2 means a warning, but not critical
+					break;
+				case 3:
+					// Level 3 means a critical error
+					throw new DAV\Exception\UnsupportedMediaType('Validation error in iCalendar: '.$message['message']);
+			}
+		}
+		if ($warningMessage) {
+			$response->setHeader(
+				'X-Sabre-Ew-Gross',
+				'iCalendar validation warning: '.$warningMessage
+			);
+		}
+
+		// We use an extra variable to allow event handles to tell us whether
+		// the object was modified or not.
+		//
+		// This helps us determine if we need to re-serialize the object.
+		$subModified = false;
+
+		$this->server->emit(
+			'calendarObjectChange',
+			[
+				$request,
+				$response,
+				$vobj,
+				$parentPath,
+				&$subModified,
+				$isNew,
+			]
+		);
+
+		if ($modified || $subModified) {
+			// An event handler told us that it modified the object.
+			$data = $vobj->serialize();
+
+			// Using md5 to figure out if there was an *actual* change.
+			if (!$modified && 0 !== strcmp($data, $before)) {
+				$modified = true;
+			}
+		}
+
+		// Destroy circular references so PHP will garbage collect the object.
+		$vobj->destroy();
+	}
+
+	/**
+	 * This method is triggered whenever a subsystem reqeuests the privileges
+	 * that are supported on a particular node.
+	 */
+	public function getSupportedPrivilegeSet(INode $node, array &$supportedPrivilegeSet)
+	{
+		if ($node instanceof ICalendar) {
+			$supportedPrivilegeSet['{DAV:}read']['aggregates']['{'.self::NS_CALDAV.'}read-free-busy'] = [
+				'abstract' => false,
+				'aggregates' => [],
+			];
+		}
+	}
+
+	/**
+	 * This method is used to generate HTML output for the
+	 * DAV\Browser\Plugin. This allows us to generate an interface users
+	 * can use to create new calendars.
+	 *
+	 * @param string $output
+	 *
+	 * @return bool
+	 */
+	public function htmlActionsPanel(DAV\INode $node, &$output)
+	{
+		if (!$node instanceof CalendarHome) {
+			return;
+		}
+
+		$output .= '<tr><td colspan="2"><form method="post" action="">
             <h3>Create new calendar</h3>
             <input type="hidden" name="sabreAction" value="mkcol" />
             <input type="hidden" name="resourceType" value="{DAV:}collection,{'.self::NS_CALDAV.'}calendar" />
@@ -951,61 +951,61 @@ 
             </form>
             </td></tr>';
 
-        return false;
-    }
-
-    /**
-     * This event is triggered after GET requests.
-     *
-     * This is used to transform data into jCal, if this was requested.
-     */
-    public function httpAfterGet(RequestInterface $request, ResponseInterface $response)
-    {
-        $contentType = $response->getHeader('Content-Type');
-        if (null === $contentType || false === strpos($contentType, 'text/calendar')) {
-            return;
-        }
-
-        $result = HTTP\negotiateContentType(
-            $request->getHeader('Accept'),
-            ['text/calendar', 'application/calendar+json']
-        );
-
-        if ('application/calendar+json' !== $result) {
-            // Do nothing
-            return;
-        }
-
-        // Transforming.
-        $vobj = VObject\Reader::read($response->getBody());
-
-        $jsonBody = json_encode($vobj->jsonSerialize());
-        $response->setBody($jsonBody);
-
-        // Destroy circular references so PHP will garbage collect the object.
-        $vobj->destroy();
-
-        $response->setHeader('Content-Type', 'application/calendar+json');
-        $response->setHeader('Content-Length', strlen($jsonBody));
-    }
-
-    /**
-     * 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 CalDAV (rfc4791)',
-            'link' => 'http://sabre.io/dav/caldav/',
-        ];
-    }
+		return false;
+	}
+
+	/**
+	 * This event is triggered after GET requests.
+	 *
+	 * This is used to transform data into jCal, if this was requested.
+	 */
+	public function httpAfterGet(RequestInterface $request, ResponseInterface $response)
+	{
+		$contentType = $response->getHeader('Content-Type');
+		if (null === $contentType || false === strpos($contentType, 'text/calendar')) {
+			return;
+		}
+
+		$result = HTTP\negotiateContentType(
+			$request->getHeader('Accept'),
+			['text/calendar', 'application/calendar+json']
+		);
+
+		if ('application/calendar+json' !== $result) {
+			// Do nothing
+			return;
+		}
+
+		// Transforming.
+		$vobj = VObject\Reader::read($response->getBody());
+
+		$jsonBody = json_encode($vobj->jsonSerialize());
+		$response->setBody($jsonBody);
+
+		// Destroy circular references so PHP will garbage collect the object.
+		$vobj->destroy();
+
+		$response->setHeader('Content-Type', 'application/calendar+json');
+		$response->setHeader('Content-Length', strlen($jsonBody));
+	}
+
+	/**
+	 * 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 CalDAV (rfc4791)',
+			'link' => 'http://sabre.io/dav/caldav/',
+		];
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -325,10 +325,10 @@ 
 
         if ($node instanceof ICalendarObjectContainer) {
             $propFind->handle($ns.'max-resource-size', $this->maxResourceSize);
-            $propFind->handle($ns.'supported-calendar-data', function () {
+            $propFind->handle($ns.'supported-calendar-data', function() {
                 return new Xml\Property\SupportedCalendarData();
             });
-            $propFind->handle($ns.'supported-collation-set', function () {
+            $propFind->handle($ns.'supported-collation-set', function() {
                 return new Xml\Property\SupportedCollationSet();
             });
         }
@@ -336,7 +336,7 @@ 
         if ($node instanceof DAVACL\IPrincipal) {
             $principalUrl = $node->getPrincipalUrl();
 
-            $propFind->handle('{'.self::NS_CALDAV.'}calendar-home-set', function () use ($principalUrl) {
+            $propFind->handle('{'.self::NS_CALDAV.'}calendar-home-set', function() use ($principalUrl) {
                 $calendarHomePath = $this->getCalendarHomeForPrincipal($principalUrl);
                 if (is_null($calendarHomePath)) {
                     return null;
@@ -346,7 +346,7 @@ 
             });
             // The calendar-user-address-set property is basically mapped to
             // the {DAV:}alternate-URI-set property.
-            $propFind->handle('{'.self::NS_CALDAV.'}calendar-user-address-set', function () use ($node) {
+            $propFind->handle('{'.self::NS_CALDAV.'}calendar-user-address-set', function() use ($node) {
                 $addresses = $node->getAlternateUriSet();
                 $addresses[] = $this->server->getBaseUri().$node->getPrincipalUrl().'/';
 
@@ -354,7 +354,7 @@ 
             });
             // For some reason somebody thought it was a good idea to add
             // another one of these properties. We're supporting it too.
-            $propFind->handle('{'.self::NS_CALENDARSERVER.'}email-address-set', function () use ($node) {
+            $propFind->handle('{'.self::NS_CALENDARSERVER.'}email-address-set', function() use ($node) {
                 $addresses = $node->getAlternateUriSet();
                 $emails = [];
                 foreach ($addresses as $address) {
@@ -402,7 +402,7 @@ 
             // The calendar-data property is not supposed to be a 'real'
             // property, but in large chunks of the spec it does act as such.
             // Therefore we simply expose it as a property.
-            $propFind->handle('{'.self::NS_CALDAV.'}calendar-data', function () use ($node) {
+            $propFind->handle('{'.self::NS_CALDAV.'}calendar-data', function() use ($node) {
                 $val = $node->get();
                 if (is_resource($val)) {
                     $val = stream_get_contents($val);
@@ -684,7 +684,7 @@ 
             'time-range' => null,
         ]);
 
-        $objects = array_map(function ($url) use ($calendar) {
+        $objects = array_map(function($url) use ($calendar) {
             $obj = $calendar->getChild($url)->get();
 
             return $obj;

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Principal/ProxyRead.php

Indentation +138 added lines, -138 removed lines

@@ -20,142 +20,142 @@
  */
 class ProxyRead implements IProxyRead
 {
-    /**
-     * Principal information from the parent principal.
-     *
-     * @var array
-     */
-    protected $principalInfo;
-
-    /**
-     * Principal backend.
-     *
-     * @var DAVACL\PrincipalBackend\BackendInterface
-     */
-    protected $principalBackend;
-
-    /**
-     * Creates the object.
-     *
-     * Note that you MUST supply the parent principal information.
-     */
-    public function __construct(DAVACL\PrincipalBackend\BackendInterface $principalBackend, array $principalInfo)
-    {
-        $this->principalInfo = $principalInfo;
-        $this->principalBackend = $principalBackend;
-    }
-
-    /**
-     * Returns this principals name.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'calendar-proxy-read';
-    }
-
-    /**
-     * Returns the last modification time.
-     */
-    public function getLastModified()
-    {
-        return null;
-    }
-
-    /**
-     * Deletes the current node.
-     *
-     * @throws DAV\Exception\Forbidden
-     */
-    public function delete()
-    {
-        throw new DAV\Exception\Forbidden('Permission denied to delete node');
-    }
-
-    /**
-     * Renames the node.
-     *
-     * @param string $name The new name
-     *
-     * @throws DAV\Exception\Forbidden
-     */
-    public function setName($name)
-    {
-        throw new DAV\Exception\Forbidden('Permission denied to rename file');
-    }
-
-    /**
-     * Returns a list of alternative urls for a principal.
-     *
-     * This can for example be an email address, or ldap url.
-     *
-     * @return array
-     */
-    public function getAlternateUriSet()
-    {
-        return [];
-    }
-
-    /**
-     * Returns the full principal url.
-     *
-     * @return string
-     */
-    public function getPrincipalUrl()
-    {
-        return $this->principalInfo['uri'].'/'.$this->getName();
-    }
-
-    /**
-     * Returns the list of group members.
-     *
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group.
-     *
-     * @return array
-     */
-    public function getGroupMemberSet()
-    {
-        return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
-    }
-
-    /**
-     * Returns the list of groups this principal is member of.
-     *
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members.
-     *
-     * @return array
-     */
-    public function getGroupMembership()
-    {
-        return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
-    }
-
-    /**
-     * Sets a list of group members.
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     *
-     * This method should throw an exception if the members could not be set.
-     */
-    public function setGroupMemberSet(array $principals)
-    {
-        $this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
-    }
-
-    /**
-     * Returns the displayname.
-     *
-     * This should be a human readable name for the principal.
-     * If none is available, return the nodename.
-     *
-     * @return string
-     */
-    public function getDisplayName()
-    {
-        return $this->getName();
-    }
+	/**
+	 * Principal information from the parent principal.
+	 *
+	 * @var array
+	 */
+	protected $principalInfo;
+
+	/**
+	 * Principal backend.
+	 *
+	 * @var DAVACL\PrincipalBackend\BackendInterface
+	 */
+	protected $principalBackend;
+
+	/**
+	 * Creates the object.
+	 *
+	 * Note that you MUST supply the parent principal information.
+	 */
+	public function __construct(DAVACL\PrincipalBackend\BackendInterface $principalBackend, array $principalInfo)
+	{
+		$this->principalInfo = $principalInfo;
+		$this->principalBackend = $principalBackend;
+	}
+
+	/**
+	 * Returns this principals name.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return 'calendar-proxy-read';
+	}
+
+	/**
+	 * Returns the last modification time.
+	 */
+	public function getLastModified()
+	{
+		return null;
+	}
+
+	/**
+	 * Deletes the current node.
+	 *
+	 * @throws DAV\Exception\Forbidden
+	 */
+	public function delete()
+	{
+		throw new DAV\Exception\Forbidden('Permission denied to delete node');
+	}
+
+	/**
+	 * Renames the node.
+	 *
+	 * @param string $name The new name
+	 *
+	 * @throws DAV\Exception\Forbidden
+	 */
+	public function setName($name)
+	{
+		throw new DAV\Exception\Forbidden('Permission denied to rename file');
+	}
+
+	/**
+	 * Returns a list of alternative urls for a principal.
+	 *
+	 * This can for example be an email address, or ldap url.
+	 *
+	 * @return array
+	 */
+	public function getAlternateUriSet()
+	{
+		return [];
+	}
+
+	/**
+	 * Returns the full principal url.
+	 *
+	 * @return string
+	 */
+	public function getPrincipalUrl()
+	{
+		return $this->principalInfo['uri'].'/'.$this->getName();
+	}
+
+	/**
+	 * Returns the list of group members.
+	 *
+	 * If this principal is a group, this function should return
+	 * all member principal uri's for the group.
+	 *
+	 * @return array
+	 */
+	public function getGroupMemberSet()
+	{
+		return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
+	}
+
+	/**
+	 * Returns the list of groups this principal is member of.
+	 *
+	 * If this principal is a member of a (list of) groups, this function
+	 * should return a list of principal uri's for it's members.
+	 *
+	 * @return array
+	 */
+	public function getGroupMembership()
+	{
+		return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
+	}
+
+	/**
+	 * Sets a list of group members.
+	 *
+	 * If this principal is a group, this method sets all the group members.
+	 * The list of members is always overwritten, never appended to.
+	 *
+	 * This method should throw an exception if the members could not be set.
+	 */
+	public function setGroupMemberSet(array $principals)
+	{
+		$this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
+	}
+
+	/**
+	 * Returns the displayname.
+	 *
+	 * This should be a human readable name for the principal.
+	 * If none is available, return the nodename.
+	 *
+	 * @return string
+	 */
+	public function getDisplayName()
+	{
+		return $this->getName();
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Principal/Collection.php

Indentation +9 added lines, -9 removed lines

@@ -20,13 +20,13 @@
  */
 class Collection extends DAVACL\PrincipalCollection
 {
-    /**
-     * Returns a child object based on principal information.
-     *
-     * @return User
-     */
-    public function getChildForPrincipal(array $principalInfo)
-    {
-        return new User($this->principalBackend, $principalInfo);
-    }
+	/**
+	 * Returns a child object based on principal information.
+	 *
+	 * @return User
+	 */
+	public function getChildForPrincipal(array $principalInfo)
+	{
+		return new User($this->principalBackend, $principalInfo);
+	}
 }