Dolibarr / dolibarr

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

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

Indentation +103 added lines, -103 removed lines

@@ -20,117 +20,117 @@
  */
 class User extends DAVACL\Principal implements DAV\ICollection
 {
-    /**
-     * Creates a new file in the directory.
-     *
-     * @param string   $name Name of the file
-     * @param resource $data initial payload, passed as a readable stream resource
-     *
-     * @throws DAV\Exception\Forbidden
-     */
-    public function createFile($name, $data = null)
-    {
-        throw new DAV\Exception\Forbidden('Permission denied to create file (filename '.$name.')');
-    }
+	/**
+	 * Creates a new file in the directory.
+	 *
+	 * @param string   $name Name of the file
+	 * @param resource $data initial payload, passed as a readable stream resource
+	 *
+	 * @throws DAV\Exception\Forbidden
+	 */
+	public function createFile($name, $data = null)
+	{
+		throw new DAV\Exception\Forbidden('Permission denied to create file (filename '.$name.')');
+	}
 
-    /**
-     * Creates a new subdirectory.
-     *
-     * @param string $name
-     *
-     * @throws DAV\Exception\Forbidden
-     */
-    public function createDirectory($name)
-    {
-        throw new DAV\Exception\Forbidden('Permission denied to create directory');
-    }
+	/**
+	 * Creates a new subdirectory.
+	 *
+	 * @param string $name
+	 *
+	 * @throws DAV\Exception\Forbidden
+	 */
+	public function createDirectory($name)
+	{
+		throw new DAV\Exception\Forbidden('Permission denied to create directory');
+	}
 
-    /**
-     * Returns a specific child node, referenced by its name.
-     *
-     * @param string $name
-     *
-     * @return DAV\INode
-     */
-    public function getChild($name)
-    {
-        $principal = $this->principalBackend->getPrincipalByPath($this->getPrincipalURL().'/'.$name);
-        if (!$principal) {
-            throw new DAV\Exception\NotFound('Node with name '.$name.' was not found');
-        }
-        if ('calendar-proxy-read' === $name) {
-            return new ProxyRead($this->principalBackend, $this->principalProperties);
-        }
+	/**
+	 * Returns a specific child node, referenced by its name.
+	 *
+	 * @param string $name
+	 *
+	 * @return DAV\INode
+	 */
+	public function getChild($name)
+	{
+		$principal = $this->principalBackend->getPrincipalByPath($this->getPrincipalURL().'/'.$name);
+		if (!$principal) {
+			throw new DAV\Exception\NotFound('Node with name '.$name.' was not found');
+		}
+		if ('calendar-proxy-read' === $name) {
+			return new ProxyRead($this->principalBackend, $this->principalProperties);
+		}
 
-        if ('calendar-proxy-write' === $name) {
-            return new ProxyWrite($this->principalBackend, $this->principalProperties);
-        }
+		if ('calendar-proxy-write' === $name) {
+			return new ProxyWrite($this->principalBackend, $this->principalProperties);
+		}
 
-        throw new DAV\Exception\NotFound('Node with name '.$name.' was not found');
-    }
+		throw new DAV\Exception\NotFound('Node with name '.$name.' was not found');
+	}
 
-    /**
-     * Returns an array with all the child nodes.
-     *
-     * @return DAV\INode[]
-     */
-    public function getChildren()
-    {
-        $r = [];
-        if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL().'/calendar-proxy-read')) {
-            $r[] = new ProxyRead($this->principalBackend, $this->principalProperties);
-        }
-        if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL().'/calendar-proxy-write')) {
-            $r[] = new ProxyWrite($this->principalBackend, $this->principalProperties);
-        }
+	/**
+	 * Returns an array with all the child nodes.
+	 *
+	 * @return DAV\INode[]
+	 */
+	public function getChildren()
+	{
+		$r = [];
+		if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL().'/calendar-proxy-read')) {
+			$r[] = new ProxyRead($this->principalBackend, $this->principalProperties);
+		}
+		if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL().'/calendar-proxy-write')) {
+			$r[] = new ProxyWrite($this->principalBackend, $this->principalProperties);
+		}
 
-        return $r;
-    }
+		return $r;
+	}
 
-    /**
-     * Returns whether or not the child node exists.
-     *
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function childExists($name)
-    {
-        try {
-            $this->getChild($name);
+	/**
+	 * Returns whether or not the child node exists.
+	 *
+	 * @param string $name
+	 *
+	 * @return bool
+	 */
+	public function childExists($name)
+	{
+		try {
+			$this->getChild($name);
 
-            return true;
-        } catch (DAV\Exception\NotFound $e) {
-            return false;
-        }
-    }
+			return true;
+		} catch (DAV\Exception\NotFound $e) {
+			return false;
+		}
+	}
 
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL()
-    {
-        $acl = parent::getACL();
-        $acl[] = [
-            'privilege' => '{DAV:}read',
-            'principal' => $this->principalProperties['uri'].'/calendar-proxy-read',
-            'protected' => true,
-        ];
-        $acl[] = [
-            'privilege' => '{DAV:}read',
-            'principal' => $this->principalProperties['uri'].'/calendar-proxy-write',
-            'protected' => true,
-        ];
+	/**
+	 * Returns a list of ACE's for this node.
+	 *
+	 * Each ACE has the following properties:
+	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	 *     currently the only supported privileges
+	 *   * 'principal', a url to the principal who owns the node
+	 *   * 'protected' (optional), indicating that this ACE is not allowed to
+	 *      be updated.
+	 *
+	 * @return array
+	 */
+	public function getACL()
+	{
+		$acl = parent::getACL();
+		$acl[] = [
+			'privilege' => '{DAV:}read',
+			'principal' => $this->principalProperties['uri'].'/calendar-proxy-read',
+			'protected' => true,
+		];
+		$acl[] = [
+			'privilege' => '{DAV:}read',
+			'principal' => $this->principalProperties['uri'].'/calendar-proxy-write',
+			'protected' => true,
+		];
 
-        return $acl;
-    }
+		return $acl;
+	}
 }

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

Indentation +138 added lines, -138 removed lines

