nextcloud / server

apps/dav/lib/Upload/FutureFile.php

Indentation +72 added lines, -72 removed lines

@@ -37,87 +37,87 @@
  */
 class FutureFile implements \Sabre\DAV\IFile {
 
-	/** @var Directory */
-	private $root;
-	/** @var string */
-	private $name;
+    /** @var Directory */
+    private $root;
+    /** @var string */
+    private $name;
 
-	/**
-	 * @param Directory $root
-	 * @param string $name
-	 */
-	function __construct(Directory $root, $name) {
-		$this->root = $root;
-		$this->name = $name;
-	}
+    /**
+     * @param Directory $root
+     * @param string $name
+     */
+    function __construct(Directory $root, $name) {
+        $this->root = $root;
+        $this->name = $name;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function put($data) {
-		throw new Forbidden('Permission denied to put into this file');
-	}
+    /**
+     * @inheritdoc
+     */
+    function put($data) {
+        throw new Forbidden('Permission denied to put into this file');
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function get() {
-		$nodes = $this->root->getChildren();
-		return AssemblyStream::wrap($nodes);
-	}
+    /**
+     * @inheritdoc
+     */
+    function get() {
+        $nodes = $this->root->getChildren();
+        return AssemblyStream::wrap($nodes);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getContentType() {
-		return 'application/octet-stream';
-	}
+    /**
+     * @inheritdoc
+     */
+    function getContentType() {
+        return 'application/octet-stream';
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getETag() {
-		return $this->root->getETag();
-	}
+    /**
+     * @inheritdoc
+     */
+    function getETag() {
+        return $this->root->getETag();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getSize() {
-		$children = $this->root->getChildren();
-		$sizes = array_map(function($node) {
-			/** @var IFile $node */
-			return $node->getSize();
-		}, $children);
+    /**
+     * @inheritdoc
+     */
+    function getSize() {
+        $children = $this->root->getChildren();
+        $sizes = array_map(function($node) {
+            /** @var IFile $node */
+            return $node->getSize();
+        }, $children);
 
-		return array_sum($sizes);
-	}
+        return array_sum($sizes);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function delete() {
-		$this->root->delete();
-	}
+    /**
+     * @inheritdoc
+     */
+    function delete() {
+        $this->root->delete();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getName() {
-		return $this->name;
-	}
+    /**
+     * @inheritdoc
+     */
+    function getName() {
+        return $this->name;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function setName($name) {
-		throw new Forbidden('Permission denied to rename this file');
-	}
+    /**
+     * @inheritdoc
+     */
+    function setName($name) {
+        throw new Forbidden('Permission denied to rename this file');
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	function getLastModified() {
-		return $this->root->getLastModified();
-	}
+    /**
+     * @inheritdoc
+     */
+    function getLastModified() {
+        return $this->root->getLastModified();
+    }
 }

apps/dav/lib/Upload/AssemblyStream.php

Indentation +238 added lines, -238 removed lines

@@ -35,243 +35,243 @@
  */
 class AssemblyStream implements \Icewind\Streams\File {
 
-	/** @var resource */
-	private $context;
-
-	/** @var IFile[] */
-	private $nodes;
-
-	/** @var int */
-	private $pos = 0;
-
-	/** @var array */
-	private $sortedNodes;
-
-	/** @var int */
-	private $size;
-
-	/** @var resource */
-	private $currentStream = null;
-
-	/**
-	 * @param string $path
-	 * @param string $mode
-	 * @param int $options
-	 * @param string &$opened_path
-	 * @return bool
-	 */
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		$this->loadContext('assembly');
-
-		// sort the nodes
-		$nodes = $this->nodes;
-		// http://stackoverflow.com/a/10985500
-		@usort($nodes, function(IFile $a, IFile $b) {
-			return strcmp($a->getName(), $b->getName());
-		});
-		$this->nodes = $nodes;
-
-		// build additional information
-		$this->sortedNodes = [];
-		$start = 0;
-		foreach($this->nodes as $node) {
-			$size = $node->getSize();
-			$name = $node->getName();
-			$this->sortedNodes[$name] = ['node' => $node, 'start' => $start, 'end' => $start + $size];
-			$start += $size;
-			$this->size = $start;
-		}
-		return true;
-	}
-
-	/**
-	 * @param string $offset
-	 * @param int $whence
-	 * @return bool
-	 */
-	public function stream_seek($offset, $whence = SEEK_SET) {
-		return false;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function stream_tell() {
-		return $this->pos;
-	}
-
-	/**
-	 * @param int $count
-	 * @return string
-	 */
-	public function stream_read($count) {
-		do {
-			if ($this->currentStream === null) {
-				list($node, $posInNode) = $this->getNodeForPosition($this->pos);
-				if (is_null($node)) {
-					// reached last node, no more data
-					return '';
-				}
-				$this->currentStream = $this->getStream($node);
-				fseek($this->currentStream, $posInNode);
-			}
-
-			$data = fread($this->currentStream, $count);
-			// isset is faster than strlen
-			if (isset($data[$count - 1])) {
-				// we read the full count
-				$read = $count;
-			} else {
-				// reaching end of stream, which happens less often so strlen is ok
-				$read = strlen($data);
-			}
-
-			if (feof($this->currentStream)) {
-				fclose($this->currentStream);
-				$this->currentNode = null;
-				$this->currentStream = null;
-			}
-			// if no data read, try again with the next node because
-			// returning empty data can make the caller think there is no more
-			// data left to read
-		} while ($read === 0);
-
-		// update position
-		$this->pos += $read;
-		return $data;
-	}
-
-	/**
-	 * @param string $data
-	 * @return int
-	 */
-	public function stream_write($data) {
-		return false;
-	}
-
-	/**
-	 * @param int $option
-	 * @param int $arg1
-	 * @param int $arg2
-	 * @return bool
-	 */
-	public function stream_set_option($option, $arg1, $arg2) {
-		return false;
-	}
-
-	/**
-	 * @param int $size
-	 * @return bool
-	 */
-	public function stream_truncate($size) {
-		return false;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function stream_stat() {
-		return [];
-	}
-
-	/**
-	 * @param int $operation
-	 * @return bool
-	 */
-	public function stream_lock($operation) {
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function stream_flush() {
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function stream_eof() {
-		return $this->pos >= $this->size;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function stream_close() {
-		return true;
-	}
-
-
-	/**
-	 * Load the source from the stream context and return the context options
-	 *
-	 * @param string $name
-	 * @return array
-	 * @throws \Exception
-	 */
-	protected function loadContext($name) {
-		$context = stream_context_get_options($this->context);
-		if (isset($context[$name])) {
-			$context = $context[$name];
-		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
-		}
-		if (isset($context['nodes']) and is_array($context['nodes'])) {
-			$this->nodes = $context['nodes'];
-		} else {
-			throw new \BadMethodCallException('Invalid context, nodes not set');
-		}
-		return $context;
-	}
-
-	/**
-	 * @param IFile[] $nodes
-	 * @return resource
-	 *
-	 * @throws \BadMethodCallException
-	 */
-	public static function wrap(array $nodes) {
-		$context = stream_context_create([
-			'assembly' => [
-				'nodes' => $nodes]
-		]);
-		stream_wrapper_register('assembly', '\OCA\DAV\Upload\AssemblyStream');
-		try {
-			$wrapped = fopen('assembly://', 'r', null, $context);
-		} catch (\BadMethodCallException $e) {
-			stream_wrapper_unregister('assembly');
-			throw $e;
-		}
-		stream_wrapper_unregister('assembly');
-		return $wrapped;
-	}
-
-	/**
-	 * @param $pos
-	 * @return IFile | null
-	 */
-	private function getNodeForPosition($pos) {
-		foreach($this->sortedNodes as $node) {
-			if ($pos >= $node['start'] && $pos < $node['end']) {
-				return [$node['node'], $pos - $node['start']];
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @param IFile $node
-	 * @return resource
-	 */
-	private function getStream(IFile $node) {
-		$data = $node->get();
-		if (is_resource($data)) {
-			return $data;
-		}
-
-		return fopen('data://text/plain,' . $data,'r');
-	}
+    /** @var resource */
+    private $context;
+
+    /** @var IFile[] */
+    private $nodes;
+
+    /** @var int */
+    private $pos = 0;
+
+    /** @var array */
+    private $sortedNodes;
+
+    /** @var int */
+    private $size;
+
+    /** @var resource */
+    private $currentStream = null;
+
+    /**
+     * @param string $path
+     * @param string $mode
+     * @param int $options
+     * @param string &$opened_path
+     * @return bool
+     */
+    public function stream_open($path, $mode, $options, &$opened_path) {
+        $this->loadContext('assembly');
+
+        // sort the nodes
+        $nodes = $this->nodes;
+        // http://stackoverflow.com/a/10985500
+        @usort($nodes, function(IFile $a, IFile $b) {
+            return strcmp($a->getName(), $b->getName());
+        });
+        $this->nodes = $nodes;
+
+        // build additional information
+        $this->sortedNodes = [];
+        $start = 0;
+        foreach($this->nodes as $node) {
+            $size = $node->getSize();
+            $name = $node->getName();
+            $this->sortedNodes[$name] = ['node' => $node, 'start' => $start, 'end' => $start + $size];
+            $start += $size;
+            $this->size = $start;
+        }
+        return true;
+    }
+
+    /**
+     * @param string $offset
+     * @param int $whence
+     * @return bool
+     */
+    public function stream_seek($offset, $whence = SEEK_SET) {
+        return false;
+    }
+
+    /**
+     * @return int
+     */
+    public function stream_tell() {
+        return $this->pos;
+    }
+
+    /**
+     * @param int $count
+     * @return string
+     */
+    public function stream_read($count) {
+        do {
+            if ($this->currentStream === null) {
+                list($node, $posInNode) = $this->getNodeForPosition($this->pos);
+                if (is_null($node)) {
+                    // reached last node, no more data
+                    return '';
+                }
+                $this->currentStream = $this->getStream($node);
+                fseek($this->currentStream, $posInNode);
+            }
+
+            $data = fread($this->currentStream, $count);
+            // isset is faster than strlen
+            if (isset($data[$count - 1])) {
+                // we read the full count
+                $read = $count;
+            } else {
+                // reaching end of stream, which happens less often so strlen is ok
+                $read = strlen($data);
+            }
+
+            if (feof($this->currentStream)) {
+                fclose($this->currentStream);
+                $this->currentNode = null;
+                $this->currentStream = null;
+            }
+            // if no data read, try again with the next node because
+            // returning empty data can make the caller think there is no more
+            // data left to read
+        } while ($read === 0);
+
+        // update position
+        $this->pos += $read;
+        return $data;
+    }
+
+    /**
+     * @param string $data
+     * @return int
+     */
+    public function stream_write($data) {
+        return false;
+    }
+
+    /**
+     * @param int $option
+     * @param int $arg1
+     * @param int $arg2
+     * @return bool
+     */
+    public function stream_set_option($option, $arg1, $arg2) {
+        return false;
+    }
+
+    /**
+     * @param int $size
+     * @return bool
+     */
+    public function stream_truncate($size) {
+        return false;
+    }
+
+    /**
+     * @return array
+     */
+    public function stream_stat() {
+        return [];
+    }
+
+    /**
+     * @param int $operation
+     * @return bool
+     */
+    public function stream_lock($operation) {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function stream_flush() {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function stream_eof() {
+        return $this->pos >= $this->size;
+    }
+
+    /**
+     * @return bool
+     */
+    public function stream_close() {
+        return true;
+    }
+
+
+    /**
+     * Load the source from the stream context and return the context options
+     *
+     * @param string $name
+     * @return array
+     * @throws \Exception
+     */
+    protected function loadContext($name) {
+        $context = stream_context_get_options($this->context);
+        if (isset($context[$name])) {
+            $context = $context[$name];
+        } else {
+            throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+        }
+        if (isset($context['nodes']) and is_array($context['nodes'])) {
+            $this->nodes = $context['nodes'];
+        } else {
+            throw new \BadMethodCallException('Invalid context, nodes not set');
+        }
+        return $context;
+    }
+
+    /**
+     * @param IFile[] $nodes
+     * @return resource
+     *
+     * @throws \BadMethodCallException
+     */
+    public static function wrap(array $nodes) {
+        $context = stream_context_create([
+            'assembly' => [
+                'nodes' => $nodes]
+        ]);
+        stream_wrapper_register('assembly', '\OCA\DAV\Upload\AssemblyStream');
+        try {
+            $wrapped = fopen('assembly://', 'r', null, $context);
+        } catch (\BadMethodCallException $e) {
+            stream_wrapper_unregister('assembly');
+            throw $e;
+        }
+        stream_wrapper_unregister('assembly');
+        return $wrapped;
+    }
+
+    /**
+     * @param $pos
+     * @return IFile | null
+     */
+    private function getNodeForPosition($pos) {
+        foreach($this->sortedNodes as $node) {
+            if ($pos >= $node['start'] && $pos < $node['end']) {
+                return [$node['node'], $pos - $node['start']];
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param IFile $node
+     * @return resource
+     */
+    private function getStream(IFile $node) {
+        $data = $node->get();
+        if (is_resource($data)) {
+            return $data;
+        }
+
+        return fopen('data://text/plain,' . $data,'r');
+    }
 
 }

apps/dav/lib/CalDAV/Activity/Provider/Calendar.php

Indentation +165 added lines, -165 removed lines

@@ -31,169 +31,169 @@
 
 class Calendar extends Base {
 
-	const SUBJECT_ADD = 'calendar_add';
-	const SUBJECT_UPDATE = 'calendar_update';
-	const SUBJECT_DELETE = 'calendar_delete';
-	const SUBJECT_SHARE_USER = 'calendar_user_share';
-	const SUBJECT_SHARE_GROUP = 'calendar_group_share';
-	const SUBJECT_UNSHARE_USER = 'calendar_user_unshare';
-	const SUBJECT_UNSHARE_GROUP = 'calendar_group_unshare';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IEventMerger */
-	protected $eventMerger;
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 * @param IEventMerger $eventMerger
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IEventMerger $eventMerger) {
-		parent::__construct($userManager);
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->eventMerger = $eventMerger;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('dav', $language);
-
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
-
-		if ($event->getSubject() === self::SUBJECT_ADD) {
-			$subject = $this->l->t('{actor} created calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_ADD . '_self') {
-			$subject = $this->l->t('You created calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_DELETE) {
-			$subject = $this->l->t('{actor} deleted calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
-			$subject = $this->l->t('You deleted calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_UPDATE) {
-			$subject = $this->l->t('{actor} updated calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
-			$subject = $this->l->t('You updated calendar {calendar}');
-
-		} else if ($event->getSubject() === self::SUBJECT_SHARE_USER) {
-			$subject = $this->l->t('{actor} shared calendar {calendar} with you');
-		} else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
-			$subject = $this->l->t('You shared calendar {calendar} with {user}');
-		} else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
-			$subject = $this->l->t('{actor} shared calendar {calendar} with {user}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
-			$subject = $this->l->t('{actor} unshared calendar {calendar} from you');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
-			$subject = $this->l->t('You unshared calendar {calendar} from {user}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
-			$subject = $this->l->t('{actor} unshared calendar {calendar} from {user}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
-			$subject = $this->l->t('{actor} unshared calendar {calendar} from themselves');
-
-		} else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
-			$subject = $this->l->t('You shared calendar {calendar} with group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
-			$subject = $this->l->t('{actor} shared calendar {calendar} with group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
-			$subject = $this->l->t('You unshared calendar {calendar} from group {group}');
-		} else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
-			$subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$parsedParameters = $this->getParameters($event);
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		$event = $this->eventMerger->mergeEvents('calendar', $event, $previousEvent);
-
-		if ($event->getChildEvent() === null) {
-			if (isset($parsedParameters['user'])) {
-				// Couldn't group by calendar, maybe we can group by users
-				$event = $this->eventMerger->mergeEvents('user', $event, $previousEvent);
-			} else if (isset($parsedParameters['group'])) {
-				// Couldn't group by calendar, maybe we can group by groups
-				$event = $this->eventMerger->mergeEvents('group', $event, $previousEvent);
-			}
-		}
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 */
-	protected function getParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::SUBJECT_ADD:
-			case self::SUBJECT_ADD . '_self':
-			case self::SUBJECT_DELETE:
-			case self::SUBJECT_DELETE . '_self':
-			case self::SUBJECT_UPDATE:
-			case self::SUBJECT_UPDATE . '_self':
-			case self::SUBJECT_SHARE_USER:
-			case self::SUBJECT_UNSHARE_USER:
-			case self::SUBJECT_UNSHARE_USER . '_self':
-				return [
-					'actor' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
-				];
-			case self::SUBJECT_SHARE_USER . '_you':
-			case self::SUBJECT_UNSHARE_USER . '_you':
-				return [
-					'user' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
-				];
-			case self::SUBJECT_SHARE_USER . '_by':
-			case self::SUBJECT_UNSHARE_USER . '_by':
-				return [
-					'user' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
-					'actor' => $this->generateUserParameter($parameters[2]),
-				];
-			case self::SUBJECT_SHARE_GROUP . '_you':
-			case self::SUBJECT_UNSHARE_GROUP . '_you':
-				return [
-					'group' => $this->generateGroupParameter($parameters[0]),
-					'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
-				];
-			case self::SUBJECT_SHARE_GROUP . '_by':
-			case self::SUBJECT_UNSHARE_GROUP . '_by':
-				return [
-					'group' => $this->generateGroupParameter($parameters[0]),
-					'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
-					'actor' => $this->generateUserParameter($parameters[2]),
-				];
-		}
-
-		throw new \InvalidArgumentException();
-	}
+    const SUBJECT_ADD = 'calendar_add';
+    const SUBJECT_UPDATE = 'calendar_update';
+    const SUBJECT_DELETE = 'calendar_delete';
+    const SUBJECT_SHARE_USER = 'calendar_user_share';
+    const SUBJECT_SHARE_GROUP = 'calendar_group_share';
+    const SUBJECT_UNSHARE_USER = 'calendar_user_unshare';
+    const SUBJECT_UNSHARE_GROUP = 'calendar_group_unshare';
+
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IEventMerger */
+    protected $eventMerger;
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     * @param IEventMerger $eventMerger
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IEventMerger $eventMerger) {
+        parent::__construct($userManager);
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->eventMerger = $eventMerger;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('dav', $language);
+
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
+
+        if ($event->getSubject() === self::SUBJECT_ADD) {
+            $subject = $this->l->t('{actor} created calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_ADD . '_self') {
+            $subject = $this->l->t('You created calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_DELETE) {
+            $subject = $this->l->t('{actor} deleted calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
+            $subject = $this->l->t('You deleted calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_UPDATE) {
+            $subject = $this->l->t('{actor} updated calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
+            $subject = $this->l->t('You updated calendar {calendar}');
+
+        } else if ($event->getSubject() === self::SUBJECT_SHARE_USER) {
+            $subject = $this->l->t('{actor} shared calendar {calendar} with you');
+        } else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
+            $subject = $this->l->t('You shared calendar {calendar} with {user}');
+        } else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
+            $subject = $this->l->t('{actor} shared calendar {calendar} with {user}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
+            $subject = $this->l->t('{actor} unshared calendar {calendar} from you');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
+            $subject = $this->l->t('You unshared calendar {calendar} from {user}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
+            $subject = $this->l->t('{actor} unshared calendar {calendar} from {user}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
+            $subject = $this->l->t('{actor} unshared calendar {calendar} from themselves');
+
+        } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
+            $subject = $this->l->t('You shared calendar {calendar} with group {group}');
+        } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
+            $subject = $this->l->t('{actor} shared calendar {calendar} with group {group}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
+            $subject = $this->l->t('You unshared calendar {calendar} from group {group}');
+        } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
+            $subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $parsedParameters = $this->getParameters($event);
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        $event = $this->eventMerger->mergeEvents('calendar', $event, $previousEvent);
+
+        if ($event->getChildEvent() === null) {
+            if (isset($parsedParameters['user'])) {
+                // Couldn't group by calendar, maybe we can group by users
+                $event = $this->eventMerger->mergeEvents('user', $event, $previousEvent);
+            } else if (isset($parsedParameters['group'])) {
+                // Couldn't group by calendar, maybe we can group by groups
+                $event = $this->eventMerger->mergeEvents('group', $event, $previousEvent);
+            }
+        }
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return array
+     */
+    protected function getParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::SUBJECT_ADD:
+            case self::SUBJECT_ADD . '_self':
+            case self::SUBJECT_DELETE:
+            case self::SUBJECT_DELETE . '_self':
+            case self::SUBJECT_UPDATE:
+            case self::SUBJECT_UPDATE . '_self':
+            case self::SUBJECT_SHARE_USER:
+            case self::SUBJECT_UNSHARE_USER:
+            case self::SUBJECT_UNSHARE_USER . '_self':
+                return [
+                    'actor' => $this->generateUserParameter($parameters[0]),
+                    'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
+                ];
+            case self::SUBJECT_SHARE_USER . '_you':
+            case self::SUBJECT_UNSHARE_USER . '_you':
+                return [
+                    'user' => $this->generateUserParameter($parameters[0]),
+                    'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
+                ];
+            case self::SUBJECT_SHARE_USER . '_by':
+            case self::SUBJECT_UNSHARE_USER . '_by':
+                return [
+                    'user' => $this->generateUserParameter($parameters[0]),
+                    'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
+                    'actor' => $this->generateUserParameter($parameters[2]),
+                ];
+            case self::SUBJECT_SHARE_GROUP . '_you':
+            case self::SUBJECT_UNSHARE_GROUP . '_you':
+                return [
+                    'group' => $this->generateGroupParameter($parameters[0]),
+                    'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
+                ];
+            case self::SUBJECT_SHARE_GROUP . '_by':
+            case self::SUBJECT_UNSHARE_GROUP . '_by':
+                return [
+                    'group' => $this->generateGroupParameter($parameters[0]),
+                    'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
+                    'actor' => $this->generateUserParameter($parameters[2]),
+                ];
+        }
+
+        throw new \InvalidArgumentException();
+    }
 }

apps/dav/lib/CalDAV/Activity/Provider/Base.php

Indentation +87 added lines, -87 removed lines

@@ -28,102 +28,102 @@
 
 abstract class Base implements IProvider {
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/** @var string[] cached displayNames - key is the UID and value the displayname */
-	protected $displayNames = [];
+    /** @var string[] cached displayNames - key is the UID and value the displayname */
+    protected $displayNames = [];
 
-	/**
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
-	}
+    /**
+     * @param IUserManager $userManager
+     */
+    public function __construct(IUserManager $userManager) {
+        $this->userManager = $userManager;
+    }
 
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 * @param array $parameters
-	 */
-	protected function setSubjects(IEvent $event, $subject, array $parameters) {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			$replacements[] = $parameter['name'];
-		}
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     * @param array $parameters
+     */
+    protected function setSubjects(IEvent $event, $subject, array $parameters) {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            $replacements[] = $parameter['name'];
+        }
 
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
 
-	/**
-	 * @param array $eventData
-	 * @return array
-	 */
-	protected function generateObjectParameter($eventData) {
-		if (!is_array($eventData) || !isset($eventData['id']) || !isset($eventData['name'])) {
-			throw new \InvalidArgumentException();
-		};
+    /**
+     * @param array $eventData
+     * @return array
+     */
+    protected function generateObjectParameter($eventData) {
+        if (!is_array($eventData) || !isset($eventData['id']) || !isset($eventData['name'])) {
+            throw new \InvalidArgumentException();
+        };
 
-		return [
-			'type' => 'calendar-event',
-			'id' => $eventData['id'],
-			'name' => $eventData['name'],
-		];
-	}
+        return [
+            'type' => 'calendar-event',
+            'id' => $eventData['id'],
+            'name' => $eventData['name'],
+        ];
+    }
 
-	/**
-	 * @param int $id
-	 * @param string $name
-	 * @return array
-	 */
-	protected function generateCalendarParameter($id, $name) {
-		return [
-			'type' => 'calendar',
-			'id' => $id,
-			'name' => $name,
-		];
-	}
+    /**
+     * @param int $id
+     * @param string $name
+     * @return array
+     */
+    protected function generateCalendarParameter($id, $name) {
+        return [
+            'type' => 'calendar',
+            'id' => $id,
+            'name' => $name,
+        ];
+    }
 
-	/**
-	 * @param string $id
-	 * @return array
-	 */
-	protected function generateGroupParameter($id) {
-		return [
-			'type' => 'group',
-			'id' => $id,
-			'name' => $id,
-		];
-	}
+    /**
+     * @param string $id
+     * @return array
+     */
+    protected function generateGroupParameter($id) {
+        return [
+            'type' => 'group',
+            'id' => $id,
+            'name' => $id,
+        ];
+    }
 
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function generateUserParameter($uid) {
-		if (!isset($this->displayNames[$uid])) {
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
-		}
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function generateUserParameter($uid) {
+        if (!isset($this->displayNames[$uid])) {
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
+        }
 
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->displayNames[$uid],
-		];
-	}
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->displayNames[$uid],
+        ];
+    }
 
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getDisplayName($uid) {
-		$user = $this->userManager->get($uid);
-		if ($user instanceof IUser) {
-			return $user->getDisplayName();
-		} else {
-			return $uid;
-		}
-	}
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getDisplayName($uid) {
+        $user = $this->userManager->get($uid);
+        if ($user instanceof IUser) {
+            return $user->getDisplayName();
+        } else {
+            return $uid;
+        }
+    }
 }

apps/dav/lib/CalDAV/Activity/Provider/Event.php

Indentation +103 added lines, -103 removed lines

@@ -31,107 +31,107 @@
 
 class Event extends Base {
 
-	const SUBJECT_OBJECT_ADD = 'object_add';
-	const SUBJECT_OBJECT_UPDATE = 'object_update';
-	const SUBJECT_OBJECT_DELETE = 'object_delete';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IEventMerger */
-	protected $eventMerger;
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 * @param IEventMerger $eventMerger
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IEventMerger $eventMerger) {
-		parent::__construct($userManager);
-		$this->languageFactory = $languageFactory;
-		$this->url = $url;
-		$this->activityManager = $activityManager;
-		$this->eventMerger = $eventMerger;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_event') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('dav', $language);
-
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
-
-		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
-			$subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
-			$subject = $this->l->t('You created event {event} in calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
-			$subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
-			$subject = $this->l->t('You deleted event {event} from calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
-			$subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event_self') {
-			$subject = $this->l->t('You updated event {event} in calendar {calendar}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$parsedParameters = $this->getParameters($event);
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		$event = $this->eventMerger->mergeEvents('event', $event, $previousEvent);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 */
-	protected function getParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		switch ($subject) {
-			case self::SUBJECT_OBJECT_ADD . '_event':
-			case self::SUBJECT_OBJECT_DELETE . '_event':
-			case self::SUBJECT_OBJECT_UPDATE . '_event':
-				return [
-					'actor' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
-					'event' => $this->generateObjectParameter($parameters[2]),
-				];
-			case self::SUBJECT_OBJECT_ADD . '_event_self':
-			case self::SUBJECT_OBJECT_DELETE . '_event_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_event_self':
-				return [
-					'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
-					'event' => $this->generateObjectParameter($parameters[2]),
-				];
-		}
-
-		throw new \InvalidArgumentException();
-	}
+    const SUBJECT_OBJECT_ADD = 'object_add';
+    const SUBJECT_OBJECT_UPDATE = 'object_update';
+    const SUBJECT_OBJECT_DELETE = 'object_delete';
+
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IEventMerger */
+    protected $eventMerger;
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     * @param IEventMerger $eventMerger
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IEventMerger $eventMerger) {
+        parent::__construct($userManager);
+        $this->languageFactory = $languageFactory;
+        $this->url = $url;
+        $this->activityManager = $activityManager;
+        $this->eventMerger = $eventMerger;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_event') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('dav', $language);
+
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg')));
+
+        if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
+            $subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
+            $subject = $this->l->t('You created event {event} in calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
+            $subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
+            $subject = $this->l->t('You deleted event {event} from calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
+            $subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event_self') {
+            $subject = $this->l->t('You updated event {event} in calendar {calendar}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $parsedParameters = $this->getParameters($event);
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        $event = $this->eventMerger->mergeEvents('event', $event, $previousEvent);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return array
+     */
+    protected function getParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        switch ($subject) {
+            case self::SUBJECT_OBJECT_ADD . '_event':
+            case self::SUBJECT_OBJECT_DELETE . '_event':
+            case self::SUBJECT_OBJECT_UPDATE . '_event':
+                return [
+                    'actor' => $this->generateUserParameter($parameters[0]),
+                    'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
+                    'event' => $this->generateObjectParameter($parameters[2]),
+                ];
+            case self::SUBJECT_OBJECT_ADD . '_event_self':
+            case self::SUBJECT_OBJECT_DELETE . '_event_self':
+            case self::SUBJECT_OBJECT_UPDATE . '_event_self':
+                return [
+                    'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
+                    'event' => $this->generateObjectParameter($parameters[2]),
+                ];
+        }
+
+        throw new \InvalidArgumentException();
+    }
 }

apps/dav/lib/CalDAV/Activity/Provider/Todo.php

Indentation +72 added lines, -72 removed lines

@@ -25,86 +25,86 @@
 
 class Todo extends Event {
 
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_todo') {
-			throw new \InvalidArgumentException();
-		}
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_todo') {
+            throw new \InvalidArgumentException();
+        }
 
-		$this->l = $this->languageFactory->get('dav', $language);
+        $this->l = $this->languageFactory->get('dav', $language);
 
-		$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
+        $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
 
-		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo') {
-			$subject = $this->l->t('{actor} created todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo_self') {
-			$subject = $this->l->t('You created todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo') {
-			$subject = $this->l->t('{actor} deleted todo {todo} from list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo_self') {
-			$subject = $this->l->t('You deleted todo {todo} from list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo') {
-			$subject = $this->l->t('{actor} updated todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_self') {
-			$subject = $this->l->t('You updated todo {todo} in list {calendar}');
+        if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo') {
+            $subject = $this->l->t('{actor} created todo {todo} in list {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo_self') {
+            $subject = $this->l->t('You created todo {todo} in list {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo') {
+            $subject = $this->l->t('{actor} deleted todo {todo} from list {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo_self') {
+            $subject = $this->l->t('You deleted todo {todo} from list {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo') {
+            $subject = $this->l->t('{actor} updated todo {todo} in list {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_self') {
+            $subject = $this->l->t('You updated todo {todo} in list {calendar}');
 
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed') {
-			$subject = $this->l->t('{actor} solved todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self') {
-			$subject = $this->l->t('You solved todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action') {
-			$subject = $this->l->t('{actor} reopened todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self') {
-			$subject = $this->l->t('You reopened todo {todo} in list {calendar}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed') {
+            $subject = $this->l->t('{actor} solved todo {todo} in list {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self') {
+            $subject = $this->l->t('You solved todo {todo} in list {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action') {
+            $subject = $this->l->t('{actor} reopened todo {todo} in list {calendar}');
+        } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self') {
+            $subject = $this->l->t('You reopened todo {todo} in list {calendar}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
 
-		$parsedParameters = $this->getParameters($event);
-		$this->setSubjects($event, $subject, $parsedParameters);
+        $parsedParameters = $this->getParameters($event);
+        $this->setSubjects($event, $subject, $parsedParameters);
 
-		$event = $this->eventMerger->mergeEvents('todo', $event, $previousEvent);
+        $event = $this->eventMerger->mergeEvents('todo', $event, $previousEvent);
 
-		return $event;
-	}
+        return $event;
+    }
 
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 */
-	protected function getParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
+    /**
+     * @param IEvent $event
+     * @return array
+     */
+    protected function getParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
 
-		switch ($subject) {
-			case self::SUBJECT_OBJECT_ADD . '_todo':
-			case self::SUBJECT_OBJECT_DELETE . '_todo':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_completed':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action':
-				return [
-					'actor' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
-					'todo' => $this->generateObjectParameter($parameters[2]),
-				];
-			case self::SUBJECT_OBJECT_ADD . '_todo_self':
-			case self::SUBJECT_OBJECT_DELETE . '_todo_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self':
-				return [
-					'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
-					'todo' => $this->generateObjectParameter($parameters[2]),
-				];
-		}
+        switch ($subject) {
+            case self::SUBJECT_OBJECT_ADD . '_todo':
+            case self::SUBJECT_OBJECT_DELETE . '_todo':
+            case self::SUBJECT_OBJECT_UPDATE . '_todo':
+            case self::SUBJECT_OBJECT_UPDATE . '_todo_completed':
+            case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action':
+                return [
+                    'actor' => $this->generateUserParameter($parameters[0]),
+                    'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
+                    'todo' => $this->generateObjectParameter($parameters[2]),
+                ];
+            case self::SUBJECT_OBJECT_ADD . '_todo_self':
+            case self::SUBJECT_OBJECT_DELETE . '_todo_self':
+            case self::SUBJECT_OBJECT_UPDATE . '_todo_self':
+            case self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self':
+            case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self':
+                return [
+                    'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]),
+                    'todo' => $this->generateObjectParameter($parameters[2]),
+                ];
+        }
 
-		throw new \InvalidArgumentException();
-	}
+        throw new \InvalidArgumentException();
+    }
 }

apps/dav/lib/CalDAV/Activity/Filter/Calendar.php

Indentation +53 added lines, -53 removed lines

@@ -28,65 +28,65 @@
 
 class Calendar implements IFilter {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/** @var IURLGenerator */
-	protected $url;
+    /** @var IURLGenerator */
+    protected $url;
 
-	public function __construct(IL10N $l, IURLGenerator $url) {
-		$this->l = $l;
-		$this->url = $url;
-	}
+    public function __construct(IL10N $l, IURLGenerator $url) {
+        $this->l = $l;
+        $this->url = $url;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'calendar';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'calendar';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('Calendar');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('Calendar');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 40;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 40;
+    }
 
-	/**
-	 * @return string Full URL to an icon, empty string when none is given
-	 * @since 11.0.0
-	 */
-	public function getIcon() {
-		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg'));
-	}
+    /**
+     * @return string Full URL to an icon, empty string when none is given
+     * @since 11.0.0
+     */
+    public function getIcon() {
+        return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg'));
+    }
 
-	/**
-	 * @param string[] $types
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function filterTypes(array $types) {
-		return array_intersect(['calendar', 'calendar_event'], $types);
-	}
+    /**
+     * @param string[] $types
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function filterTypes(array $types) {
+        return array_intersect(['calendar', 'calendar_event'], $types);
+    }
 
-	/**
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function allowedApps() {
-		return [];
-	}
+    /**
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function allowedApps() {
+        return [];
+    }
 }

apps/dav/lib/CalDAV/Activity/Filter/Todo.php

Indentation +53 added lines, -53 removed lines

@@ -28,65 +28,65 @@
 
 class Todo implements IFilter {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/** @var IURLGenerator */
-	protected $url;
+    /** @var IURLGenerator */
+    protected $url;
 
-	public function __construct(IL10N $l, IURLGenerator $url) {
-		$this->l = $l;
-		$this->url = $url;
-	}
+    public function __construct(IL10N $l, IURLGenerator $url) {
+        $this->l = $l;
+        $this->url = $url;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'calendar_todo';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'calendar_todo';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('Todos');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('Todos');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 40;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 40;
+    }
 
-	/**
-	 * @return string Full URL to an icon, empty string when none is given
-	 * @since 11.0.0
-	 */
-	public function getIcon() {
-		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg'));
-	}
+    /**
+     * @return string Full URL to an icon, empty string when none is given
+     * @since 11.0.0
+     */
+    public function getIcon() {
+        return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg'));
+    }
 
-	/**
-	 * @param string[] $types
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function filterTypes(array $types) {
-		return array_intersect(['calendar_todo'], $types);
-	}
+    /**
+     * @param string[] $types
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function filterTypes(array $types) {
+        return array_intersect(['calendar_todo'], $types);
+    }
 
-	/**
-	 * @return string[] An array of allowed apps from which activities should be displayed
-	 * @since 11.0.0
-	 */
-	public function allowedApps() {
-		return [];
-	}
+    /**
+     * @return string[] An array of allowed apps from which activities should be displayed
+     * @since 11.0.0
+     */
+    public function allowedApps() {
+        return [];
+    }
 }

apps/dav/lib/CalDAV/Activity/Setting/Calendar.php

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 
 class Calendar implements ISetting {
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
-	}
+    /**
+     * @param IL10N $l
+     */
+    public function __construct(IL10N $l) {
+        $this->l = $l;
+    }
 
-	/**
-	 * @return string Lowercase a-z and underscore only identifier
-	 * @since 11.0.0
-	 */
-	public function getIdentifier() {
-		return 'calendar';
-	}
+    /**
+     * @return string Lowercase a-z and underscore only identifier
+     * @since 11.0.0
+     */
+    public function getIdentifier() {
+        return 'calendar';
+    }
 
-	/**
-	 * @return string A translated string
-	 * @since 11.0.0
-	 */
-	public function getName() {
-		return $this->l->t('A <strong>calendar</strong> was modified');
-	}
+    /**
+     * @return string A translated string
+     * @since 11.0.0
+     */
+    public function getName() {
+        return $this->l->t('A <strong>calendar</strong> was modified');
+    }
 
-	/**
-	 * @return int whether the filter should be rather on the top or bottom of
-	 * the admin section. The filters are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 * @since 11.0.0
-	 */
-	public function getPriority() {
-		return 50;
-	}
+    /**
+     * @return int whether the filter should be rather on the top or bottom of
+     * the admin section. The filters are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     * @since 11.0.0
+     */
+    public function getPriority() {
+        return 50;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function canChangeStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function canChangeStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledStream() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledStream() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the mail
-	 * @since 11.0.0
-	 */
-	public function canChangeMail() {
-		return true;
-	}
+    /**
+     * @return bool True when the option can be changed for the mail
+     * @since 11.0.0
+     */
+    public function canChangeMail() {
+        return true;
+    }
 
-	/**
-	 * @return bool True when the option can be changed for the stream
-	 * @since 11.0.0
-	 */
-	public function isDefaultEnabledMail() {
-		return false;
-	}
+    /**
+     * @return bool True when the option can be changed for the stream
+     * @since 11.0.0
+     */
+    public function isDefaultEnabledMail() {
+        return false;
+    }
 }