@@ -20,142 +20,142 @@
  */
 class ProxyWrite implements IProxyWrite
 {
-    /**
-     * Parent principal information.
-     *
-     * @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-write';
-    }
-
-    /**
-     * 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();
-    }
+	/**
+	 * Parent principal information.
+	 *
+	 * @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-write';
+	}
+
+	/**
+	 * 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/ICSExportPlugin.php

Indentation +326 added lines, -326 removed lines

@@ -48,330 +48,330 @@
  */
 class ICSExportPlugin extends DAV\ServerPlugin
 {
-    /**
-     * Reference to Server class.
-     *
-     * @var \Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * Initializes the plugin and registers event handlers.
-     *
-     * @param \Sabre\DAV\Server $server
-     */
-    public function initialize(DAV\Server $server)
-    {
-        $this->server = $server;
-        $server->on('method:GET', [$this, 'httpGet'], 90);
-        $server->on('browserButtonActions', function ($path, $node, &$actions) {
-            if ($node instanceof ICalendar) {
-                $actions .= '<a href="'.htmlspecialchars($path, ENT_QUOTES, 'UTF-8').'?export"><span class="oi" data-glyph="calendar"></span></a>';
-            }
-        });
-    }
-
-    /**
-     * Intercepts GET requests on calendar urls ending with ?export.
-     *
-     * @throws BadRequest
-     * @throws DAV\Exception\NotFound
-     * @throws VObject\InvalidDataException
-     *
-     * @return bool
-     */
-    public function httpGet(RequestInterface $request, ResponseInterface $response)
-    {
-        $queryParams = $request->getQueryParameters();
-        if (!array_key_exists('export', $queryParams)) {
-            return;
-        }
-
-        $path = $request->getPath();
-
-        $node = $this->server->getProperties($path, [
-            '{DAV:}resourcetype',
-            '{DAV:}displayname',
-            '{http://sabredav.org/ns}sync-token',
-            '{DAV:}sync-token',
-            '{http://apple.com/ns/ical/}calendar-color',
-        ]);
-
-        if (!isset($node['{DAV:}resourcetype']) || !$node['{DAV:}resourcetype']->is('{'.Plugin::NS_CALDAV.'}calendar')) {
-            return;
-        }
-        // Marking the transactionType, for logging purposes.
-        $this->server->transactionType = 'get-calendar-export';
-
-        $properties = $node;
-
-        $start = null;
-        $end = null;
-        $expand = false;
-        $componentType = false;
-        if (isset($queryParams['start'])) {
-            if (!ctype_digit($queryParams['start'])) {
-                throw new BadRequest('The start= parameter must contain a unix timestamp');
-            }
-            $start = DateTime::createFromFormat('U', $queryParams['start']);
-        }
-        if (isset($queryParams['end'])) {
-            if (!ctype_digit($queryParams['end'])) {
-                throw new BadRequest('The end= parameter must contain a unix timestamp');
-            }
-            $end = DateTime::createFromFormat('U', $queryParams['end']);
-        }
-        if (isset($queryParams['expand']) && (bool) $queryParams['expand']) {
-            if (!$start || !$end) {
-                throw new BadRequest('If you\'d like to expand recurrences, you must specify both a start= and end= parameter.');
-            }
-            $expand = true;
-            $componentType = 'VEVENT';
-        }
-        if (isset($queryParams['componentType'])) {
-            if (!in_array($queryParams['componentType'], ['VEVENT', 'VTODO', 'VJOURNAL'])) {
-                throw new BadRequest('You are not allowed to search for components of type: '.$queryParams['componentType'].' here');
-            }
-            $componentType = $queryParams['componentType'];
-        }
-
-        $format = \Sabre\HTTP\negotiateContentType(
-            $request->getHeader('Accept'),
-            [
-                'text/calendar',
-                'application/calendar+json',
-            ]
-        );
-
-        if (isset($queryParams['accept'])) {
-            if ('application/calendar+json' === $queryParams['accept'] || 'jcal' === $queryParams['accept']) {
-                $format = 'application/calendar+json';
-            }
-        }
-        if (!$format) {
-            $format = 'text/calendar';
-        }
-
-        $this->generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, $response);
-
-        // Returning false to break the event chain
-        return false;
-    }
-
-    /**
-     * This method is responsible for generating the actual, full response.
-     *
-     * @param string        $path
-     * @param DateTime|null $start
-     * @param DateTime|null $end
-     * @param bool          $expand
-     * @param string        $componentType
-     * @param string        $format
-     * @param array         $properties
-     *
-     * @throws DAV\Exception\NotFound
-     * @throws VObject\InvalidDataException
-     */
-    protected function generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, ResponseInterface $response)
-    {
-        $calDataProp = '{'.Plugin::NS_CALDAV.'}calendar-data';
-        $calendarNode = $this->server->tree->getNodeForPath($path);
-
-        $blobs = [];
-        if ($start || $end || $componentType) {
-            // If there was a start or end filter, we need to enlist
-            // calendarQuery for speed.
-            $queryResult = $calendarNode->calendarQuery([
-                'name' => 'VCALENDAR',
-                'comp-filters' => [
-                    [
-                        'name' => $componentType,
-                        'comp-filters' => [],
-                        'prop-filters' => [],
-                        'is-not-defined' => false,
-                        'time-range' => [
-                            'start' => $start,
-                            'end' => $end,
-                        ],
-                    ],
-                ],
-                'prop-filters' => [],
-                'is-not-defined' => false,
-                'time-range' => null,
-            ]);
-
-            // queryResult is just a list of base urls. We need to prefix the
-            // calendar path.
-            $queryResult = array_map(
-                function ($item) use ($path) {
-                    return $path.'/'.$item;
-                },
-                $queryResult
-            );
-            $nodes = $this->server->getPropertiesForMultiplePaths($queryResult, [$calDataProp]);
-            unset($queryResult);
-        } else {
-            $nodes = $this->server->getPropertiesForPath($path, [$calDataProp], 1);
-        }
-
-        // Flattening the arrays
-        foreach ($nodes as $node) {
-            if (isset($node[200][$calDataProp])) {
-                $blobs[$node['href']] = $node[200][$calDataProp];
-            }
-        }
-        unset($nodes);
-
-        $mergedCalendar = $this->mergeObjects(
-            $properties,
-            $blobs
-        );
-
-        if ($expand) {
-            $calendarTimeZone = null;
-            // We're expanding, and for that we need to figure out the
-            // calendar's timezone.
-            $tzProp = '{'.Plugin::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 to PHP will GC the object.
-                $vtimezoneObj->destroy();
-                unset($vtimezoneObj);
-            } else {
-                // Defaulting to UTC.
-                $calendarTimeZone = new DateTimeZone('UTC');
-            }
-
-            $mergedCalendar = $mergedCalendar->expand($start, $end, $calendarTimeZone);
-        }
-
-        $filenameExtension = '.ics';
-
-        switch ($format) {
-            case 'text/calendar':
-                $mergedCalendar = $mergedCalendar->serialize();
-                $filenameExtension = '.ics';
-                break;
-            case 'application/calendar+json':
-                $mergedCalendar = json_encode($mergedCalendar->jsonSerialize());
-                $filenameExtension = '.json';
-                break;
-        }
-
-        $filename = preg_replace(
-            '/[^a-zA-Z0-9-_ ]/um',
-            '',
-            $calendarNode->getName()
-        );
-        $filename .= '-'.date('Y-m-d').$filenameExtension;
-
-        $response->setHeader('Content-Disposition', 'attachment; filename="'.$filename.'"');
-        $response->setHeader('Content-Type', $format);
-
-        $response->setStatus(200);
-        $response->setBody($mergedCalendar);
-    }
-
-    /**
-     * Merges all calendar objects, and builds one big iCalendar blob.
-     *
-     * @param array $properties Some CalDAV properties
-     *
-     * @return VObject\Component\VCalendar
-     */
-    public function mergeObjects(array $properties, array $inputObjects)
-    {
-        $calendar = new VObject\Component\VCalendar();
-        $calendar->VERSION = '2.0';
-        if (DAV\Server::$exposeVersion) {
-            $calendar->PRODID = '-//SabreDAV//SabreDAV '.DAV\Version::VERSION.'//EN';
-        } else {
-            $calendar->PRODID = '-//SabreDAV//SabreDAV//EN';
-        }
-        if (isset($properties['{DAV:}displayname'])) {
-            $calendar->{'X-WR-CALNAME'} = $properties['{DAV:}displayname'];
-        }
-        if (isset($properties['{http://apple.com/ns/ical/}calendar-color'])) {
-            $calendar->{'X-APPLE-CALENDAR-COLOR'} = $properties['{http://apple.com/ns/ical/}calendar-color'];
-        }
-
-        $collectedTimezones = [];
-
-        $timezones = [];
-        $objects = [];
-
-        foreach ($inputObjects as $href => $inputObject) {
-            $nodeComp = VObject\Reader::read($inputObject);
-
-            foreach ($nodeComp->children() as $child) {
-                switch ($child->name) {
-                    case 'VEVENT':
-                    case 'VTODO':
-                    case 'VJOURNAL':
-                        $objects[] = clone $child;
-                        break;
-
-                    // VTIMEZONE is special, because we need to filter out the duplicates
-                    case 'VTIMEZONE':
-                        // Naively just checking tzid.
-                        if (in_array((string) $child->TZID, $collectedTimezones)) {
-                            break;
-                        }
-
-                        $timezones[] = clone $child;
-                        $collectedTimezones[] = $child->TZID;
-                        break;
-                }
-            }
-            // Destroy circular references to PHP will GC the object.
-            $nodeComp->destroy();
-            unset($nodeComp);
-        }
-
-        foreach ($timezones as $tz) {
-            $calendar->add($tz);
-        }
-        foreach ($objects as $obj) {
-            $calendar->add($obj);
-        }
-
-        return $calendar;
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using \Sabre\DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName()
-    {
-        return 'ics-export';
-    }
-
-    /**
-     * 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 the ability to export CalDAV calendars as a single iCalendar file.',
-            'link' => 'http://sabre.io/dav/ics-export-plugin/',
-        ];
-    }
+	/**
+	 * Reference to Server class.
+	 *
+	 * @var \Sabre\DAV\Server
+	 */
+	protected $server;
+
+	/**
+	 * Initializes the plugin and registers event handlers.
+	 *
+	 * @param \Sabre\DAV\Server $server
+	 */
+	public function initialize(DAV\Server $server)
+	{
+		$this->server = $server;
+		$server->on('method:GET', [$this, 'httpGet'], 90);
+		$server->on('browserButtonActions', function ($path, $node, &$actions) {
+			if ($node instanceof ICalendar) {
+				$actions .= '<a href="'.htmlspecialchars($path, ENT_QUOTES, 'UTF-8').'?export"><span class="oi" data-glyph="calendar"></span></a>';
+			}
+		});
+	}
+
+	/**
+	 * Intercepts GET requests on calendar urls ending with ?export.
+	 *
+	 * @throws BadRequest
+	 * @throws DAV\Exception\NotFound
+	 * @throws VObject\InvalidDataException
+	 *
+	 * @return bool
+	 */
+	public function httpGet(RequestInterface $request, ResponseInterface $response)
+	{
+		$queryParams = $request->getQueryParameters();
+		if (!array_key_exists('export', $queryParams)) {
+			return;
+		}
+
+		$path = $request->getPath();
+
+		$node = $this->server->getProperties($path, [
+			'{DAV:}resourcetype',
+			'{DAV:}displayname',
+			'{http://sabredav.org/ns}sync-token',
+			'{DAV:}sync-token',
+			'{http://apple.com/ns/ical/}calendar-color',
+		]);
+
+		if (!isset($node['{DAV:}resourcetype']) || !$node['{DAV:}resourcetype']->is('{'.Plugin::NS_CALDAV.'}calendar')) {
+			return;
+		}
+		// Marking the transactionType, for logging purposes.
+		$this->server->transactionType = 'get-calendar-export';
+
+		$properties = $node;
+
+		$start = null;
+		$end = null;
+		$expand = false;
+		$componentType = false;
+		if (isset($queryParams['start'])) {
+			if (!ctype_digit($queryParams['start'])) {
+				throw new BadRequest('The start= parameter must contain a unix timestamp');
+			}
+			$start = DateTime::createFromFormat('U', $queryParams['start']);
+		}
+		if (isset($queryParams['end'])) {
+			if (!ctype_digit($queryParams['end'])) {
+				throw new BadRequest('The end= parameter must contain a unix timestamp');
+			}
+			$end = DateTime::createFromFormat('U', $queryParams['end']);
+		}
+		if (isset($queryParams['expand']) && (bool) $queryParams['expand']) {
+			if (!$start || !$end) {
+				throw new BadRequest('If you\'d like to expand recurrences, you must specify both a start= and end= parameter.');
+			}
+			$expand = true;
+			$componentType = 'VEVENT';
+		}
+		if (isset($queryParams['componentType'])) {
+			if (!in_array($queryParams['componentType'], ['VEVENT', 'VTODO', 'VJOURNAL'])) {
+				throw new BadRequest('You are not allowed to search for components of type: '.$queryParams['componentType'].' here');
+			}
+			$componentType = $queryParams['componentType'];
+		}
+
+		$format = \Sabre\HTTP\negotiateContentType(
+			$request->getHeader('Accept'),
+			[
+				'text/calendar',
+				'application/calendar+json',
+			]
+		);
+
+		if (isset($queryParams['accept'])) {
+			if ('application/calendar+json' === $queryParams['accept'] || 'jcal' === $queryParams['accept']) {
+				$format = 'application/calendar+json';
+			}
+		}
+		if (!$format) {
+			$format = 'text/calendar';
+		}
+
+		$this->generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, $response);
+
+		// Returning false to break the event chain
+		return false;
+	}
+
+	/**
+	 * This method is responsible for generating the actual, full response.
+	 *
+	 * @param string        $path
+	 * @param DateTime|null $start
+	 * @param DateTime|null $end
+	 * @param bool          $expand
+	 * @param string        $componentType
+	 * @param string        $format
+	 * @param array         $properties
+	 *
+	 * @throws DAV\Exception\NotFound
+	 * @throws VObject\InvalidDataException
+	 */
+	protected function generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, ResponseInterface $response)
+	{
+		$calDataProp = '{'.Plugin::NS_CALDAV.'}calendar-data';
+		$calendarNode = $this->server->tree->getNodeForPath($path);
+
+		$blobs = [];
+		if ($start || $end || $componentType) {
+			// If there was a start or end filter, we need to enlist
+			// calendarQuery for speed.
+			$queryResult = $calendarNode->calendarQuery([
+				'name' => 'VCALENDAR',
+				'comp-filters' => [
+					[
+						'name' => $componentType,
+						'comp-filters' => [],
+						'prop-filters' => [],
+						'is-not-defined' => false,
+						'time-range' => [
+							'start' => $start,
+							'end' => $end,
+						],
+					],
+				],
+				'prop-filters' => [],
+				'is-not-defined' => false,
+				'time-range' => null,
+			]);
+
+			// queryResult is just a list of base urls. We need to prefix the
+			// calendar path.
+			$queryResult = array_map(
+				function ($item) use ($path) {
+					return $path.'/'.$item;
+				},
+				$queryResult
+			);
+			$nodes = $this->server->getPropertiesForMultiplePaths($queryResult, [$calDataProp]);
+			unset($queryResult);
+		} else {
+			$nodes = $this->server->getPropertiesForPath($path, [$calDataProp], 1);
+		}
+
+		// Flattening the arrays
+		foreach ($nodes as $node) {
+			if (isset($node[200][$calDataProp])) {
+				$blobs[$node['href']] = $node[200][$calDataProp];
+			}
+		}
+		unset($nodes);
+
+		$mergedCalendar = $this->mergeObjects(
+			$properties,
+			$blobs
+		);
+
+		if ($expand) {
+			$calendarTimeZone = null;
+			// We're expanding, and for that we need to figure out the
+			// calendar's timezone.
+			$tzProp = '{'.Plugin::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 to PHP will GC the object.
+				$vtimezoneObj->destroy();
+				unset($vtimezoneObj);
+			} else {
+				// Defaulting to UTC.
+				$calendarTimeZone = new DateTimeZone('UTC');
+			}
+
+			$mergedCalendar = $mergedCalendar->expand($start, $end, $calendarTimeZone);
+		}
+
+		$filenameExtension = '.ics';
+
+		switch ($format) {
+			case 'text/calendar':
+				$mergedCalendar = $mergedCalendar->serialize();
+				$filenameExtension = '.ics';
+				break;
+			case 'application/calendar+json':
+				$mergedCalendar = json_encode($mergedCalendar->jsonSerialize());
+				$filenameExtension = '.json';
+				break;
+		}
+
+		$filename = preg_replace(
+			'/[^a-zA-Z0-9-_ ]/um',
+			'',
+			$calendarNode->getName()
+		);
+		$filename .= '-'.date('Y-m-d').$filenameExtension;
+
+		$response->setHeader('Content-Disposition', 'attachment; filename="'.$filename.'"');
+		$response->setHeader('Content-Type', $format);
+
+		$response->setStatus(200);
+		$response->setBody($mergedCalendar);
+	}
+
+	/**
+	 * Merges all calendar objects, and builds one big iCalendar blob.
+	 *
+	 * @param array $properties Some CalDAV properties
+	 *
+	 * @return VObject\Component\VCalendar
+	 */
+	public function mergeObjects(array $properties, array $inputObjects)
+	{
+		$calendar = new VObject\Component\VCalendar();
+		$calendar->VERSION = '2.0';
+		if (DAV\Server::$exposeVersion) {
+			$calendar->PRODID = '-//SabreDAV//SabreDAV '.DAV\Version::VERSION.'//EN';
+		} else {
+			$calendar->PRODID = '-//SabreDAV//SabreDAV//EN';
+		}
+		if (isset($properties['{DAV:}displayname'])) {
+			$calendar->{'X-WR-CALNAME'} = $properties['{DAV:}displayname'];
+		}
+		if (isset($properties['{http://apple.com/ns/ical/}calendar-color'])) {
+			$calendar->{'X-APPLE-CALENDAR-COLOR'} = $properties['{http://apple.com/ns/ical/}calendar-color'];
+		}
+
+		$collectedTimezones = [];
+
+		$timezones = [];
+		$objects = [];
+
+		foreach ($inputObjects as $href => $inputObject) {
+			$nodeComp = VObject\Reader::read($inputObject);
+
+			foreach ($nodeComp->children() as $child) {
+				switch ($child->name) {
+					case 'VEVENT':
+					case 'VTODO':
+					case 'VJOURNAL':
+						$objects[] = clone $child;
+						break;
+
+					// VTIMEZONE is special, because we need to filter out the duplicates
+					case 'VTIMEZONE':
+						// Naively just checking tzid.
+						if (in_array((string) $child->TZID, $collectedTimezones)) {
+							break;
+						}
+
+						$timezones[] = clone $child;
+						$collectedTimezones[] = $child->TZID;
+						break;
+				}
+			}
+			// Destroy circular references to PHP will GC the object.
+			$nodeComp->destroy();
+			unset($nodeComp);
+		}
+
+		foreach ($timezones as $tz) {
+			$calendar->add($tz);
+		}
+		foreach ($objects as $obj) {
+			$calendar->add($obj);
+		}
+
+		return $calendar;
+	}
+
+	/**
+	 * Returns a plugin name.
+	 *
+	 * Using this name other plugins will be able to access other plugins
+	 * using \Sabre\DAV\Server::getPlugin
+	 *
+	 * @return string
+	 */
+	public function getPluginName()
+	{
+		return 'ics-export';
+	}
+
+	/**
+	 * 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 the ability to export CalDAV calendars as a single iCalendar file.',
+			'link' => 'http://sabre.io/dav/ics-export-plugin/',
+		];
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
     {
         $this->server = $server;
         $server->on('method:GET', [$this, 'httpGet'], 90);
-        $server->on('browserButtonActions', function ($path, $node, &$actions) {
+        $server->on('browserButtonActions', function($path, $node, &$actions) {
             if ($node instanceof ICalendar) {
                 $actions .= '<a href="'.htmlspecialchars($path, ENT_QUOTES, 'UTF-8').'?export"><span class="oi" data-glyph="calendar"></span></a>';
             }
@@ -203,7 +203,7 @@ 
             // queryResult is just a list of base urls. We need to prefix the
             // calendar path.
             $queryResult = array_map(
-                function ($item) use ($path) {
+                function($item) use ($path) {
                     return $path.'/'.$item;
                 },
                 $queryResult

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Backend/BackendInterface.php

Indentation +246 added lines, -246 removed lines

@@ -13,261 +13,261 @@
  */
 interface BackendInterface
 {
-    /**
-     * Returns a list of calendars for a principal.
-     *
-     * Every project is an array with the following keys:
-     *  * id, a unique id that will be used by other functions to modify the
-     *    calendar. This can be the same as the uri or a database key.
-     *  * uri, which is the basename of the uri with which the calendar is
-     *    accessed.
-     *  * principaluri. The owner of the calendar. Almost always the same as
-     *    principalUri passed to this method.
-     *
-     * Furthermore it can contain webdav properties in clark notation. A very
-     * common one is '{DAV:}displayname'.
-     *
-     * Many clients also require:
-     * {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
-     * For this property, you can just return an instance of
-     * Sabre\CalDAV\Property\SupportedCalendarComponentSet.
-     *
-     * If you return {http://sabredav.org/ns}read-only and set the value to 1,
-     * ACL will automatically be put in read-only mode.
-     *
-     * @param string $principalUri
-     *
-     * @return array
-     */
-    public function getCalendarsForUser($principalUri);
+	/**
+	 * Returns a list of calendars for a principal.
+	 *
+	 * Every project is an array with the following keys:
+	 *  * id, a unique id that will be used by other functions to modify the
+	 *    calendar. This can be the same as the uri or a database key.
+	 *  * uri, which is the basename of the uri with which the calendar is
+	 *    accessed.
+	 *  * principaluri. The owner of the calendar. Almost always the same as
+	 *    principalUri passed to this method.
+	 *
+	 * Furthermore it can contain webdav properties in clark notation. A very
+	 * common one is '{DAV:}displayname'.
+	 *
+	 * Many clients also require:
+	 * {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
+	 * For this property, you can just return an instance of
+	 * Sabre\CalDAV\Property\SupportedCalendarComponentSet.
+	 *
+	 * If you return {http://sabredav.org/ns}read-only and set the value to 1,
+	 * ACL will automatically be put in read-only mode.
+	 *
+	 * @param string $principalUri
+	 *
+	 * @return array
+	 */
+	public function getCalendarsForUser($principalUri);
 
-    /**
-     * Creates a new calendar for a principal.
-     *
-     * If the creation was a success, an id must be returned that can be used to
-     * reference this calendar in other methods, such as updateCalendar.
-     *
-     * The id can be any type, including ints, strings, objects or array.
-     *
-     * @param string $principalUri
-     * @param string $calendarUri
-     *
-     * @return mixed
-     */
-    public function createCalendar($principalUri, $calendarUri, array $properties);
+	/**
+	 * Creates a new calendar for a principal.
+	 *
+	 * If the creation was a success, an id must be returned that can be used to
+	 * reference this calendar in other methods, such as updateCalendar.
+	 *
+	 * The id can be any type, including ints, strings, objects or array.
+	 *
+	 * @param string $principalUri
+	 * @param string $calendarUri
+	 *
+	 * @return mixed
+	 */
+	public function createCalendar($principalUri, $calendarUri, array $properties);
 
-    /**
-     * Updates properties for a calendar.
-     *
-     * The list of mutations is stored in a Sabre\DAV\PropPatch object.
-     * To do the actual updates, you must tell this object which properties
-     * you're going to process with the handle() method.
-     *
-     * Calling the handle method is like telling the PropPatch object "I
-     * promise I can handle updating this property".
-     *
-     * Read the PropPatch documentation for more info and examples.
-     *
-     * @param mixed $calendarId
-     */
-    public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch);
+	/**
+	 * Updates properties for a calendar.
+	 *
+	 * The list of mutations is stored in a Sabre\DAV\PropPatch object.
+	 * To do the actual updates, you must tell this object which properties
+	 * you're going to process with the handle() method.
+	 *
+	 * Calling the handle method is like telling the PropPatch object "I
+	 * promise I can handle updating this property".
+	 *
+	 * Read the PropPatch documentation for more info and examples.
+	 *
+	 * @param mixed $calendarId
+	 */
+	public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch);
 
-    /**
-     * Delete a calendar and all its objects.
-     *
-     * @param mixed $calendarId
-     */
-    public function deleteCalendar($calendarId);
+	/**
+	 * Delete a calendar and all its objects.
+	 *
+	 * @param mixed $calendarId
+	 */
+	public function deleteCalendar($calendarId);
 
-    /**
-     * Returns all calendar objects within a calendar.
-     *
-     * Every item contains an array with the following keys:
-     *   * calendardata - The iCalendar-compatible calendar data
-     *   * uri - a unique key which will be used to construct the uri. This can
-     *     be any arbitrary string, but making sure it ends with '.ics' is a
-     *     good idea. This is only the basename, or filename, not the full
-     *     path.
-     *   * lastmodified - a timestamp of the last modification time
-     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
-     *   '"abcdef"')
-     *   * size - The size of the calendar objects, in bytes.
-     *   * component - optional, a string containing the type of object, such
-     *     as 'vevent' or 'vtodo'. If specified, this will be used to populate
-     *     the Content-Type header.
-     *
-     * Note that the etag is optional, but it's highly encouraged to return for
-     * speed reasons.
-     *
-     * The calendardata is also optional. If it's not returned
-     * 'getCalendarObject' will be called later, which *is* expected to return
-     * calendardata.
-     *
-     * If neither etag or size are specified, the calendardata will be
-     * used/fetched to determine these numbers. If both are specified the
-     * amount of times this is needed is reduced by a great degree.
-     *
-     * @param mixed $calendarId
-     *
-     * @return array
-     */
-    public function getCalendarObjects($calendarId);
+	/**
+	 * Returns all calendar objects within a calendar.
+	 *
+	 * Every item contains an array with the following keys:
+	 *   * calendardata - The iCalendar-compatible calendar data
+	 *   * uri - a unique key which will be used to construct the uri. This can
+	 *     be any arbitrary string, but making sure it ends with '.ics' is a
+	 *     good idea. This is only the basename, or filename, not the full
+	 *     path.
+	 *   * lastmodified - a timestamp of the last modification time
+	 *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
+	 *   '"abcdef"')
+	 *   * size - The size of the calendar objects, in bytes.
+	 *   * component - optional, a string containing the type of object, such
+	 *     as 'vevent' or 'vtodo'. If specified, this will be used to populate
+	 *     the Content-Type header.
+	 *
+	 * Note that the etag is optional, but it's highly encouraged to return for
+	 * speed reasons.
+	 *
+	 * The calendardata is also optional. If it's not returned
+	 * 'getCalendarObject' will be called later, which *is* expected to return
+	 * calendardata.
+	 *
+	 * If neither etag or size are specified, the calendardata will be
+	 * used/fetched to determine these numbers. If both are specified the
+	 * amount of times this is needed is reduced by a great degree.
+	 *
+	 * @param mixed $calendarId
+	 *
+	 * @return array
+	 */
+	public function getCalendarObjects($calendarId);
 
-    /**
-     * Returns information from a single calendar object, based on it's object
-     * uri.
-     *
-     * The object uri is only the basename, or filename and not a full path.
-     *
-     * The returned array must have the same keys as getCalendarObjects. The
-     * 'calendardata' object is required here though, while it's not required
-     * for getCalendarObjects.
-     *
-     * This method must return null if the object did not exist.
-     *
-     * @param mixed  $calendarId
-     * @param string $objectUri
-     *
-     * @return array|null
-     */
-    public function getCalendarObject($calendarId, $objectUri);
+	/**
+	 * Returns information from a single calendar object, based on it's object
+	 * uri.
+	 *
+	 * The object uri is only the basename, or filename and not a full path.
+	 *
+	 * The returned array must have the same keys as getCalendarObjects. The
+	 * 'calendardata' object is required here though, while it's not required
+	 * for getCalendarObjects.
+	 *
+	 * This method must return null if the object did not exist.
+	 *
+	 * @param mixed  $calendarId
+	 * @param string $objectUri
+	 *
+	 * @return array|null
+	 */
+	public function getCalendarObject($calendarId, $objectUri);
 
-    /**
-     * Returns a list of calendar objects.
-     *
-     * This method should work identical to getCalendarObject, but instead
-     * return all the calendar objects in the list as an array.
-     *
-     * If the backend supports this, it may allow for some speed-ups.
-     *
-     * @param mixed $calendarId
-     *
-     * @return array
-     */
-    public function getMultipleCalendarObjects($calendarId, array $uris);
+	/**
+	 * Returns a list of calendar objects.
+	 *
+	 * This method should work identical to getCalendarObject, but instead
+	 * return all the calendar objects in the list as an array.
+	 *
+	 * If the backend supports this, it may allow for some speed-ups.
+	 *
+	 * @param mixed $calendarId
+	 *
+	 * @return array
+	 */
+	public function getMultipleCalendarObjects($calendarId, array $uris);
 
-    /**
-     * Creates a new calendar object.
-     *
-     * The object uri is only the basename, or filename and not a full path.
-     *
-     * It is possible to return an etag from this function, which will be used
-     * in the response to this PUT request. Note that the ETag must be
-     * surrounded by double-quotes.
-     *
-     * However, you should only really return this ETag if you don't mangle the
-     * calendar-data. If the result of a subsequent GET to this object is not
-     * the exact same as this request body, you should omit the ETag.
-     *
-     * @param mixed  $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     *
-     * @return string|null
-     */
-    public function createCalendarObject($calendarId, $objectUri, $calendarData);
+	/**
+	 * Creates a new calendar object.
+	 *
+	 * The object uri is only the basename, or filename and not a full path.
+	 *
+	 * It is possible to return an etag from this function, which will be used
+	 * in the response to this PUT request. Note that the ETag must be
+	 * surrounded by double-quotes.
+	 *
+	 * However, you should only really return this ETag if you don't mangle the
+	 * calendar-data. If the result of a subsequent GET to this object is not
+	 * the exact same as this request body, you should omit the ETag.
+	 *
+	 * @param mixed  $calendarId
+	 * @param string $objectUri
+	 * @param string $calendarData
+	 *
+	 * @return string|null
+	 */
+	public function createCalendarObject($calendarId, $objectUri, $calendarData);
 
-    /**
-     * Updates an existing calendarobject, based on it's uri.
-     *
-     * The object uri is only the basename, or filename and not a full path.
-     *
-     * It is possible return an etag from this function, which will be used in
-     * the response to this PUT request. Note that the ETag must be surrounded
-     * by double-quotes.
-     *
-     * However, you should only really return this ETag if you don't mangle the
-     * calendar-data. If the result of a subsequent GET to this object is not
-     * the exact same as this request body, you should omit the ETag.
-     *
-     * @param mixed  $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     *
-     * @return string|null
-     */
-    public function updateCalendarObject($calendarId, $objectUri, $calendarData);
+	/**
+	 * Updates an existing calendarobject, based on it's uri.
+	 *
+	 * The object uri is only the basename, or filename and not a full path.
+	 *
+	 * It is possible return an etag from this function, which will be used in
+	 * the response to this PUT request. Note that the ETag must be surrounded
+	 * by double-quotes.
+	 *
+	 * However, you should only really return this ETag if you don't mangle the
+	 * calendar-data. If the result of a subsequent GET to this object is not
+	 * the exact same as this request body, you should omit the ETag.
+	 *
+	 * @param mixed  $calendarId
+	 * @param string $objectUri
+	 * @param string $calendarData
+	 *
+	 * @return string|null
+	 */
+	public function updateCalendarObject($calendarId, $objectUri, $calendarData);
 
-    /**
-     * Deletes an existing calendar object.
-     *
-     * The object uri is only the basename, or filename and not a full path.
-     *
-     * @param mixed  $calendarId
-     * @param string $objectUri
-     */
-    public function deleteCalendarObject($calendarId, $objectUri);
+	/**
+	 * Deletes an existing calendar object.
+	 *
+	 * The object uri is only the basename, or filename and not a full path.
+	 *
+	 * @param mixed  $calendarId
+	 * @param string $objectUri
+	 */
+	public function deleteCalendarObject($calendarId, $objectUri);
 
-    /**
-     * Performs a calendar-query on the contents of this calendar.
-     *
-     * The calendar-query is defined in RFC4791 : CalDAV. Using the
-     * calendar-query it is possible for a client to request a specific set of
-     * object, based on contents of iCalendar properties, date-ranges and
-     * iCalendar component types (VTODO, VEVENT).
-     *
-     * This method should just return a list of (relative) urls that match this
-     * query.
-     *
-     * The list of filters are specified as an array. The exact array is
-     * documented by Sabre\CalDAV\CalendarQueryParser.
-     *
-     * Note that it is extremely likely that getCalendarObject for every path
-     * returned from this method will be called almost immediately after. You
-     * may want to anticipate this to speed up these requests.
-     *
-     * This method provides a default implementation, which parses *all* the
-     * iCalendar objects in the specified calendar.
-     *
-     * This default may well be good enough for personal use, and calendars
-     * that aren't very large. But if you anticipate high usage, big calendars
-     * or high loads, you are strongly adviced to optimize certain paths.
-     *
-     * The best way to do so is override this method and to optimize
-     * specifically for 'common filters'.
-     *
-     * Requests that are extremely common are:
-     *   * requests for just VEVENTS
-     *   * requests for just VTODO
-     *   * requests with a time-range-filter on either VEVENT or VTODO.
-     *
-     * ..and combinations of these requests. It may not be worth it to try to
-     * handle every possible situation and just rely on the (relatively
-     * easy to use) CalendarQueryValidator to handle the rest.
-     *
-     * Note that especially time-range-filters may be difficult to parse. A
-     * time-range filter specified on a VEVENT must for instance also handle
-     * recurrence rules correctly.
-     * A good example of how to interprete all these filters can also simply
-     * be found in Sabre\CalDAV\CalendarQueryFilter. This class is as correct
-     * as possible, so it gives you a good idea on what type of stuff you need
-     * to think of.
-     *
-     * @param mixed $calendarId
-     *
-     * @return array
-     */
-    public function calendarQuery($calendarId, array $filters);
+	/**
+	 * Performs a calendar-query on the contents of this calendar.
+	 *
+	 * The calendar-query is defined in RFC4791 : CalDAV. Using the
+	 * calendar-query it is possible for a client to request a specific set of
+	 * object, based on contents of iCalendar properties, date-ranges and
+	 * iCalendar component types (VTODO, VEVENT).
+	 *
+	 * This method should just return a list of (relative) urls that match this
+	 * query.
+	 *
+	 * The list of filters are specified as an array. The exact array is
+	 * documented by Sabre\CalDAV\CalendarQueryParser.
+	 *
+	 * Note that it is extremely likely that getCalendarObject for every path
+	 * returned from this method will be called almost immediately after. You
+	 * may want to anticipate this to speed up these requests.
+	 *
+	 * This method provides a default implementation, which parses *all* the
+	 * iCalendar objects in the specified calendar.
+	 *
+	 * This default may well be good enough for personal use, and calendars
+	 * that aren't very large. But if you anticipate high usage, big calendars
+	 * or high loads, you are strongly adviced to optimize certain paths.
+	 *
+	 * The best way to do so is override this method and to optimize
+	 * specifically for 'common filters'.
+	 *
+	 * Requests that are extremely common are:
+	 *   * requests for just VEVENTS
+	 *   * requests for just VTODO
+	 *   * requests with a time-range-filter on either VEVENT or VTODO.
+	 *
+	 * ..and combinations of these requests. It may not be worth it to try to
+	 * handle every possible situation and just rely on the (relatively
+	 * easy to use) CalendarQueryValidator to handle the rest.
+	 *
+	 * Note that especially time-range-filters may be difficult to parse. A
+	 * time-range filter specified on a VEVENT must for instance also handle
+	 * recurrence rules correctly.
+	 * A good example of how to interprete all these filters can also simply
+	 * be found in Sabre\CalDAV\CalendarQueryFilter. This class is as correct
+	 * as possible, so it gives you a good idea on what type of stuff you need
+	 * to think of.
+	 *
+	 * @param mixed $calendarId
+	 *
+	 * @return array
+	 */
+	public function calendarQuery($calendarId, array $filters);
 
-    /**
-     * Searches through all of a users calendars and calendar objects to find
-     * an object with a specific UID.
-     *
-     * This method should return the path to this object, relative to the
-     * calendar home, so this path usually only contains two parts:
-     *
-     * calendarpath/objectpath.ics
-     *
-     * If the uid is not found, return null.
-     *
-     * This method should only consider * objects that the principal owns, so
-     * any calendars owned by other principals that also appear in this
-     * collection should be ignored.
-     *
-     * @param string $principalUri
-     * @param string $uid
-     *
-     * @return string|null
-     */
-    public function getCalendarObjectByUID($principalUri, $uid);
+	/**
+	 * Searches through all of a users calendars and calendar objects to find
+	 * an object with a specific UID.
+	 *
+	 * This method should return the path to this object, relative to the
+	 * calendar home, so this path usually only contains two parts:
+	 *
+	 * calendarpath/objectpath.ics
+	 *
+	 * If the uid is not found, return null.
+	 *
+	 * This method should only consider * objects that the principal owns, so
+	 * any calendars owned by other principals that also appear in this
+	 * collection should be ignored.
+	 *
+	 * @param string $principalUri
+	 * @param string $uid
+	 *
+	 * @return string|null
+	 */
+	public function getCalendarObjectByUID($principalUri, $uid);
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Backend/NotificationSupport.php

Indentation +31 added lines, -31 removed lines

@@ -26,37 +26,37 @@
  */
 interface NotificationSupport extends BackendInterface
 {
-    /**
-     * Returns a list of notifications for a given principal url.
-     *
-     * @param string $principalUri
-     *
-     * @return NotificationInterface[]
-     */
-    public function getNotificationsForPrincipal($principalUri);
+	/**
+	 * Returns a list of notifications for a given principal url.
+	 *
+	 * @param string $principalUri
+	 *
+	 * @return NotificationInterface[]
+	 */
+	public function getNotificationsForPrincipal($principalUri);
 
-    /**
-     * This deletes a specific notifcation.
-     *
-     * This may be called by a client once it deems a notification handled.
-     *
-     * @param string $principalUri
-     */
-    public function deleteNotification($principalUri, NotificationInterface $notification);
+	/**
+	 * This deletes a specific notifcation.
+	 *
+	 * This may be called by a client once it deems a notification handled.
+	 *
+	 * @param string $principalUri
+	 */
+	public function deleteNotification($principalUri, NotificationInterface $notification);
 
-    /**
-     * This method is called when a user replied to a request to share.
-     *
-     * If the user chose to accept the share, this method should return the
-     * newly created calendar url.
-     *
-     * @param string $href        The sharee who is replying (often a mailto: address)
-     * @param int    $status      One of the SharingPlugin::STATUS_* constants
-     * @param string $calendarUri The url to the calendar thats being shared
-     * @param string $inReplyTo   The unique id this message is a response to
-     * @param string $summary     A description of the reply
-     *
-     * @return string|null
-     */
-    public function shareReply($href, $status, $calendarUri, $inReplyTo, $summary = null);
+	/**
+	 * This method is called when a user replied to a request to share.
+	 *
+	 * If the user chose to accept the share, this method should return the
+	 * newly created calendar url.
+	 *
+	 * @param string $href        The sharee who is replying (often a mailto: address)
+	 * @param int    $status      One of the SharingPlugin::STATUS_* constants
+	 * @param string $calendarUri The url to the calendar thats being shared
+	 * @param string $inReplyTo   The unique id this message is a response to
+	 * @param string $summary     A description of the reply
+	 *
+	 * @return string|null
+	 */
+	public function shareReply($href, $status, $calendarUri, $inReplyTo, $summary = null);
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
      */
     public function getMultipleCalendarObjects($calendarId, array $uris)
     {
-        return array_map(function ($uri) use ($calendarId) {
+        return array_map(function($uri) use ($calendarId) {
             return $this->getCalendarObject($calendarId, $uri);
         }, $uris);
     }

Indentation +195 added lines, -195 removed lines

@@ -18,199 +18,199 @@
  */
 abstract class AbstractBackend implements BackendInterface
 {
-    /**
-     * Updates properties for a calendar.
-     *
-     * The list of mutations is stored in a Sabre\DAV\PropPatch object.
-     * To do the actual updates, you must tell this object which properties
-     * you're going to process with the handle() method.
-     *
-     * Calling the handle method is like telling the PropPatch object "I
-     * promise I can handle updating this property".
-     *
-     * Read the PropPatch documentation for more info and examples.
-     *
-     * @param mixed $calendarId
-     */
-    public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch)
-    {
-    }
-
-    /**
-     * Returns a list of calendar objects.
-     *
-     * This method should work identical to getCalendarObject, but instead
-     * return all the calendar objects in the list as an array.
-     *
-     * If the backend supports this, it may allow for some speed-ups.
-     *
-     * @param mixed $calendarId
-     *
-     * @return array
-     */
-    public function getMultipleCalendarObjects($calendarId, array $uris)
-    {
-        return array_map(function ($uri) use ($calendarId) {
-            return $this->getCalendarObject($calendarId, $uri);
-        }, $uris);
-    }
-
-    /**
-     * Performs a calendar-query on the contents of this calendar.
-     *
-     * The calendar-query is defined in RFC4791 : CalDAV. Using the
-     * calendar-query it is possible for a client to request a specific set of
-     * object, based on contents of iCalendar properties, date-ranges and
-     * iCalendar component types (VTODO, VEVENT).
-     *
-     * This method should just return a list of (relative) urls that match this
-     * query.
-     *
-     * The list of filters are specified as an array. The exact array is
-     * documented by \Sabre\CalDAV\CalendarQueryParser.
-     *
-     * Note that it is extremely likely that getCalendarObject for every path
-     * returned from this method will be called almost immediately after. You
-     * may want to anticipate this to speed up these requests.
-     *
-     * This method provides a default implementation, which parses *all* the
-     * iCalendar objects in the specified calendar.
-     *
-     * This default may well be good enough for personal use, and calendars
-     * that aren't very large. But if you anticipate high usage, big calendars
-     * or high loads, you are strongly advised to optimize certain paths.
-     *
-     * The best way to do so is override this method and to optimize
-     * specifically for 'common filters'.
-     *
-     * Requests that are extremely common are:
-     *   * requests for just VEVENTS
-     *   * requests for just VTODO
-     *   * requests with a time-range-filter on either VEVENT or VTODO.
-     *
-     * ..and combinations of these requests. It may not be worth it to try to
-     * handle every possible situation and just rely on the (relatively
-     * easy to use) CalendarQueryValidator to handle the rest.
-     *
-     * Note that especially time-range-filters may be difficult to parse. A
-     * time-range filter specified on a VEVENT must for instance also handle
-     * recurrence rules correctly.
-     * A good example of how to interpret all these filters can also simply
-     * be found in \Sabre\CalDAV\CalendarQueryFilter. This class is as correct
-     * as possible, so it gives you a good idea on what type of stuff you need
-     * to think of.
-     *
-     * @param mixed $calendarId
-     *
-     * @return array
-     */
-    public function calendarQuery($calendarId, array $filters)
-    {
-        $result = [];
-        $objects = $this->getCalendarObjects($calendarId);
-
-        foreach ($objects as $object) {
-            if ($this->validateFilterForObject($object, $filters)) {
-                $result[] = $object['uri'];
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * This method validates if a filter (as passed to calendarQuery) matches
-     * the given object.
-     *
-     * @return bool
-     */
-    protected function validateFilterForObject(array $object, array $filters)
-    {
-        // Unfortunately, setting the 'calendardata' here is optional. If
-        // it was excluded, we actually need another call to get this as
-        // well.
-        if (!isset($object['calendardata'])) {
-            $object = $this->getCalendarObject($object['calendarid'], $object['uri']);
-        }
-
-        $vObject = VObject\Reader::read($object['calendardata']);
-
-        $validator = new CalDAV\CalendarQueryValidator();
-        $result = $validator->validate($vObject, $filters);
-
-        // Destroy circular references so PHP will GC the object.
-        $vObject->destroy();
-
-        return $result;
-    }
-
-    /**
-     * Searches through all of a users calendars and calendar objects to find
-     * an object with a specific UID.
-     *
-     * This method should return the path to this object, relative to the
-     * calendar home, so this path usually only contains two parts:
-     *
-     * calendarpath/objectpath.ics
-     *
-     * If the uid is not found, return null.
-     *
-     * This method should only consider * objects that the principal owns, so
-     * any calendars owned by other principals that also appear in this
-     * collection should be ignored.
-     *
-     * @param string $principalUri
-     * @param string $uid
-     *
-     * @return string|null
-     */
-    public function getCalendarObjectByUID($principalUri, $uid)
-    {
-        // Note: this is a super slow naive implementation of this method. You
-        // are highly recommended to optimize it, if your backend allows it.
-        foreach ($this->getCalendarsForUser($principalUri) as $calendar) {
-            // We must ignore calendars owned by other principals.
-            if ($calendar['principaluri'] !== $principalUri) {
-                continue;
-            }
-
-            // Ignore calendars that are shared.
-            if (isset($calendar['{http://sabredav.org/ns}owner-principal']) && $calendar['{http://sabredav.org/ns}owner-principal'] !== $principalUri) {
-                continue;
-            }
-
-            $results = $this->calendarQuery(
-                $calendar['id'],
-                [
-                    'name' => 'VCALENDAR',
-                    'prop-filters' => [],
-                    'comp-filters' => [
-                        [
-                            'name' => 'VEVENT',
-                            'is-not-defined' => false,
-                            'time-range' => null,
-                            'comp-filters' => [],
-                            'prop-filters' => [
-                                [
-                                    'name' => 'UID',
-                                    'is-not-defined' => false,
-                                    'time-range' => null,
-                                    'text-match' => [
-                                        'value' => $uid,
-                                        'negate-condition' => false,
-                                        'collation' => 'i;octet',
-                                    ],
-                                    'param-filters' => [],
-                                ],
-                            ],
-                        ],
-                    ],
-                ]
-            );
-            if ($results) {
-                // We have a match
-                return $calendar['uri'].'/'.$results[0];
-            }
-        }
-    }
+	/**
+	 * Updates properties for a calendar.
+	 *
+	 * The list of mutations is stored in a Sabre\DAV\PropPatch object.
+	 * To do the actual updates, you must tell this object which properties
+	 * you're going to process with the handle() method.
+	 *
+	 * Calling the handle method is like telling the PropPatch object "I
+	 * promise I can handle updating this property".
+	 *
+	 * Read the PropPatch documentation for more info and examples.
+	 *
+	 * @param mixed $calendarId
+	 */
+	public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch)
+	{
+	}
+
+	/**
+	 * Returns a list of calendar objects.
+	 *
+	 * This method should work identical to getCalendarObject, but instead
+	 * return all the calendar objects in the list as an array.
+	 *
+	 * If the backend supports this, it may allow for some speed-ups.
+	 *
+	 * @param mixed $calendarId
+	 *
+	 * @return array
+	 */
+	public function getMultipleCalendarObjects($calendarId, array $uris)
+	{
+		return array_map(function ($uri) use ($calendarId) {
+			return $this->getCalendarObject($calendarId, $uri);
+		}, $uris);
+	}
+
+	/**
+	 * Performs a calendar-query on the contents of this calendar.
+	 *
+	 * The calendar-query is defined in RFC4791 : CalDAV. Using the
+	 * calendar-query it is possible for a client to request a specific set of
+	 * object, based on contents of iCalendar properties, date-ranges and
+	 * iCalendar component types (VTODO, VEVENT).
+	 *
+	 * This method should just return a list of (relative) urls that match this
+	 * query.
+	 *
+	 * The list of filters are specified as an array. The exact array is
+	 * documented by \Sabre\CalDAV\CalendarQueryParser.
+	 *
+	 * Note that it is extremely likely that getCalendarObject for every path
+	 * returned from this method will be called almost immediately after. You
+	 * may want to anticipate this to speed up these requests.
+	 *
+	 * This method provides a default implementation, which parses *all* the
+	 * iCalendar objects in the specified calendar.
+	 *
+	 * This default may well be good enough for personal use, and calendars
+	 * that aren't very large. But if you anticipate high usage, big calendars
+	 * or high loads, you are strongly advised to optimize certain paths.
+	 *
+	 * The best way to do so is override this method and to optimize
+	 * specifically for 'common filters'.
+	 *
+	 * Requests that are extremely common are:
+	 *   * requests for just VEVENTS
+	 *   * requests for just VTODO
+	 *   * requests with a time-range-filter on either VEVENT or VTODO.
+	 *
+	 * ..and combinations of these requests. It may not be worth it to try to
+	 * handle every possible situation and just rely on the (relatively
+	 * easy to use) CalendarQueryValidator to handle the rest.
+	 *
+	 * Note that especially time-range-filters may be difficult to parse. A
+	 * time-range filter specified on a VEVENT must for instance also handle
+	 * recurrence rules correctly.
+	 * A good example of how to interpret all these filters can also simply
+	 * be found in \Sabre\CalDAV\CalendarQueryFilter. This class is as correct
+	 * as possible, so it gives you a good idea on what type of stuff you need
+	 * to think of.
+	 *
+	 * @param mixed $calendarId
+	 *
+	 * @return array
+	 */
+	public function calendarQuery($calendarId, array $filters)
+	{
+		$result = [];
+		$objects = $this->getCalendarObjects($calendarId);
+
+		foreach ($objects as $object) {
+			if ($this->validateFilterForObject($object, $filters)) {
+				$result[] = $object['uri'];
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * This method validates if a filter (as passed to calendarQuery) matches
+	 * the given object.
+	 *
+	 * @return bool
+	 */
+	protected function validateFilterForObject(array $object, array $filters)
+	{
+		// Unfortunately, setting the 'calendardata' here is optional. If
+		// it was excluded, we actually need another call to get this as
+		// well.
+		if (!isset($object['calendardata'])) {
+			$object = $this->getCalendarObject($object['calendarid'], $object['uri']);
+		}
+
+		$vObject = VObject\Reader::read($object['calendardata']);
+
+		$validator = new CalDAV\CalendarQueryValidator();
+		$result = $validator->validate($vObject, $filters);
+
+		// Destroy circular references so PHP will GC the object.
+		$vObject->destroy();
+
+		return $result;
+	}
+
+	/**
+	 * Searches through all of a users calendars and calendar objects to find
+	 * an object with a specific UID.
+	 *
+	 * This method should return the path to this object, relative to the
+	 * calendar home, so this path usually only contains two parts:
+	 *
+	 * calendarpath/objectpath.ics
+	 *
+	 * If the uid is not found, return null.
+	 *
+	 * This method should only consider * objects that the principal owns, so
+	 * any calendars owned by other principals that also appear in this
+	 * collection should be ignored.
+	 *
+	 * @param string $principalUri
+	 * @param string $uid
+	 *
+	 * @return string|null
+	 */
+	public function getCalendarObjectByUID($principalUri, $uid)
+	{
+		// Note: this is a super slow naive implementation of this method. You
+		// are highly recommended to optimize it, if your backend allows it.
+		foreach ($this->getCalendarsForUser($principalUri) as $calendar) {
+			// We must ignore calendars owned by other principals.
+			if ($calendar['principaluri'] !== $principalUri) {
+				continue;
+			}
+
+			// Ignore calendars that are shared.
+			if (isset($calendar['{http://sabredav.org/ns}owner-principal']) && $calendar['{http://sabredav.org/ns}owner-principal'] !== $principalUri) {
+				continue;
+			}
+
+			$results = $this->calendarQuery(
+				$calendar['id'],
+				[
+					'name' => 'VCALENDAR',
+					'prop-filters' => [],
+					'comp-filters' => [
+						[
+							'name' => 'VEVENT',
+							'is-not-defined' => false,
+							'time-range' => null,
+							'comp-filters' => [],
+							'prop-filters' => [
+								[
+									'name' => 'UID',
+									'is-not-defined' => false,
+									'time-range' => null,
+									'text-match' => [
+										'value' => $uid,
+										'negate-condition' => false,
+										'collation' => 'i;octet',
+									],
+									'param-filters' => [],
+								],
+							],
+						],
+					],
+				]
+			);
+			if ($results) {
+				// We have a match
+				return $calendar['uri'].'/'.$results[0];
+			}
+		}
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Backend/SimplePDO.php

Indentation +232 added lines, -232 removed lines

@@ -35,255 +35,255 @@
  */
 class SimplePDO extends AbstractBackend
 {
-    /**
-     * pdo.
-     *
-     * @var \PDO
-     */
-    protected $pdo;
+	/**
+	 * pdo.
+	 *
+	 * @var \PDO
+	 */
+	protected $pdo;
 
-    /**
-     * Creates the backend.
-     */
-    public function __construct(\PDO $pdo)
-    {
-        $this->pdo = $pdo;
-    }
+	/**
+	 * Creates the backend.
+	 */
+	public function __construct(\PDO $pdo)
+	{
+		$this->pdo = $pdo;
+	}
 
-    /**
-     * Returns a list of calendars for a principal.
-     *
-     * Every project is an array with the following keys:
-     *  * id, a unique id that will be used by other functions to modify the
-     *    calendar. This can be the same as the uri or a database key.
-     *  * uri. This is just the 'base uri' or 'filename' of the calendar.
-     *  * principaluri. The owner of the calendar. Almost always the same as
-     *    principalUri passed to this method.
-     *
-     * Furthermore it can contain webdav properties in clark notation. A very
-     * common one is '{DAV:}displayname'.
-     *
-     * Many clients also require:
-     * {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
-     * For this property, you can just return an instance of
-     * Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet.
-     *
-     * If you return {http://sabredav.org/ns}read-only and set the value to 1,
-     * ACL will automatically be put in read-only mode.
-     *
-     * @param string $principalUri
-     *
-     * @return array
-     */
-    public function getCalendarsForUser($principalUri)
-    {
-        // Making fields a comma-delimited list
-        $stmt = $this->pdo->prepare('SELECT id, uri FROM simple_calendars WHERE principaluri = ? ORDER BY id ASC');
-        $stmt->execute([$principalUri]);
+	/**
+	 * Returns a list of calendars for a principal.
+	 *
+	 * Every project is an array with the following keys:
+	 *  * id, a unique id that will be used by other functions to modify the
+	 *    calendar. This can be the same as the uri or a database key.
+	 *  * uri. This is just the 'base uri' or 'filename' of the calendar.
+	 *  * principaluri. The owner of the calendar. Almost always the same as
+	 *    principalUri passed to this method.
+	 *
+	 * Furthermore it can contain webdav properties in clark notation. A very
+	 * common one is '{DAV:}displayname'.
+	 *
+	 * Many clients also require:
+	 * {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
+	 * For this property, you can just return an instance of
+	 * Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet.
+	 *
+	 * If you return {http://sabredav.org/ns}read-only and set the value to 1,
+	 * ACL will automatically be put in read-only mode.
+	 *
+	 * @param string $principalUri
+	 *
+	 * @return array
+	 */
+	public function getCalendarsForUser($principalUri)
+	{
+		// Making fields a comma-delimited list
+		$stmt = $this->pdo->prepare('SELECT id, uri FROM simple_calendars WHERE principaluri = ? ORDER BY id ASC');
+		$stmt->execute([$principalUri]);
 
-        $calendars = [];
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-            $calendars[] = [
-                'id' => $row['id'],
-                'uri' => $row['uri'],
-                'principaluri' => $principalUri,
-            ];
-        }
+		$calendars = [];
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+			$calendars[] = [
+				'id' => $row['id'],
+				'uri' => $row['uri'],
+				'principaluri' => $principalUri,
+			];
+		}
 
-        return $calendars;
-    }
+		return $calendars;
+	}
 
-    /**
-     * Creates a new calendar for a principal.
-     *
-     * If the creation was a success, an id must be returned that can be used
-     * to reference this calendar in other methods, such as updateCalendar.
-     *
-     * @param string $principalUri
-     * @param string $calendarUri
-     *
-     * @return string
-     */
-    public function createCalendar($principalUri, $calendarUri, array $properties)
-    {
-        $stmt = $this->pdo->prepare('INSERT INTO simple_calendars (principaluri, uri) VALUES (?, ?)');
-        $stmt->execute([$principalUri, $calendarUri]);
+	/**
+	 * Creates a new calendar for a principal.
+	 *
+	 * If the creation was a success, an id must be returned that can be used
+	 * to reference this calendar in other methods, such as updateCalendar.
+	 *
+	 * @param string $principalUri
+	 * @param string $calendarUri
+	 *
+	 * @return string
+	 */
+	public function createCalendar($principalUri, $calendarUri, array $properties)
+	{
+		$stmt = $this->pdo->prepare('INSERT INTO simple_calendars (principaluri, uri) VALUES (?, ?)');
+		$stmt->execute([$principalUri, $calendarUri]);
 
-        return $this->pdo->lastInsertId();
-    }
+		return $this->pdo->lastInsertId();
+	}
 
-    /**
-     * Delete a calendar and all it's objects.
-     *
-     * @param string $calendarId
-     */
-    public function deleteCalendar($calendarId)
-    {
-        $stmt = $this->pdo->prepare('DELETE FROM simple_calendarobjects WHERE calendarid = ?');
-        $stmt->execute([$calendarId]);
+	/**
+	 * Delete a calendar and all it's objects.
+	 *
+	 * @param string $calendarId
+	 */
+	public function deleteCalendar($calendarId)
+	{
+		$stmt = $this->pdo->prepare('DELETE FROM simple_calendarobjects WHERE calendarid = ?');
+		$stmt->execute([$calendarId]);
 
-        $stmt = $this->pdo->prepare('DELETE FROM simple_calendars WHERE id = ?');
-        $stmt->execute([$calendarId]);
-    }
+		$stmt = $this->pdo->prepare('DELETE FROM simple_calendars WHERE id = ?');
+		$stmt->execute([$calendarId]);
+	}
 
-    /**
-     * Returns all calendar objects within a calendar.
-     *
-     * Every item contains an array with the following keys:
-     *   * calendardata - The iCalendar-compatible calendar data
-     *   * uri - a unique key which will be used to construct the uri. This can
-     *     be any arbitrary string, but making sure it ends with '.ics' is a
-     *     good idea. This is only the basename, or filename, not the full
-     *     path.
-     *   * lastmodified - a timestamp of the last modification time
-     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
-     *   '  "abcdef"')
-     *   * size - The size of the calendar objects, in bytes.
-     *   * component - optional, a string containing the type of object, such
-     *     as 'vevent' or 'vtodo'. If specified, this will be used to populate
-     *     the Content-Type header.
-     *
-     * Note that the etag is optional, but it's highly encouraged to return for
-     * speed reasons.
-     *
-     * The calendardata is also optional. If it's not returned
-     * 'getCalendarObject' will be called later, which *is* expected to return
-     * calendardata.
-     *
-     * If neither etag or size are specified, the calendardata will be
-     * used/fetched to determine these numbers. If both are specified the
-     * amount of times this is needed is reduced by a great degree.
-     *
-     * @param string $calendarId
-     *
-     * @return array
-     */
-    public function getCalendarObjects($calendarId)
-    {
-        $stmt = $this->pdo->prepare('SELECT id, uri, calendardata FROM simple_calendarobjects WHERE calendarid = ?');
-        $stmt->execute([$calendarId]);
+	/**
+	 * Returns all calendar objects within a calendar.
+	 *
+	 * Every item contains an array with the following keys:
+	 *   * calendardata - The iCalendar-compatible calendar data
+	 *   * uri - a unique key which will be used to construct the uri. This can
+	 *     be any arbitrary string, but making sure it ends with '.ics' is a
+	 *     good idea. This is only the basename, or filename, not the full
+	 *     path.
+	 *   * lastmodified - a timestamp of the last modification time
+	 *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
+	 *   '  "abcdef"')
+	 *   * size - The size of the calendar objects, in bytes.
+	 *   * component - optional, a string containing the type of object, such
+	 *     as 'vevent' or 'vtodo'. If specified, this will be used to populate
+	 *     the Content-Type header.
+	 *
+	 * Note that the etag is optional, but it's highly encouraged to return for
+	 * speed reasons.
+	 *
+	 * The calendardata is also optional. If it's not returned
+	 * 'getCalendarObject' will be called later, which *is* expected to return
+	 * calendardata.
+	 *
+	 * If neither etag or size are specified, the calendardata will be
+	 * used/fetched to determine these numbers. If both are specified the
+	 * amount of times this is needed is reduced by a great degree.
+	 *
+	 * @param string $calendarId
+	 *
+	 * @return array
+	 */
+	public function getCalendarObjects($calendarId)
+	{
+		$stmt = $this->pdo->prepare('SELECT id, uri, calendardata FROM simple_calendarobjects WHERE calendarid = ?');
+		$stmt->execute([$calendarId]);
 
-        $result = [];
-        foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
-            $result[] = [
-                'id' => $row['id'],
-                'uri' => $row['uri'],
-                'etag' => '"'.md5($row['calendardata']).'"',
-                'calendarid' => $calendarId,
-                'size' => strlen($row['calendardata']),
-                'calendardata' => $row['calendardata'],
-            ];
-        }
+		$result = [];
+		foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
+			$result[] = [
+				'id' => $row['id'],
+				'uri' => $row['uri'],
+				'etag' => '"'.md5($row['calendardata']).'"',
+				'calendarid' => $calendarId,
+				'size' => strlen($row['calendardata']),
+				'calendardata' => $row['calendardata'],
+			];
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Returns information from a single calendar object, based on it's object
-     * uri.
-     *
-     * The object uri is only the basename, or filename and not a full path.
-     *
-     * The returned array must have the same keys as getCalendarObjects. The
-     * 'calendardata' object is required here though, while it's not required
-     * for getCalendarObjects.
-     *
-     * This method must return null if the object did not exist.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     *
-     * @return array|null
-     */
-    public function getCalendarObject($calendarId, $objectUri)
-    {
-        $stmt = $this->pdo->prepare('SELECT id, uri, calendardata FROM simple_calendarobjects WHERE calendarid = ? AND uri = ?');
-        $stmt->execute([$calendarId, $objectUri]);
-        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+	/**
+	 * Returns information from a single calendar object, based on it's object
+	 * uri.
+	 *
+	 * The object uri is only the basename, or filename and not a full path.
+	 *
+	 * The returned array must have the same keys as getCalendarObjects. The
+	 * 'calendardata' object is required here though, while it's not required
+	 * for getCalendarObjects.
+	 *
+	 * This method must return null if the object did not exist.
+	 *
+	 * @param string $calendarId
+	 * @param string $objectUri
+	 *
+	 * @return array|null
+	 */
+	public function getCalendarObject($calendarId, $objectUri)
+	{
+		$stmt = $this->pdo->prepare('SELECT id, uri, calendardata FROM simple_calendarobjects WHERE calendarid = ? AND uri = ?');
+		$stmt->execute([$calendarId, $objectUri]);
+		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-        if (!$row) {
-            return null;
-        }
+		if (!$row) {
+			return null;
+		}
 
-        return [
-            'id' => $row['id'],
-            'uri' => $row['uri'],
-            'etag' => '"'.md5($row['calendardata']).'"',
-            'calendarid' => $calendarId,
-            'size' => strlen($row['calendardata']),
-            'calendardata' => $row['calendardata'],
-         ];
-    }
+		return [
+			'id' => $row['id'],
+			'uri' => $row['uri'],
+			'etag' => '"'.md5($row['calendardata']).'"',
+			'calendarid' => $calendarId,
+			'size' => strlen($row['calendardata']),
+			'calendardata' => $row['calendardata'],
+		 ];
+	}
 
-    /**
-     * Creates a new calendar object.
-     *
-     * The object uri is only the basename, or filename and not a full path.
-     *
-     * It is possible return an etag from this function, which will be used in
-     * the response to this PUT request. Note that the ETag must be surrounded
-     * by double-quotes.
-     *
-     * However, you should only really return this ETag if you don't mangle the
-     * calendar-data. If the result of a subsequent GET to this object is not
-     * the exact same as this request body, you should omit the ETag.
-     *
-     * @param mixed  $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     *
-     * @return string|null
-     */
-    public function createCalendarObject($calendarId, $objectUri, $calendarData)
-    {
-        $stmt = $this->pdo->prepare('INSERT INTO simple_calendarobjects (calendarid, uri, calendardata) VALUES (?,?,?)');
-        $stmt->execute([
-            $calendarId,
-            $objectUri,
-            $calendarData,
-        ]);
+	/**
+	 * Creates a new calendar object.
+	 *
+	 * The object uri is only the basename, or filename and not a full path.
+	 *
+	 * It is possible return an etag from this function, which will be used in
+	 * the response to this PUT request. Note that the ETag must be surrounded
+	 * by double-quotes.
+	 *
+	 * However, you should only really return this ETag if you don't mangle the
+	 * calendar-data. If the result of a subsequent GET to this object is not
+	 * the exact same as this request body, you should omit the ETag.
+	 *
+	 * @param mixed  $calendarId
+	 * @param string $objectUri
+	 * @param string $calendarData
+	 *
+	 * @return string|null
+	 */
+	public function createCalendarObject($calendarId, $objectUri, $calendarData)
+	{
+		$stmt = $this->pdo->prepare('INSERT INTO simple_calendarobjects (calendarid, uri, calendardata) VALUES (?,?,?)');
+		$stmt->execute([
+			$calendarId,
+			$objectUri,
+			$calendarData,
+		]);
 
-        return '"'.md5($calendarData).'"';
-    }
+		return '"'.md5($calendarData).'"';
+	}
 
-    /**
-     * Updates an existing calendarobject, based on it's uri.
-     *
-     * The object uri is only the basename, or filename and not a full path.
-     *
-     * It is possible return an etag from this function, which will be used in
-     * the response to this PUT request. Note that the ETag must be surrounded
-     * by double-quotes.
-     *
-     * However, you should only really return this ETag if you don't mangle the
-     * calendar-data. If the result of a subsequent GET to this object is not
-     * the exact same as this request body, you should omit the ETag.
-     *
-     * @param mixed  $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     *
-     * @return string|null
-     */
-    public function updateCalendarObject($calendarId, $objectUri, $calendarData)
-    {
-        $stmt = $this->pdo->prepare('UPDATE simple_calendarobjects SET calendardata = ? WHERE calendarid = ? AND uri = ?');
-        $stmt->execute([$calendarData, $calendarId, $objectUri]);
+	/**
+	 * Updates an existing calendarobject, based on it's uri.
+	 *
+	 * The object uri is only the basename, or filename and not a full path.
+	 *
+	 * It is possible return an etag from this function, which will be used in
+	 * the response to this PUT request. Note that the ETag must be surrounded
+	 * by double-quotes.
+	 *
+	 * However, you should only really return this ETag if you don't mangle the
+	 * calendar-data. If the result of a subsequent GET to this object is not
+	 * the exact same as this request body, you should omit the ETag.
+	 *
+	 * @param mixed  $calendarId
+	 * @param string $objectUri
+	 * @param string $calendarData
+	 *
+	 * @return string|null
+	 */
+	public function updateCalendarObject($calendarId, $objectUri, $calendarData)
+	{
+		$stmt = $this->pdo->prepare('UPDATE simple_calendarobjects SET calendardata = ? WHERE calendarid = ? AND uri = ?');
+		$stmt->execute([$calendarData, $calendarId, $objectUri]);
 
-        return '"'.md5($calendarData).'"';
-    }
+		return '"'.md5($calendarData).'"';
+	}
 
-    /**
-     * Deletes an existing calendar object.
-     *
-     * The object uri is only the basename, or filename and not a full path.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     */
-    public function deleteCalendarObject($calendarId, $objectUri)
-    {
-        $stmt = $this->pdo->prepare('DELETE FROM simple_calendarobjects WHERE calendarid = ? AND uri = ?');
-        $stmt->execute([$calendarId, $objectUri]);
-    }
+	/**
+	 * Deletes an existing calendar object.
+	 *
+	 * The object uri is only the basename, or filename and not a full path.
+	 *
+	 * @param string $calendarId
+	 * @param string $objectUri
+	 */
+	public function deleteCalendarObject($calendarId, $objectUri)
+	{
+		$stmt = $this->pdo->prepare('DELETE FROM simple_calendarobjects WHERE calendarid = ? AND uri = ?');
+		$stmt->execute([$calendarId, $objectUri]);
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CalDAV/Backend/SubscriptionSupport.php

Indentation +68 added lines, -68 removed lines

@@ -15,75 +15,75 @@
  */
 interface SubscriptionSupport extends BackendInterface
 {
-    /**
-     * Returns a list of subscriptions for a principal.
-     *
-     * Every subscription is an array with the following keys:
-     *  * id, a unique id that will be used by other functions to modify the
-     *    subscription. This can be the same as the uri or a database key.
-     *  * uri. This is just the 'base uri' or 'filename' of the subscription.
-     *  * principaluri. The owner of the subscription. Almost always the same as
-     *    principalUri passed to this method.
-     *
-     * Furthermore, all the subscription info must be returned too:
-     *
-     * 1. {DAV:}displayname
-     * 2. {http://apple.com/ns/ical/}refreshrate
-     * 3. {http://calendarserver.org/ns/}subscribed-strip-todos (omit if todos
-     *    should not be stripped).
-     * 4. {http://calendarserver.org/ns/}subscribed-strip-alarms (omit if alarms
-     *    should not be stripped).
-     * 5. {http://calendarserver.org/ns/}subscribed-strip-attachments (omit if
-     *    attachments should not be stripped).
-     * 6. {http://calendarserver.org/ns/}source (Must be a
-     *     Sabre\DAV\Property\Href).
-     * 7. {http://apple.com/ns/ical/}calendar-color
-     * 8. {http://apple.com/ns/ical/}calendar-order
-     * 9. {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
-     *    (should just be an instance of
-     *    Sabre\CalDAV\Property\SupportedCalendarComponentSet, with a bunch of
-     *    default components).
-     *
-     * @param string $principalUri
-     *
-     * @return array
-     */
-    public function getSubscriptionsForUser($principalUri);
+	/**
+	 * Returns a list of subscriptions for a principal.
+	 *
+	 * Every subscription is an array with the following keys:
+	 *  * id, a unique id that will be used by other functions to modify the
+	 *    subscription. This can be the same as the uri or a database key.
+	 *  * uri. This is just the 'base uri' or 'filename' of the subscription.
+	 *  * principaluri. The owner of the subscription. Almost always the same as
+	 *    principalUri passed to this method.
+	 *
+	 * Furthermore, all the subscription info must be returned too:
+	 *
+	 * 1. {DAV:}displayname
+	 * 2. {http://apple.com/ns/ical/}refreshrate
+	 * 3. {http://calendarserver.org/ns/}subscribed-strip-todos (omit if todos
+	 *    should not be stripped).
+	 * 4. {http://calendarserver.org/ns/}subscribed-strip-alarms (omit if alarms
+	 *    should not be stripped).
+	 * 5. {http://calendarserver.org/ns/}subscribed-strip-attachments (omit if
+	 *    attachments should not be stripped).
+	 * 6. {http://calendarserver.org/ns/}source (Must be a
+	 *     Sabre\DAV\Property\Href).
+	 * 7. {http://apple.com/ns/ical/}calendar-color
+	 * 8. {http://apple.com/ns/ical/}calendar-order
+	 * 9. {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
+	 *    (should just be an instance of
+	 *    Sabre\CalDAV\Property\SupportedCalendarComponentSet, with a bunch of
+	 *    default components).
+	 *
+	 * @param string $principalUri
+	 *
+	 * @return array
+	 */
+	public function getSubscriptionsForUser($principalUri);
 
-    /**
-     * Creates a new subscription for a principal.
-     *
-     * If the creation was a success, an id must be returned that can be used to reference
-     * this subscription in other methods, such as updateSubscription.
-     *
-     * @param string $principalUri
-     * @param string $uri
-     *
-     * @return mixed
-     */
-    public function createSubscription($principalUri, $uri, array $properties);
+	/**
+	 * Creates a new subscription for a principal.
+	 *
+	 * If the creation was a success, an id must be returned that can be used to reference
+	 * this subscription in other methods, such as updateSubscription.
+	 *
+	 * @param string $principalUri
+	 * @param string $uri
+	 *
+	 * @return mixed
+	 */
+	public function createSubscription($principalUri, $uri, array $properties);
 
-    /**
-     * Updates a subscription.
-     *
-     * The list of mutations is stored in a Sabre\DAV\PropPatch object.
-     * To do the actual updates, you must tell this object which properties
-     * you're going to process with the handle() method.
-     *
-     * Calling the handle method is like telling the PropPatch object "I
-     * promise I can handle updating this property".
-     *
-     * Read the PropPatch documentation for more info and examples.
-     *
-     * @param mixed                $subscriptionId
-     * @param \Sabre\DAV\PropPatch $propPatch
-     */
-    public function updateSubscription($subscriptionId, DAV\PropPatch $propPatch);
+	/**
+	 * Updates a subscription.
+	 *
+	 * The list of mutations is stored in a Sabre\DAV\PropPatch object.
+	 * To do the actual updates, you must tell this object which properties
+	 * you're going to process with the handle() method.
+	 *
+	 * Calling the handle method is like telling the PropPatch object "I
+	 * promise I can handle updating this property".
+	 *
+	 * Read the PropPatch documentation for more info and examples.
+	 *
+	 * @param mixed                $subscriptionId
+	 * @param \Sabre\DAV\PropPatch $propPatch
+	 */
+	public function updateSubscription($subscriptionId, DAV\PropPatch $propPatch);
 
-    /**
-     * Deletes a subscription.
-     *
-     * @param mixed $subscriptionId
-     */
-    public function deleteSubscription($subscriptionId);
+	/**
+	 * Deletes a subscription.
+	 *
+	 * @param mixed $subscriptionId
+	 */
+	public function deleteSubscription($subscriptionId);
 }