nextcloud / server

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

Indentation +179 added lines, -179 removed lines

@@ -38,183 +38,183 @@
 use OCP\L10N\IFactory;
 
 class Event extends Base {
-	public const SUBJECT_OBJECT_ADD = 'object_add';
-	public const SUBJECT_OBJECT_UPDATE = 'object_update';
-	public const SUBJECT_OBJECT_DELETE = 'object_delete';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IEventMerger */
-	protected $eventMerger;
-
-	/** @var IAppManager */
-	protected $appManager;
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IEventMerger $eventMerger
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IGroupManager $groupManager, IEventMerger $eventMerger, IAppManager $appManager) {
-		parent::__construct($userManager, $groupManager, $url);
-		$this->languageFactory = $languageFactory;
-		$this->activityManager = $activityManager;
-		$this->eventMerger = $eventMerger;
-		$this->appManager = $appManager;
-	}
-
-	/**
-	 * @param array $eventData
-	 * @return array
-	 */
-	protected function generateObjectParameter(array $eventData) {
-		if (!isset($eventData['id']) || !isset($eventData['name'])) {
-			throw new \InvalidArgumentException();
-		}
-
-		$params = [
-			'type' => 'calendar-event',
-			'id' => $eventData['id'],
-			'name' => $eventData['name'],
-
-		];
-		if (isset($eventData['link']) && is_array($eventData['link']) && $this->appManager->isEnabledForUser('calendar')) {
-			try {
-				// The calendar app needs to be manually loaded for the routes to be loaded
-				OC_App::loadApp('calendar');
-				$linkData = $eventData['link'];
-				$objectId = base64_encode('/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $linkData['calendar_uri'] . '/' . $linkData['object_uri']);
-				$link = [
-					'view' => 'dayGridMonth',
-					'timeRange' => 'now',
-					'mode' => 'sidebar',
-					'objectId' => $objectId,
-					'recurrenceId' => 'next'
-				];
-				$params['link'] = $this->url->linkToRouteAbsolute('calendar.view.indexview.timerange.edit', $link);
-			} catch (\Exception $error) {
-				// Do nothing
-			}
-		}
-		return $params;
-	}
-
-	/**
-	 * @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);
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg')));
-		}
-
-		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
-			$subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
-			$subject = $this->l->t('You created event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
-			$subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
-			$subject = $this->l->t('You deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
-			$subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
-		} elseif ($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();
-
-		// Nextcloud 13+
-		if (isset($parameters['calendar'])) {
-			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['actor']),
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'event' => $this->generateClassifiedObjectParameter($parameters['object']),
-					];
-				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($parameters['calendar'], $this->l),
-						'event' => $this->generateClassifiedObjectParameter($parameters['object']),
-					];
-			}
-		}
-
-		// Legacy - Do NOT Remove unless necessary
-		// Removing this will break parsing of activities that were created on
-		// Nextcloud 12, so we should keep this as long as it's acceptable.
-		// Otherwise if people upgrade over multiple releases in a short period,
-		// they will get the dead entries in their stream.
-		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->generateLegacyCalendarParameter($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->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
-					'event' => $this->generateObjectParameter($parameters[2]),
-				];
-		}
-
-		throw new \InvalidArgumentException();
-	}
-
-	private function generateClassifiedObjectParameter(array $eventData) {
-		$parameter = $this->generateObjectParameter($eventData);
-		if (!empty($eventData['classified'])) {
-			$parameter['name'] = $this->l->t('Busy');
-		}
-		return $parameter;
-	}
+    public const SUBJECT_OBJECT_ADD = 'object_add';
+    public const SUBJECT_OBJECT_UPDATE = 'object_update';
+    public const SUBJECT_OBJECT_DELETE = 'object_delete';
+
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IEventMerger */
+    protected $eventMerger;
+
+    /** @var IAppManager */
+    protected $appManager;
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IEventMerger $eventMerger
+     * @param IAppManager $appManager
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IGroupManager $groupManager, IEventMerger $eventMerger, IAppManager $appManager) {
+        parent::__construct($userManager, $groupManager, $url);
+        $this->languageFactory = $languageFactory;
+        $this->activityManager = $activityManager;
+        $this->eventMerger = $eventMerger;
+        $this->appManager = $appManager;
+    }
+
+    /**
+     * @param array $eventData
+     * @return array
+     */
+    protected function generateObjectParameter(array $eventData) {
+        if (!isset($eventData['id']) || !isset($eventData['name'])) {
+            throw new \InvalidArgumentException();
+        }
+
+        $params = [
+            'type' => 'calendar-event',
+            'id' => $eventData['id'],
+            'name' => $eventData['name'],
+
+        ];
+        if (isset($eventData['link']) && is_array($eventData['link']) && $this->appManager->isEnabledForUser('calendar')) {
+            try {
+                // The calendar app needs to be manually loaded for the routes to be loaded
+                OC_App::loadApp('calendar');
+                $linkData = $eventData['link'];
+                $objectId = base64_encode('/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $linkData['calendar_uri'] . '/' . $linkData['object_uri']);
+                $link = [
+                    'view' => 'dayGridMonth',
+                    'timeRange' => 'now',
+                    'mode' => 'sidebar',
+                    'objectId' => $objectId,
+                    'recurrenceId' => 'next'
+                ];
+                $params['link'] = $this->url->linkToRouteAbsolute('calendar.view.indexview.timerange.edit', $link);
+            } catch (\Exception $error) {
+                // Do nothing
+            }
+        }
+        return $params;
+    }
+
+    /**
+     * @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);
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg')));
+        }
+
+        if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
+            $subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
+            $subject = $this->l->t('You created event {event} in calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
+            $subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
+            $subject = $this->l->t('You deleted event {event} from calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
+            $subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
+        } elseif ($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();
+
+        // Nextcloud 13+
+        if (isset($parameters['calendar'])) {
+            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['actor']),
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'event' => $this->generateClassifiedObjectParameter($parameters['object']),
+                    ];
+                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($parameters['calendar'], $this->l),
+                        'event' => $this->generateClassifiedObjectParameter($parameters['object']),
+                    ];
+            }
+        }
+
+        // Legacy - Do NOT Remove unless necessary
+        // Removing this will break parsing of activities that were created on
+        // Nextcloud 12, so we should keep this as long as it's acceptable.
+        // Otherwise if people upgrade over multiple releases in a short period,
+        // they will get the dead entries in their stream.
+        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->generateLegacyCalendarParameter($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->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
+                    'event' => $this->generateObjectParameter($parameters[2]),
+                ];
+        }
+
+        throw new \InvalidArgumentException();
+    }
+
+    private function generateClassifiedObjectParameter(array $eventData) {
+        $parameter = $this->generateObjectParameter($eventData);
+        if (!empty($eventData['classified'])) {
+            $parameter['name'] = $this->l->t('Busy');
+        }
+        return $parameter;
+    }
 }

Spacing +19 added lines, -19 removed lines

@@ -94,7 +94,7 @@ 
 				// The calendar app needs to be manually loaded for the routes to be loaded
 				OC_App::loadApp('calendar');
 				$linkData = $eventData['link'];
-				$objectId = base64_encode('/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $linkData['calendar_uri'] . '/' . $linkData['object_uri']);
+				$objectId = base64_encode('/remote.php/dav/calendars/'.$linkData['owner'].'/'.$linkData['calendar_uri'].'/'.$linkData['object_uri']);
 				$link = [
 					'view' => 'dayGridMonth',
 					'timeRange' => 'now',
@@ -131,17 +131,17 @@ 
 			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg')));
 		}
 
-		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
+		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_event') {
 			$subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_event_self') {
 			$subject = $this->l->t('You created event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_event') {
 			$subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_event_self') {
 			$subject = $this->l->t('You deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_event') {
 			$subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_event_self') {
 			$subject = $this->l->t('You updated event {event} in calendar {calendar}');
 		} else {
 			throw new \InvalidArgumentException();
@@ -166,17 +166,17 @@ 
 		// Nextcloud 13+
 		if (isset($parameters['calendar'])) {
 			switch ($subject) {
-				case self::SUBJECT_OBJECT_ADD . '_event':
-				case self::SUBJECT_OBJECT_DELETE . '_event':
-				case self::SUBJECT_OBJECT_UPDATE . '_event':
+				case self::SUBJECT_OBJECT_ADD.'_event':
+				case self::SUBJECT_OBJECT_DELETE.'_event':
+				case self::SUBJECT_OBJECT_UPDATE.'_event':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'event' => $this->generateClassifiedObjectParameter($parameters['object']),
 					];
-				case self::SUBJECT_OBJECT_ADD . '_event_self':
-				case self::SUBJECT_OBJECT_DELETE . '_event_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_event_self':
+				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($parameters['calendar'], $this->l),
 						'event' => $this->generateClassifiedObjectParameter($parameters['object']),
@@ -190,17 +190,17 @@ 
 		// Otherwise if people upgrade over multiple releases in a short period,
 		// they will get the dead entries in their stream.
 		switch ($subject) {
-			case self::SUBJECT_OBJECT_ADD . '_event':
-			case self::SUBJECT_OBJECT_DELETE . '_event':
-			case self::SUBJECT_OBJECT_UPDATE . '_event':
+			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->generateLegacyCalendarParameter($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':
+			case self::SUBJECT_OBJECT_ADD.'_event_self':
+			case self::SUBJECT_OBJECT_DELETE.'_event_self':
+			case self::SUBJECT_OBJECT_UPDATE.'_event_self':
 				return [
 					'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
 					'event' => $this->generateObjectParameter($parameters[2]),

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

Indentation +105 added lines, -105 removed lines

@@ -28,119 +28,119 @@
 
 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);
 
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
-		}
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.png')));
+        } else {
+            $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}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo_self') {
-			$subject = $this->l->t('You created todo {todo} in list {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo') {
-			$subject = $this->l->t('{actor} deleted todo {todo} from list {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo_self') {
-			$subject = $this->l->t('You deleted todo {todo} from list {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo') {
-			$subject = $this->l->t('{actor} updated todo {todo} in list {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_self') {
-			$subject = $this->l->t('You updated todo {todo} in list {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed') {
-			$subject = $this->l->t('{actor} solved todo {todo} in list {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self') {
-			$subject = $this->l->t('You solved todo {todo} in list {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action') {
-			$subject = $this->l->t('{actor} reopened todo {todo} in list {calendar}');
-		} elseif ($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();
-		}
+        if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo') {
+            $subject = $this->l->t('{actor} created todo {todo} in list {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo_self') {
+            $subject = $this->l->t('You created todo {todo} in list {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo') {
+            $subject = $this->l->t('{actor} deleted todo {todo} from list {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo_self') {
+            $subject = $this->l->t('You deleted todo {todo} from list {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo') {
+            $subject = $this->l->t('{actor} updated todo {todo} in list {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_self') {
+            $subject = $this->l->t('You updated todo {todo} in list {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed') {
+            $subject = $this->l->t('{actor} solved todo {todo} in list {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self') {
+            $subject = $this->l->t('You solved todo {todo} in list {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action') {
+            $subject = $this->l->t('{actor} reopened todo {todo} in list {calendar}');
+        } elseif ($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();
 
-		// Nextcloud 13+
-		if (isset($parameters['calendar'])) {
-			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['actor']),
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'todo' => $this->generateObjectParameter($parameters['object']),
-					];
-				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($parameters['calendar'], $this->l),
-						'todo' => $this->generateObjectParameter($parameters['object']),
-					];
-			}
-		}
+        // Nextcloud 13+
+        if (isset($parameters['calendar'])) {
+            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['actor']),
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'todo' => $this->generateObjectParameter($parameters['object']),
+                    ];
+                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($parameters['calendar'], $this->l),
+                        'todo' => $this->generateObjectParameter($parameters['object']),
+                    ];
+            }
+        }
 
-		// Legacy - Do NOT Remove unless necessary
-		// Removing this will break parsing of activities that were created on
-		// Nextcloud 12, so we should keep this as long as it's acceptable.
-		// Otherwise if people upgrade over multiple releases in a short period,
-		// they will get the dead entries in their stream.
-		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->generateLegacyCalendarParameter($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->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
-					'todo' => $this->generateObjectParameter($parameters[2]),
-				];
-		}
+        // Legacy - Do NOT Remove unless necessary
+        // Removing this will break parsing of activities that were created on
+        // Nextcloud 12, so we should keep this as long as it's acceptable.
+        // Otherwise if people upgrade over multiple releases in a short period,
+        // they will get the dead entries in their stream.
+        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->generateLegacyCalendarParameter($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->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
+                    'todo' => $this->generateObjectParameter($parameters[2]),
+                ];
+        }
 
-		throw new \InvalidArgumentException();
-	}
+        throw new \InvalidArgumentException();
+    }
 }

Spacing +30 added lines, -30 removed lines

@@ -49,25 +49,25 @@ 
 			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
 		}
 
-		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo') {
+		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_todo') {
 			$subject = $this->l->t('{actor} created todo {todo} in list {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_todo_self') {
 			$subject = $this->l->t('You created todo {todo} in list {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_todo') {
 			$subject = $this->l->t('{actor} deleted todo {todo} from list {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_todo_self') {
 			$subject = $this->l->t('You deleted todo {todo} from list {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo') {
 			$subject = $this->l->t('{actor} updated todo {todo} in list {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_self') {
 			$subject = $this->l->t('You updated todo {todo} in list {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_completed') {
 			$subject = $this->l->t('{actor} solved todo {todo} in list {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_completed_self') {
 			$subject = $this->l->t('You solved todo {todo} in list {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action') {
 			$subject = $this->l->t('{actor} reopened todo {todo} in list {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self') {
+		} elseif ($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();
@@ -92,21 +92,21 @@ 
 		// Nextcloud 13+
 		if (isset($parameters['calendar'])) {
 			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':
+				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['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'todo' => $this->generateObjectParameter($parameters['object']),
 					];
-				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':
+				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($parameters['calendar'], $this->l),
 						'todo' => $this->generateObjectParameter($parameters['object']),
@@ -120,21 +120,21 @@ 
 		// Otherwise if people upgrade over multiple releases in a short period,
 		// they will get the dead entries in their stream.
 		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':
+			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->generateLegacyCalendarParameter($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':
+			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->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
 					'todo' => $this->generateObjectParameter($parameters[2]),

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

Indentation +207 added lines, -207 removed lines

@@ -37,228 +37,228 @@
 use OCP\L10N\IFactory;
 
 class Calendar extends Base {
-	public const SUBJECT_ADD = 'calendar_add';
-	public const SUBJECT_UPDATE = 'calendar_update';
-	public const SUBJECT_DELETE = 'calendar_delete';
-	public const SUBJECT_PUBLISH = 'calendar_publish';
-	public const SUBJECT_UNPUBLISH = 'calendar_unpublish';
-	public const SUBJECT_SHARE_USER = 'calendar_user_share';
-	public const SUBJECT_SHARE_GROUP = 'calendar_group_share';
-	public const SUBJECT_UNSHARE_USER = 'calendar_user_unshare';
-	public const SUBJECT_UNSHARE_GROUP = 'calendar_group_unshare';
+    public const SUBJECT_ADD = 'calendar_add';
+    public const SUBJECT_UPDATE = 'calendar_update';
+    public const SUBJECT_DELETE = 'calendar_delete';
+    public const SUBJECT_PUBLISH = 'calendar_publish';
+    public const SUBJECT_UNPUBLISH = 'calendar_unpublish';
+    public const SUBJECT_SHARE_USER = 'calendar_user_share';
+    public const SUBJECT_SHARE_GROUP = 'calendar_group_share';
+    public const SUBJECT_UNSHARE_USER = 'calendar_user_unshare';
+    public const SUBJECT_UNSHARE_GROUP = 'calendar_group_unshare';
 
-	/** @var IFactory */
-	protected $languageFactory;
+    /** @var IFactory */
+    protected $languageFactory;
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/** @var IManager */
-	protected $activityManager;
+    /** @var IManager */
+    protected $activityManager;
 
-	/** @var IEventMerger */
-	protected $eventMerger;
+    /** @var IEventMerger */
+    protected $eventMerger;
 
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IEventMerger $eventMerger
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IGroupManager $groupManager, IEventMerger $eventMerger) {
-		parent::__construct($userManager, $groupManager, $url);
-		$this->languageFactory = $languageFactory;
-		$this->activityManager = $activityManager;
-		$this->eventMerger = $eventMerger;
-	}
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IEventMerger $eventMerger
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IGroupManager $groupManager, IEventMerger $eventMerger) {
+        parent::__construct($userManager, $groupManager, $url);
+        $this->languageFactory = $languageFactory;
+        $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();
-		}
+    /**
+     * @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);
+        $this->l = $this->languageFactory->get('dav', $language);
 
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg')));
-		}
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg')));
+        }
 
-		if ($event->getSubject() === self::SUBJECT_ADD) {
-			$subject = $this->l->t('{actor} created calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
-			$subject = $this->l->t('You created calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_DELETE) {
-			$subject = $this->l->t('{actor} deleted calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
-			$subject = $this->l->t('You deleted calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
-			$subject = $this->l->t('{actor} updated calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
-			$subject = $this->l->t('You updated calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_PUBLISH . '_self') {
-			$subject = $this->l->t('You shared calendar {calendar} as public link');
-		} elseif ($event->getSubject() === self::SUBJECT_UNPUBLISH . '_self') {
-			$subject = $this->l->t('You removed public link for calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER) {
-			$subject = $this->l->t('{actor} shared calendar {calendar} with you');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
-			$subject = $this->l->t('You shared calendar {calendar} with {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
-			$subject = $this->l->t('{actor} shared calendar {calendar} with {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
-			$subject = $this->l->t('{actor} unshared calendar {calendar} from you');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
-			$subject = $this->l->t('You unshared calendar {calendar} from {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
-			$subject = $this->l->t('{actor} unshared calendar {calendar} from {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
-			$subject = $this->l->t('{actor} unshared calendar {calendar} from themselves');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
-			$subject = $this->l->t('You shared calendar {calendar} with group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
-			$subject = $this->l->t('{actor} shared calendar {calendar} with group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
-			$subject = $this->l->t('You unshared calendar {calendar} from group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
-			$subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
+        if ($event->getSubject() === self::SUBJECT_ADD) {
+            $subject = $this->l->t('{actor} created calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
+            $subject = $this->l->t('You created calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_DELETE) {
+            $subject = $this->l->t('{actor} deleted calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
+            $subject = $this->l->t('You deleted calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
+            $subject = $this->l->t('{actor} updated calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
+            $subject = $this->l->t('You updated calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_PUBLISH . '_self') {
+            $subject = $this->l->t('You shared calendar {calendar} as public link');
+        } elseif ($event->getSubject() === self::SUBJECT_UNPUBLISH . '_self') {
+            $subject = $this->l->t('You removed public link for calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_SHARE_USER) {
+            $subject = $this->l->t('{actor} shared calendar {calendar} with you');
+        } elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
+            $subject = $this->l->t('You shared calendar {calendar} with {user}');
+        } elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
+            $subject = $this->l->t('{actor} shared calendar {calendar} with {user}');
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
+            $subject = $this->l->t('{actor} unshared calendar {calendar} from you');
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
+            $subject = $this->l->t('You unshared calendar {calendar} from {user}');
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
+            $subject = $this->l->t('{actor} unshared calendar {calendar} from {user}');
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
+            $subject = $this->l->t('{actor} unshared calendar {calendar} from themselves');
+        } elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
+            $subject = $this->l->t('You shared calendar {calendar} with group {group}');
+        } elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
+            $subject = $this->l->t('{actor} shared calendar {calendar} with group {group}');
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
+            $subject = $this->l->t('You unshared calendar {calendar} from group {group}');
+        } elseif ($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);
+        $parsedParameters = $this->getParameters($event);
+        $this->setSubjects($event, $subject, $parsedParameters);
 
-		$event = $this->eventMerger->mergeEvents('calendar', $event, $previousEvent);
+        $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);
-			} elseif (isset($parsedParameters['group'])) {
-				// Couldn't group by calendar, maybe we can group by groups
-				$event = $this->eventMerger->mergeEvents('group', $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);
+            } elseif (isset($parsedParameters['group'])) {
+                // Couldn't group by calendar, maybe we can group by groups
+                $event = $this->eventMerger->mergeEvents('group', $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();
 
-		// Nextcloud 13+
-		if (isset($parameters['calendar'])) {
-			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_PUBLISH . '_self':
-				case self::SUBJECT_UNPUBLISH . '_self':
-				case self::SUBJECT_SHARE_USER:
-				case self::SUBJECT_UNSHARE_USER:
-				case self::SUBJECT_UNSHARE_USER . '_self':
-					return [
-						'actor' => $this->generateUserParameter($parameters['actor']),
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-					];
-				case self::SUBJECT_SHARE_USER . '_you':
-				case self::SUBJECT_UNSHARE_USER . '_you':
-					return [
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'user' => $this->generateUserParameter($parameters['user']),
-					];
-				case self::SUBJECT_SHARE_USER . '_by':
-				case self::SUBJECT_UNSHARE_USER . '_by':
-					return [
-						'actor' => $this->generateUserParameter($parameters['actor']),
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'user' => $this->generateUserParameter($parameters['user']),
-					];
-				case self::SUBJECT_SHARE_GROUP . '_you':
-				case self::SUBJECT_UNSHARE_GROUP . '_you':
-					return [
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'group' => $this->generateGroupParameter($parameters['group']),
-					];
-				case self::SUBJECT_SHARE_GROUP . '_by':
-				case self::SUBJECT_UNSHARE_GROUP . '_by':
-					return [
-						'actor' => $this->generateUserParameter($parameters['actor']),
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'group' => $this->generateGroupParameter($parameters['group']),
-					];
-			}
-		}
+        // Nextcloud 13+
+        if (isset($parameters['calendar'])) {
+            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_PUBLISH . '_self':
+                case self::SUBJECT_UNPUBLISH . '_self':
+                case self::SUBJECT_SHARE_USER:
+                case self::SUBJECT_UNSHARE_USER:
+                case self::SUBJECT_UNSHARE_USER . '_self':
+                    return [
+                        'actor' => $this->generateUserParameter($parameters['actor']),
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                    ];
+                case self::SUBJECT_SHARE_USER . '_you':
+                case self::SUBJECT_UNSHARE_USER . '_you':
+                    return [
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'user' => $this->generateUserParameter($parameters['user']),
+                    ];
+                case self::SUBJECT_SHARE_USER . '_by':
+                case self::SUBJECT_UNSHARE_USER . '_by':
+                    return [
+                        'actor' => $this->generateUserParameter($parameters['actor']),
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'user' => $this->generateUserParameter($parameters['user']),
+                    ];
+                case self::SUBJECT_SHARE_GROUP . '_you':
+                case self::SUBJECT_UNSHARE_GROUP . '_you':
+                    return [
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'group' => $this->generateGroupParameter($parameters['group']),
+                    ];
+                case self::SUBJECT_SHARE_GROUP . '_by':
+                case self::SUBJECT_UNSHARE_GROUP . '_by':
+                    return [
+                        'actor' => $this->generateUserParameter($parameters['actor']),
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'group' => $this->generateGroupParameter($parameters['group']),
+                    ];
+            }
+        }
 
-		// Legacy - Do NOT Remove unless necessary
-		// Removing this will break parsing of activities that were created on
-		// Nextcloud 12, so we should keep this as long as it's acceptable.
-		// Otherwise if people upgrade over multiple releases in a short period,
-		// they will get the dead entries in their stream.
-		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_PUBLISH . '_self':
-			case self::SUBJECT_UNPUBLISH . '_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->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
-				];
-			case self::SUBJECT_SHARE_USER . '_you':
-			case self::SUBJECT_UNSHARE_USER . '_you':
-				return [
-					'user' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
-				];
-			case self::SUBJECT_SHARE_USER . '_by':
-			case self::SUBJECT_UNSHARE_USER . '_by':
-				return [
-					'user' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter($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->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
-				];
-			case self::SUBJECT_SHARE_GROUP . '_by':
-			case self::SUBJECT_UNSHARE_GROUP . '_by':
-				return [
-					'group' => $this->generateGroupParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
-					'actor' => $this->generateUserParameter($parameters[2]),
-				];
-		}
+        // Legacy - Do NOT Remove unless necessary
+        // Removing this will break parsing of activities that were created on
+        // Nextcloud 12, so we should keep this as long as it's acceptable.
+        // Otherwise if people upgrade over multiple releases in a short period,
+        // they will get the dead entries in their stream.
+        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_PUBLISH . '_self':
+            case self::SUBJECT_UNPUBLISH . '_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->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
+                ];
+            case self::SUBJECT_SHARE_USER . '_you':
+            case self::SUBJECT_UNSHARE_USER . '_you':
+                return [
+                    'user' => $this->generateUserParameter($parameters[0]),
+                    'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
+                ];
+            case self::SUBJECT_SHARE_USER . '_by':
+            case self::SUBJECT_UNSHARE_USER . '_by':
+                return [
+                    'user' => $this->generateUserParameter($parameters[0]),
+                    'calendar' => $this->generateLegacyCalendarParameter($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->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
+                ];
+            case self::SUBJECT_SHARE_GROUP . '_by':
+            case self::SUBJECT_UNSHARE_GROUP . '_by':
+                return [
+                    'group' => $this->generateGroupParameter($parameters[0]),
+                    'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
+                    'actor' => $this->generateUserParameter($parameters[2]),
+                ];
+        }
 
-		throw new \InvalidArgumentException();
-	}
+        throw new \InvalidArgumentException();
+    }
 }

Spacing +42 added lines, -42 removed lines

@@ -97,41 +97,41 @@ 
 
 		if ($event->getSubject() === self::SUBJECT_ADD) {
 			$subject = $this->l->t('{actor} created calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_ADD.'_self') {
 			$subject = $this->l->t('You created calendar {calendar}');
 		} elseif ($event->getSubject() === self::SUBJECT_DELETE) {
 			$subject = $this->l->t('{actor} deleted calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_DELETE.'_self') {
 			$subject = $this->l->t('You deleted calendar {calendar}');
 		} elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
 			$subject = $this->l->t('{actor} updated calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_UPDATE.'_self') {
 			$subject = $this->l->t('You updated calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_PUBLISH . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_PUBLISH.'_self') {
 			$subject = $this->l->t('You shared calendar {calendar} as public link');
-		} elseif ($event->getSubject() === self::SUBJECT_UNPUBLISH . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNPUBLISH.'_self') {
 			$subject = $this->l->t('You removed public link for calendar {calendar}');
 		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER) {
 			$subject = $this->l->t('{actor} shared calendar {calendar} with you');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
+		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER.'_you') {
 			$subject = $this->l->t('You shared calendar {calendar} with {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
+		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER.'_by') {
 			$subject = $this->l->t('{actor} shared calendar {calendar} with {user}');
 		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
 			$subject = $this->l->t('{actor} unshared calendar {calendar} from you');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_you') {
 			$subject = $this->l->t('You unshared calendar {calendar} from {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_by') {
 			$subject = $this->l->t('{actor} unshared calendar {calendar} from {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_self') {
 			$subject = $this->l->t('{actor} unshared calendar {calendar} from themselves');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
+		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_you') {
 			$subject = $this->l->t('You shared calendar {calendar} with group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
+		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_by') {
 			$subject = $this->l->t('{actor} shared calendar {calendar} with group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_you') {
 			$subject = $this->l->t('You unshared calendar {calendar} from group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
+		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_by') {
 			$subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}');
 		} else {
 			throw new \InvalidArgumentException();
@@ -167,41 +167,41 @@ 
 		if (isset($parameters['calendar'])) {
 			switch ($subject) {
 				case self::SUBJECT_ADD:
-				case self::SUBJECT_ADD . '_self':
+				case self::SUBJECT_ADD.'_self':
 				case self::SUBJECT_DELETE:
-				case self::SUBJECT_DELETE . '_self':
+				case self::SUBJECT_DELETE.'_self':
 				case self::SUBJECT_UPDATE:
-				case self::SUBJECT_UPDATE . '_self':
-				case self::SUBJECT_PUBLISH . '_self':
-				case self::SUBJECT_UNPUBLISH . '_self':
+				case self::SUBJECT_UPDATE.'_self':
+				case self::SUBJECT_PUBLISH.'_self':
+				case self::SUBJECT_UNPUBLISH.'_self':
 				case self::SUBJECT_SHARE_USER:
 				case self::SUBJECT_UNSHARE_USER:
-				case self::SUBJECT_UNSHARE_USER . '_self':
+				case self::SUBJECT_UNSHARE_USER.'_self':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 					];
-				case self::SUBJECT_SHARE_USER . '_you':
-				case self::SUBJECT_UNSHARE_USER . '_you':
+				case self::SUBJECT_SHARE_USER.'_you':
+				case self::SUBJECT_UNSHARE_USER.'_you':
 					return [
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'user' => $this->generateUserParameter($parameters['user']),
 					];
-				case self::SUBJECT_SHARE_USER . '_by':
-				case self::SUBJECT_UNSHARE_USER . '_by':
+				case self::SUBJECT_SHARE_USER.'_by':
+				case self::SUBJECT_UNSHARE_USER.'_by':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'user' => $this->generateUserParameter($parameters['user']),
 					];
-				case self::SUBJECT_SHARE_GROUP . '_you':
-				case self::SUBJECT_UNSHARE_GROUP . '_you':
+				case self::SUBJECT_SHARE_GROUP.'_you':
+				case self::SUBJECT_UNSHARE_GROUP.'_you':
 					return [
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'group' => $this->generateGroupParameter($parameters['group']),
 					];
-				case self::SUBJECT_SHARE_GROUP . '_by':
-				case self::SUBJECT_UNSHARE_GROUP . '_by':
+				case self::SUBJECT_SHARE_GROUP.'_by':
+				case self::SUBJECT_UNSHARE_GROUP.'_by':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
@@ -217,41 +217,41 @@ 
 		// they will get the dead entries in their stream.
 		switch ($subject) {
 			case self::SUBJECT_ADD:
-			case self::SUBJECT_ADD . '_self':
+			case self::SUBJECT_ADD.'_self':
 			case self::SUBJECT_DELETE:
-			case self::SUBJECT_DELETE . '_self':
+			case self::SUBJECT_DELETE.'_self':
 			case self::SUBJECT_UPDATE:
-			case self::SUBJECT_UPDATE . '_self':
-			case self::SUBJECT_PUBLISH . '_self':
-			case self::SUBJECT_UNPUBLISH . '_self':
+			case self::SUBJECT_UPDATE.'_self':
+			case self::SUBJECT_PUBLISH.'_self':
+			case self::SUBJECT_UNPUBLISH.'_self':
 			case self::SUBJECT_SHARE_USER:
 			case self::SUBJECT_UNSHARE_USER:
-			case self::SUBJECT_UNSHARE_USER . '_self':
+			case self::SUBJECT_UNSHARE_USER.'_self':
 				return [
 					'actor' => $this->generateUserParameter($parameters[0]),
 					'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
 				];
-			case self::SUBJECT_SHARE_USER . '_you':
-			case self::SUBJECT_UNSHARE_USER . '_you':
+			case self::SUBJECT_SHARE_USER.'_you':
+			case self::SUBJECT_UNSHARE_USER.'_you':
 				return [
 					'user' => $this->generateUserParameter($parameters[0]),
 					'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
 				];
-			case self::SUBJECT_SHARE_USER . '_by':
-			case self::SUBJECT_UNSHARE_USER . '_by':
+			case self::SUBJECT_SHARE_USER.'_by':
+			case self::SUBJECT_UNSHARE_USER.'_by':
 				return [
 					'user' => $this->generateUserParameter($parameters[0]),
 					'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
 					'actor' => $this->generateUserParameter($parameters[2]),
 				];
-			case self::SUBJECT_SHARE_GROUP . '_you':
-			case self::SUBJECT_UNSHARE_GROUP . '_you':
+			case self::SUBJECT_SHARE_GROUP.'_you':
+			case self::SUBJECT_UNSHARE_GROUP.'_you':
 				return [
 					'group' => $this->generateGroupParameter($parameters[0]),
 					'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),
 				];
-			case self::SUBJECT_SHARE_GROUP . '_by':
-			case self::SUBJECT_UNSHARE_GROUP . '_by':
+			case self::SUBJECT_SHARE_GROUP.'_by':
+			case self::SUBJECT_UNSHARE_GROUP.'_by':
 				return [
 					'group' => $this->generateGroupParameter($parameters[0]),
 					'calendar' => $this->generateLegacyCalendarParameter($event->getObjectId(), $parameters[1]),

apps/files_sharing/lib/Controller/ShareesAPIController.php

Indentation +379 added lines, -379 removed lines

@@ -57,383 +57,383 @@
 
 class ShareesAPIController extends OCSController {
 
-	/** @var string */
-	protected $userId;
-
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var IManager */
-	protected $shareManager;
-
-	/** @var int */
-	protected $offset = 0;
-
-	/** @var int */
-	protected $limit = 10;
-
-	/** @var array */
-	protected $result = [
-		'exact' => [
-			'users' => [],
-			'groups' => [],
-			'remotes' => [],
-			'remote_groups' => [],
-			'emails' => [],
-			'circles' => [],
-			'rooms' => [],
-			'deck' => [],
-		],
-		'users' => [],
-		'groups' => [],
-		'remotes' => [],
-		'remote_groups' => [],
-		'emails' => [],
-		'lookup' => [],
-		'circles' => [],
-		'rooms' => [],
-		'deck' => [],
-		'lookupEnabled' => false,
-	];
-
-	protected $reachedEndFor = [];
-	/** @var ISearch */
-	private $collaboratorSearch;
-
-	/**
-	 * @param string $UserId
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IURLGenerator $urlGenerator
-	 * @param IManager $shareManager
-	 * @param ISearch $collaboratorSearch
-	 */
-	public function __construct(
-		$UserId,
-		string $appName,
-		IRequest $request,
-		IConfig $config,
-		IURLGenerator $urlGenerator,
-		IManager $shareManager,
-		ISearch $collaboratorSearch
-	) {
-		parent::__construct($appName, $request);
-		$this->userId = $UserId;
-		$this->config = $config;
-		$this->urlGenerator = $urlGenerator;
-		$this->shareManager = $shareManager;
-		$this->collaboratorSearch = $collaboratorSearch;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $search
-	 * @param string $itemType
-	 * @param int $page
-	 * @param int $perPage
-	 * @param int|int[] $shareType
-	 * @param bool $lookup
-	 * @return DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	public function search(string $search = '', string $itemType = null, int $page = 1, int $perPage = 200, $shareType = null, bool $lookup = true): DataResponse {
-
-		// only search for string larger than a given threshold
-		$threshold = (int)$this->config->getSystemValue('sharing.minSearchStringLength', 0);
-		if (strlen($search) < $threshold) {
-			return new DataResponse($this->result);
-		}
-
-		// never return more than the max. number of results configured in the config.php
-		$maxResults = $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT);
-		if ($maxResults > 0) {
-			$perPage = min($perPage, $maxResults);
-		}
-		if ($perPage <= 0) {
-			throw new OCSBadRequestException('Invalid perPage argument');
-		}
-		if ($page <= 0) {
-			throw new OCSBadRequestException('Invalid page');
-		}
-
-		$shareTypes = [
-			IShare::TYPE_USER,
-		];
-
-		if ($itemType === null) {
-			throw new OCSBadRequestException('Missing itemType');
-		} elseif ($itemType === 'file' || $itemType === 'folder') {
-			if ($this->shareManager->allowGroupSharing()) {
-				$shareTypes[] = IShare::TYPE_GROUP;
-			}
-
-			if ($this->isRemoteSharingAllowed($itemType)) {
-				$shareTypes[] = IShare::TYPE_REMOTE;
-			}
-
-			if ($this->isRemoteGroupSharingAllowed($itemType)) {
-				$shareTypes[] = IShare::TYPE_REMOTE_GROUP;
-			}
-
-			if ($this->shareManager->shareProviderExists(IShare::TYPE_EMAIL)) {
-				$shareTypes[] = IShare::TYPE_EMAIL;
-			}
-
-			if ($this->shareManager->shareProviderExists(IShare::TYPE_ROOM)) {
-				$shareTypes[] = IShare::TYPE_ROOM;
-			}
-
-			if ($this->shareManager->shareProviderExists(IShare::TYPE_DECK)) {
-				$shareTypes[] = IShare::TYPE_DECK;
-			}
-		} else {
-			$shareTypes[] = IShare::TYPE_GROUP;
-			$shareTypes[] = IShare::TYPE_EMAIL;
-		}
-
-		// FIXME: DI
-		if (\OC::$server->getAppManager()->isEnabledForUser('circles') && class_exists('\OCA\Circles\ShareByCircleProvider')) {
-			$shareTypes[] = IShare::TYPE_CIRCLE;
-		}
-
-		if ($this->shareManager->shareProviderExists(IShare::TYPE_DECK)) {
-			$shareTypes[] = IShare::TYPE_DECK;
-		}
-
-		if ($shareType !== null && is_array($shareType)) {
-			$shareTypes = array_intersect($shareTypes, $shareType);
-		} elseif (is_numeric($shareType)) {
-			$shareTypes = array_intersect($shareTypes, [(int) $shareType]);
-		}
-		sort($shareTypes);
-
-		$this->limit = $perPage;
-		$this->offset = $perPage * ($page - 1);
-
-		// In global scale mode we always search the loogup server
-		if ($this->config->getSystemValueBool('gs.enabled', false)) {
-			$lookup = true;
-			$this->result['lookupEnabled'] = true;
-		} else {
-			$this->result['lookupEnabled'] = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes';
-		}
-
-		list($result, $hasMoreResults) = $this->collaboratorSearch->search($search, $shareTypes, $lookup, $this->limit, $this->offset);
-
-		// extra treatment for 'exact' subarray, with a single merge expected keys might be lost
-		if (isset($result['exact'])) {
-			$result['exact'] = array_merge($this->result['exact'], $result['exact']);
-		}
-		$this->result = array_merge($this->result, $result);
-		$response = new DataResponse($this->result);
-
-		if ($hasMoreResults) {
-			$response->addHeader('Link', $this->getPaginationLink($page, [
-				'search' => $search,
-				'itemType' => $itemType,
-				'shareType' => $shareTypes,
-				'perPage' => $perPage,
-			]));
-		}
-
-		return $response;
-	}
-
-	/**
-	 * @param string $user
-	 * @param int $shareType
-	 *
-	 * @return Generator<array<string>>
-	 */
-	private function getAllShareesByType(string $user, int $shareType): Generator {
-		$offset = 0;
-		$pageSize = 50;
-
-		while (count($page = $this->shareManager->getSharesBy(
-			$user,
-			$shareType,
-			null,
-			false,
-			$pageSize,
-			$offset
-		))) {
-			foreach ($page as $share) {
-				yield [$share->getSharedWith(), $share->getSharedWithDisplayName() ?? $share->getSharedWith()];
-			}
-
-			$offset += $pageSize;
-		}
-	}
-
-	private function sortShareesByFrequency(array $sharees): array {
-		usort($sharees, function (array $s1, array $s2) {
-			return $s2['count'] - $s1['count'];
-		});
-		return $sharees;
-	}
-
-	private $searchResultTypeMap = [
-		IShare::TYPE_USER => 'users',
-		IShare::TYPE_GROUP => 'groups',
-		IShare::TYPE_REMOTE => 'remotes',
-		IShare::TYPE_REMOTE_GROUP => 'remote_groups',
-		IShare::TYPE_EMAIL => 'emails',
-	];
-
-	private function getAllSharees(string $user, array $shareTypes): ISearchResult {
-		$result = [];
-		foreach ($shareTypes as $shareType) {
-			$sharees = $this->getAllShareesByType($user, $shareType);
-			$shareTypeResults = [];
-			foreach ($sharees as list($sharee, $displayname)) {
-				if (!isset($this->searchResultTypeMap[$shareType])) {
-					continue;
-				}
-
-				if (!isset($shareTypeResults[$sharee])) {
-					$shareTypeResults[$sharee] = [
-						'count' => 1,
-						'label' => $displayname,
-						'value' => [
-							'shareType' => $shareType,
-							'shareWith' => $sharee,
-						],
-					];
-				} else {
-					$shareTypeResults[$sharee]['count']++;
-				}
-			}
-			$result = array_merge($result, array_values($shareTypeResults));
-		}
-
-		$top5 = array_slice(
-			$this->sortShareesByFrequency($result),
-			0,
-			5
-		);
-
-		$searchResult = new SearchResult();
-		foreach ($this->searchResultTypeMap as $int => $str) {
-			$searchResult->addResultSet(new SearchResultType($str), [], []);
-			foreach ($top5 as $x) {
-				if ($x['value']['shareType'] === $int) {
-					$searchResult->addResultSet(new SearchResultType($str), [], [$x]);
-				}
-			}
-		}
-		return $searchResult;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $itemType
-	 * @return DataResponse
-	 * @throws OCSBadRequestException
-	 */
-	public function findRecommended(string $itemType = null, $shareType = null): DataResponse {
-		$shareTypes = [
-			IShare::TYPE_USER,
-		];
-
-		if ($itemType === null) {
-			throw new OCSBadRequestException('Missing itemType');
-		} elseif ($itemType === 'file' || $itemType === 'folder') {
-			if ($this->shareManager->allowGroupSharing()) {
-				$shareTypes[] = IShare::TYPE_GROUP;
-			}
-
-			if ($this->isRemoteSharingAllowed($itemType)) {
-				$shareTypes[] = IShare::TYPE_REMOTE;
-			}
-
-			if ($this->isRemoteGroupSharingAllowed($itemType)) {
-				$shareTypes[] = IShare::TYPE_REMOTE_GROUP;
-			}
-
-			if ($this->shareManager->shareProviderExists(IShare::TYPE_EMAIL)) {
-				$shareTypes[] = IShare::TYPE_EMAIL;
-			}
-
-			if ($this->shareManager->shareProviderExists(IShare::TYPE_ROOM)) {
-				$shareTypes[] = IShare::TYPE_ROOM;
-			}
-		} else {
-			$shareTypes[] = IShare::TYPE_GROUP;
-			$shareTypes[] = IShare::TYPE_EMAIL;
-		}
-
-		// FIXME: DI
-		if (\OC::$server->getAppManager()->isEnabledForUser('circles') && class_exists('\OCA\Circles\ShareByCircleProvider')) {
-			$shareTypes[] = IShare::TYPE_CIRCLE;
-		}
-
-		if (isset($_GET['shareType']) && is_array($_GET['shareType'])) {
-			$shareTypes = array_intersect($shareTypes, $_GET['shareType']);
-			sort($shareTypes);
-		} elseif (is_numeric($shareType)) {
-			$shareTypes = array_intersect($shareTypes, [(int) $shareType]);
-			sort($shareTypes);
-		}
-
-		return new DataResponse(
-			$this->getAllSharees($this->userId, $shareTypes)->asArray()
-		);
-	}
-
-	/**
-	 * Method to get out the static call for better testing
-	 *
-	 * @param string $itemType
-	 * @return bool
-	 */
-	protected function isRemoteSharingAllowed(string $itemType): bool {
-		try {
-			// FIXME: static foo makes unit testing unnecessarily difficult
-			$backend = \OC\Share\Share::getBackend($itemType);
-			return $backend->isShareTypeAllowed(IShare::TYPE_REMOTE);
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	protected function isRemoteGroupSharingAllowed(string $itemType): bool {
-		try {
-			// FIXME: static foo makes unit testing unnecessarily difficult
-			$backend = \OC\Share\Share::getBackend($itemType);
-			return $backend->isShareTypeAllowed(IShare::TYPE_REMOTE_GROUP);
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-
-	/**
-	 * Generates a bunch of pagination links for the current page
-	 *
-	 * @param int $page Current page
-	 * @param array $params Parameters for the URL
-	 * @return string
-	 */
-	protected function getPaginationLink(int $page, array $params): string {
-		if ($this->isV2()) {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
-		} else {
-			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
-		}
-		$params['page'] = $page + 1;
-		return '<' . $url . http_build_query($params) . '>; rel="next"';
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function isV2(): bool {
-		return $this->request->getScriptName() === '/ocs/v2.php';
-	}
+    /** @var string */
+    protected $userId;
+
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+
+    /** @var IManager */
+    protected $shareManager;
+
+    /** @var int */
+    protected $offset = 0;
+
+    /** @var int */
+    protected $limit = 10;
+
+    /** @var array */
+    protected $result = [
+        'exact' => [
+            'users' => [],
+            'groups' => [],
+            'remotes' => [],
+            'remote_groups' => [],
+            'emails' => [],
+            'circles' => [],
+            'rooms' => [],
+            'deck' => [],
+        ],
+        'users' => [],
+        'groups' => [],
+        'remotes' => [],
+        'remote_groups' => [],
+        'emails' => [],
+        'lookup' => [],
+        'circles' => [],
+        'rooms' => [],
+        'deck' => [],
+        'lookupEnabled' => false,
+    ];
+
+    protected $reachedEndFor = [];
+    /** @var ISearch */
+    private $collaboratorSearch;
+
+    /**
+     * @param string $UserId
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IURLGenerator $urlGenerator
+     * @param IManager $shareManager
+     * @param ISearch $collaboratorSearch
+     */
+    public function __construct(
+        $UserId,
+        string $appName,
+        IRequest $request,
+        IConfig $config,
+        IURLGenerator $urlGenerator,
+        IManager $shareManager,
+        ISearch $collaboratorSearch
+    ) {
+        parent::__construct($appName, $request);
+        $this->userId = $UserId;
+        $this->config = $config;
+        $this->urlGenerator = $urlGenerator;
+        $this->shareManager = $shareManager;
+        $this->collaboratorSearch = $collaboratorSearch;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $search
+     * @param string $itemType
+     * @param int $page
+     * @param int $perPage
+     * @param int|int[] $shareType
+     * @param bool $lookup
+     * @return DataResponse
+     * @throws OCSBadRequestException
+     */
+    public function search(string $search = '', string $itemType = null, int $page = 1, int $perPage = 200, $shareType = null, bool $lookup = true): DataResponse {
+
+        // only search for string larger than a given threshold
+        $threshold = (int)$this->config->getSystemValue('sharing.minSearchStringLength', 0);
+        if (strlen($search) < $threshold) {
+            return new DataResponse($this->result);
+        }
+
+        // never return more than the max. number of results configured in the config.php
+        $maxResults = $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT);
+        if ($maxResults > 0) {
+            $perPage = min($perPage, $maxResults);
+        }
+        if ($perPage <= 0) {
+            throw new OCSBadRequestException('Invalid perPage argument');
+        }
+        if ($page <= 0) {
+            throw new OCSBadRequestException('Invalid page');
+        }
+
+        $shareTypes = [
+            IShare::TYPE_USER,
+        ];
+
+        if ($itemType === null) {
+            throw new OCSBadRequestException('Missing itemType');
+        } elseif ($itemType === 'file' || $itemType === 'folder') {
+            if ($this->shareManager->allowGroupSharing()) {
+                $shareTypes[] = IShare::TYPE_GROUP;
+            }
+
+            if ($this->isRemoteSharingAllowed($itemType)) {
+                $shareTypes[] = IShare::TYPE_REMOTE;
+            }
+
+            if ($this->isRemoteGroupSharingAllowed($itemType)) {
+                $shareTypes[] = IShare::TYPE_REMOTE_GROUP;
+            }
+
+            if ($this->shareManager->shareProviderExists(IShare::TYPE_EMAIL)) {
+                $shareTypes[] = IShare::TYPE_EMAIL;
+            }
+
+            if ($this->shareManager->shareProviderExists(IShare::TYPE_ROOM)) {
+                $shareTypes[] = IShare::TYPE_ROOM;
+            }
+
+            if ($this->shareManager->shareProviderExists(IShare::TYPE_DECK)) {
+                $shareTypes[] = IShare::TYPE_DECK;
+            }
+        } else {
+            $shareTypes[] = IShare::TYPE_GROUP;
+            $shareTypes[] = IShare::TYPE_EMAIL;
+        }
+
+        // FIXME: DI
+        if (\OC::$server->getAppManager()->isEnabledForUser('circles') && class_exists('\OCA\Circles\ShareByCircleProvider')) {
+            $shareTypes[] = IShare::TYPE_CIRCLE;
+        }
+
+        if ($this->shareManager->shareProviderExists(IShare::TYPE_DECK)) {
+            $shareTypes[] = IShare::TYPE_DECK;
+        }
+
+        if ($shareType !== null && is_array($shareType)) {
+            $shareTypes = array_intersect($shareTypes, $shareType);
+        } elseif (is_numeric($shareType)) {
+            $shareTypes = array_intersect($shareTypes, [(int) $shareType]);
+        }
+        sort($shareTypes);
+
+        $this->limit = $perPage;
+        $this->offset = $perPage * ($page - 1);
+
+        // In global scale mode we always search the loogup server
+        if ($this->config->getSystemValueBool('gs.enabled', false)) {
+            $lookup = true;
+            $this->result['lookupEnabled'] = true;
+        } else {
+            $this->result['lookupEnabled'] = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'yes') === 'yes';
+        }
+
+        list($result, $hasMoreResults) = $this->collaboratorSearch->search($search, $shareTypes, $lookup, $this->limit, $this->offset);
+
+        // extra treatment for 'exact' subarray, with a single merge expected keys might be lost
+        if (isset($result['exact'])) {
+            $result['exact'] = array_merge($this->result['exact'], $result['exact']);
+        }
+        $this->result = array_merge($this->result, $result);
+        $response = new DataResponse($this->result);
+
+        if ($hasMoreResults) {
+            $response->addHeader('Link', $this->getPaginationLink($page, [
+                'search' => $search,
+                'itemType' => $itemType,
+                'shareType' => $shareTypes,
+                'perPage' => $perPage,
+            ]));
+        }
+
+        return $response;
+    }
+
+    /**
+     * @param string $user
+     * @param int $shareType
+     *
+     * @return Generator<array<string>>
+     */
+    private function getAllShareesByType(string $user, int $shareType): Generator {
+        $offset = 0;
+        $pageSize = 50;
+
+        while (count($page = $this->shareManager->getSharesBy(
+            $user,
+            $shareType,
+            null,
+            false,
+            $pageSize,
+            $offset
+        ))) {
+            foreach ($page as $share) {
+                yield [$share->getSharedWith(), $share->getSharedWithDisplayName() ?? $share->getSharedWith()];
+            }
+
+            $offset += $pageSize;
+        }
+    }
+
+    private function sortShareesByFrequency(array $sharees): array {
+        usort($sharees, function (array $s1, array $s2) {
+            return $s2['count'] - $s1['count'];
+        });
+        return $sharees;
+    }
+
+    private $searchResultTypeMap = [
+        IShare::TYPE_USER => 'users',
+        IShare::TYPE_GROUP => 'groups',
+        IShare::TYPE_REMOTE => 'remotes',
+        IShare::TYPE_REMOTE_GROUP => 'remote_groups',
+        IShare::TYPE_EMAIL => 'emails',
+    ];
+
+    private function getAllSharees(string $user, array $shareTypes): ISearchResult {
+        $result = [];
+        foreach ($shareTypes as $shareType) {
+            $sharees = $this->getAllShareesByType($user, $shareType);
+            $shareTypeResults = [];
+            foreach ($sharees as list($sharee, $displayname)) {
+                if (!isset($this->searchResultTypeMap[$shareType])) {
+                    continue;
+                }
+
+                if (!isset($shareTypeResults[$sharee])) {
+                    $shareTypeResults[$sharee] = [
+                        'count' => 1,
+                        'label' => $displayname,
+                        'value' => [
+                            'shareType' => $shareType,
+                            'shareWith' => $sharee,
+                        ],
+                    ];
+                } else {
+                    $shareTypeResults[$sharee]['count']++;
+                }
+            }
+            $result = array_merge($result, array_values($shareTypeResults));
+        }
+
+        $top5 = array_slice(
+            $this->sortShareesByFrequency($result),
+            0,
+            5
+        );
+
+        $searchResult = new SearchResult();
+        foreach ($this->searchResultTypeMap as $int => $str) {
+            $searchResult->addResultSet(new SearchResultType($str), [], []);
+            foreach ($top5 as $x) {
+                if ($x['value']['shareType'] === $int) {
+                    $searchResult->addResultSet(new SearchResultType($str), [], [$x]);
+                }
+            }
+        }
+        return $searchResult;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $itemType
+     * @return DataResponse
+     * @throws OCSBadRequestException
+     */
+    public function findRecommended(string $itemType = null, $shareType = null): DataResponse {
+        $shareTypes = [
+            IShare::TYPE_USER,
+        ];
+
+        if ($itemType === null) {
+            throw new OCSBadRequestException('Missing itemType');
+        } elseif ($itemType === 'file' || $itemType === 'folder') {
+            if ($this->shareManager->allowGroupSharing()) {
+                $shareTypes[] = IShare::TYPE_GROUP;
+            }
+
+            if ($this->isRemoteSharingAllowed($itemType)) {
+                $shareTypes[] = IShare::TYPE_REMOTE;
+            }
+
+            if ($this->isRemoteGroupSharingAllowed($itemType)) {
+                $shareTypes[] = IShare::TYPE_REMOTE_GROUP;
+            }
+
+            if ($this->shareManager->shareProviderExists(IShare::TYPE_EMAIL)) {
+                $shareTypes[] = IShare::TYPE_EMAIL;
+            }
+
+            if ($this->shareManager->shareProviderExists(IShare::TYPE_ROOM)) {
+                $shareTypes[] = IShare::TYPE_ROOM;
+            }
+        } else {
+            $shareTypes[] = IShare::TYPE_GROUP;
+            $shareTypes[] = IShare::TYPE_EMAIL;
+        }
+
+        // FIXME: DI
+        if (\OC::$server->getAppManager()->isEnabledForUser('circles') && class_exists('\OCA\Circles\ShareByCircleProvider')) {
+            $shareTypes[] = IShare::TYPE_CIRCLE;
+        }
+
+        if (isset($_GET['shareType']) && is_array($_GET['shareType'])) {
+            $shareTypes = array_intersect($shareTypes, $_GET['shareType']);
+            sort($shareTypes);
+        } elseif (is_numeric($shareType)) {
+            $shareTypes = array_intersect($shareTypes, [(int) $shareType]);
+            sort($shareTypes);
+        }
+
+        return new DataResponse(
+            $this->getAllSharees($this->userId, $shareTypes)->asArray()
+        );
+    }
+
+    /**
+     * Method to get out the static call for better testing
+     *
+     * @param string $itemType
+     * @return bool
+     */
+    protected function isRemoteSharingAllowed(string $itemType): bool {
+        try {
+            // FIXME: static foo makes unit testing unnecessarily difficult
+            $backend = \OC\Share\Share::getBackend($itemType);
+            return $backend->isShareTypeAllowed(IShare::TYPE_REMOTE);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    protected function isRemoteGroupSharingAllowed(string $itemType): bool {
+        try {
+            // FIXME: static foo makes unit testing unnecessarily difficult
+            $backend = \OC\Share\Share::getBackend($itemType);
+            return $backend->isShareTypeAllowed(IShare::TYPE_REMOTE_GROUP);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+
+    /**
+     * Generates a bunch of pagination links for the current page
+     *
+     * @param int $page Current page
+     * @param array $params Parameters for the URL
+     * @return string
+     */
+    protected function getPaginationLink(int $page, array $params): string {
+        if ($this->isV2()) {
+            $url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
+        } else {
+            $url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
+        }
+        $params['page'] = $page + 1;
+        return '<' . $url . http_build_query($params) . '>; rel="next"';
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isV2(): bool {
+        return $this->request->getScriptName() === '/ocs/v2.php';
+    }
 }

apps/files_sharing/lib/Controller/ShareAPIController.php

Indentation +1696 added lines, -1696 removed lines

@@ -84,1703 +84,1703 @@
  */
 class ShareAPIController extends OCSController {
 
-	/** @var IManager */
-	private $shareManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IRootFolder */
-	private $rootFolder;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var string */
-	private $currentUser;
-	/** @var IL10N */
-	private $l;
-	/** @var \OCP\Files\Node */
-	private $lockedNode;
-	/** @var IConfig */
-	private $config;
-	/** @var IAppManager */
-	private $appManager;
-	/** @var IServerContainer */
-	private $serverContainer;
-	/** @var IUserStatusManager */
-	private $userStatusManager;
-	/** @var IPreview */
-	private $previewManager;
-
-	/**
-	 * Share20OCS constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IManager $shareManager
-	 * @param IGroupManager $groupManager
-	 * @param IUserManager $userManager
-	 * @param IRootFolder $rootFolder
-	 * @param IURLGenerator $urlGenerator
-	 * @param string $userId
-	 * @param IL10N $l10n
-	 * @param IConfig $config
-	 * @param IAppManager $appManager
-	 * @param IServerContainer $serverContainer
-	 * @param IUserStatusManager $userStatusManager
-	 */
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IManager $shareManager,
-		IGroupManager $groupManager,
-		IUserManager $userManager,
-		IRootFolder $rootFolder,
-		IURLGenerator $urlGenerator,
-		string $userId = null,
-		IL10N $l10n,
-		IConfig $config,
-		IAppManager $appManager,
-		IServerContainer $serverContainer,
-		IUserStatusManager $userStatusManager,
-		IPreview $previewManager
-	) {
-		parent::__construct($appName, $request);
-
-		$this->shareManager = $shareManager;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->request = $request;
-		$this->rootFolder = $rootFolder;
-		$this->urlGenerator = $urlGenerator;
-		$this->currentUser = $userId;
-		$this->l = $l10n;
-		$this->config = $config;
-		$this->appManager = $appManager;
-		$this->serverContainer = $serverContainer;
-		$this->userStatusManager = $userStatusManager;
-		$this->previewManager = $previewManager;
-	}
-
-	/**
-	 * Convert an IShare to an array for OCS output
-	 *
-	 * @param \OCP\Share\IShare $share
-	 * @param Node|null $recipientNode
-	 * @return array
-	 * @throws NotFoundException In case the node can't be resolved.
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function formatShare(IShare $share, Node $recipientNode = null): array {
-		$sharedBy = $this->userManager->get($share->getSharedBy());
-		$shareOwner = $this->userManager->get($share->getShareOwner());
-
-		$result = [
-			'id' => $share->getId(),
-			'share_type' => $share->getShareType(),
-			'uid_owner' => $share->getSharedBy(),
-			'displayname_owner' => $sharedBy !== null ? $sharedBy->getDisplayName() : $share->getSharedBy(),
-			// recipient permissions
-			'permissions' => $share->getPermissions(),
-			// current user permissions on this share
-			'can_edit' => $this->canEditShare($share),
-			'can_delete' => $this->canDeleteShare($share),
-			'stime' => $share->getShareTime()->getTimestamp(),
-			'parent' => null,
-			'expiration' => null,
-			'token' => null,
-			'uid_file_owner' => $share->getShareOwner(),
-			'note' => $share->getNote(),
-			'label' => $share->getLabel(),
-			'displayname_file_owner' => $shareOwner !== null ? $shareOwner->getDisplayName() : $share->getShareOwner(),
-		];
-
-		$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-		if ($recipientNode) {
-			$node = $recipientNode;
-		} else {
-			$nodes = $userFolder->getById($share->getNodeId());
-			if (empty($nodes)) {
-				// fallback to guessing the path
-				$node = $userFolder->get($share->getTarget());
-				if ($node === null || $share->getTarget() === '') {
-					throw new NotFoundException();
-				}
-			} else {
-				$node = reset($nodes);
-			}
-		}
-
-		$result['path'] = $userFolder->getRelativePath($node->getPath());
-		if ($node instanceof Folder) {
-			$result['item_type'] = 'folder';
-		} else {
-			$result['item_type'] = 'file';
-		}
-
-		$result['mimetype'] = $node->getMimetype();
-		$result['has_preview'] = $this->previewManager->isAvailable($node);
-		$result['storage_id'] = $node->getStorage()->getId();
-		$result['storage'] = $node->getStorage()->getCache()->getNumericStorageId();
-		$result['item_source'] = $node->getId();
-		$result['file_source'] = $node->getId();
-		$result['file_parent'] = $node->getParent()->getId();
-		$result['file_target'] = $share->getTarget();
-
-		$expiration = $share->getExpirationDate();
-		if ($expiration !== null) {
-			$result['expiration'] = $expiration->format('Y-m-d 00:00:00');
-		}
-
-		if ($share->getShareType() === IShare::TYPE_USER) {
-			$sharedWith = $this->userManager->get($share->getSharedWith());
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $sharedWith !== null ? $sharedWith->getDisplayName() : $share->getSharedWith();
-			$result['share_with_displayname_unique'] = $sharedWith !== null ? (
-				 $sharedWith->getEMailAddress() !== '' ? $sharedWith->getEMailAddress() : $sharedWith->getUID()
-			) : $share->getSharedWith();
-			$result['status'] = [];
-
-			$userStatuses = $this->userStatusManager->getUserStatuses([$share->getSharedWith()]);
-			$userStatus = array_shift($userStatuses);
-			if ($userStatus) {
-				$result['status'] = [
-					'status' => $userStatus->getStatus(),
-					'message' => $userStatus->getMessage(),
-					'icon' => $userStatus->getIcon(),
-					'clearAt' => $userStatus->getClearAt()
-						? (int)$userStatus->getClearAt()->format('U')
-						: null,
-				];
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_GROUP) {
-			$group = $this->groupManager->get($share->getSharedWith());
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $group !== null ? $group->getDisplayName() : $share->getSharedWith();
-		} elseif ($share->getShareType() === IShare::TYPE_LINK) {
-
-			// "share_with" and "share_with_displayname" for passwords of link
-			// shares was deprecated in Nextcloud 15, use "password" instead.
-			$result['share_with'] = $share->getPassword();
-			$result['share_with_displayname'] = '(' . $this->l->t('Shared link') . ')';
-
-			$result['password'] = $share->getPassword();
-
-			$result['send_password_by_talk'] = $share->getSendPasswordByTalk();
-
-			$result['token'] = $share->getToken();
-			$result['url'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $share->getToken()]);
-		} elseif ($share->getShareType() === IShare::TYPE_REMOTE || $share->getShareType() === IShare::TYPE_REMOTE_GROUP) {
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'CLOUD');
-			$result['token'] = $share->getToken();
-		} elseif ($share->getShareType() === IShare::TYPE_EMAIL) {
-			$result['share_with'] = $share->getSharedWith();
-			$result['password'] = $share->getPassword();
-			$result['send_password_by_talk'] = $share->getSendPasswordByTalk();
-			$result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'EMAIL');
-			$result['token'] = $share->getToken();
-		} elseif ($share->getShareType() === IShare::TYPE_CIRCLE) {
-			// getSharedWith() returns either "name (type, owner)" or
-			// "name (type, owner) [id]", depending on the Circles app version.
-			$hasCircleId = (substr($share->getSharedWith(), -1) === ']');
-
-			$result['share_with_displayname'] = $share->getSharedWithDisplayName();
-			if (empty($result['share_with_displayname'])) {
-				$displayNameLength = ($hasCircleId ? strrpos($share->getSharedWith(), ' ') : strlen($share->getSharedWith()));
-				$result['share_with_displayname'] = substr($share->getSharedWith(), 0, $displayNameLength);
-			}
-
-			$result['share_with_avatar'] = $share->getSharedWithAvatar();
-
-			$shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0);
-			$shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' '));
-			if (is_bool($shareWithLength)) {
-				$shareWithLength = -1;
-			}
-			$result['share_with'] = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
-		} elseif ($share->getShareType() === IShare::TYPE_ROOM) {
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = '';
-
-			try {
-				$result = array_merge($result, $this->getRoomShareHelper()->formatShare($share));
-			} catch (QueryException $e) {
-			}
-		} elseif ($share->getShareType() === IShare::TYPE_DECK) {
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = '';
-
-			try {
-				$result = array_merge($result, $this->getDeckShareHelper()->formatShare($share));
-			} catch (QueryException $e) {
-			}
-		}
-
-
-		$result['mail_send'] = $share->getMailSend() ? 1 : 0;
-		$result['hide_download'] = $share->getHideDownload() ? 1 : 0;
-
-		return $result;
-	}
-
-	/**
-	 * Check if one of the users address books knows the exact property, if
-	 * yes we return the full name.
-	 *
-	 * @param string $query
-	 * @param string $property
-	 * @return string
-	 */
-	private function getDisplayNameFromAddressBook(string $query, string $property): string {
-		// FIXME: If we inject the contacts manager it gets initialized bofore any address books are registered
-		$result = \OC::$server->getContactsManager()->search($query, [$property]);
-		foreach ($result as $r) {
-			foreach ($r[$property] as $value) {
-				if ($value === $query && $r['FN']) {
-					return $r['FN'];
-				}
-			}
-		}
-
-		return $query;
-	}
-
-	/**
-	 * Get a specific share by id
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 */
-	public function getShare(string $id): DataResponse {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		try {
-			if ($this->canAccessShare($share)) {
-				$share = $this->formatShare($share);
-				return new DataResponse([$share]);
-			}
-		} catch (NotFoundException $e) {
-			// Fall trough
-		}
-
-		throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-	}
-
-	/**
-	 * Delete a share
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 */
-	public function deleteShare(string $id): DataResponse {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		try {
-			$this->lock($share->getNode());
-		} catch (LockedException $e) {
-			throw new OCSNotFoundException($this->l->t('Could not delete share'));
-		}
-
-		if (!$this->canAccessShare($share)) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		// if it's a group share or a room share
-		// we don't delete the share, but only the
-		// mount point. Allowing it to be restored
-		// from the deleted shares
-		if ($this->canDeleteShareFromSelf($share)) {
-			$this->shareManager->deleteFromSelf($share, $this->currentUser);
-		} else {
-			if (!$this->canDeleteShare($share)) {
-				throw new OCSForbiddenException($this->l->t('Could not delete share'));
-			}
-
-			$this->shareManager->deleteShare($share);
-		}
-
-		return new DataResponse();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $path
-	 * @param int $permissions
-	 * @param int $shareType
-	 * @param string $shareWith
-	 * @param string $publicUpload
-	 * @param string $password
-	 * @param string $sendPasswordByTalk
-	 * @param string $expireDate
-	 * @param string $label
-	 *
-	 * @return DataResponse
-	 * @throws NotFoundException
-	 * @throws OCSBadRequestException
-	 * @throws OCSException
-	 * @throws OCSForbiddenException
-	 * @throws OCSNotFoundException
-	 * @throws InvalidPathException
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	public function createShare(
-		string $path = null,
-		int $permissions = null,
-		int $shareType = -1,
-		string $shareWith = null,
-		string $publicUpload = 'false',
-		string $password = '',
-		string $sendPasswordByTalk = null,
-		string $expireDate = '',
-		string $label = ''
-	): DataResponse {
-		$share = $this->shareManager->newShare();
-
-		if ($permissions === null) {
-			$permissions = $this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL);
-		}
-
-		// Verify path
-		if ($path === null) {
-			throw new OCSNotFoundException($this->l->t('Please specify a file or folder path'));
-		}
-
-		$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-		try {
-			$path = $userFolder->get($path);
-		} catch (NotFoundException $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
-		}
-
-		$share->setNode($path);
-
-		try {
-			$this->lock($share->getNode());
-		} catch (LockedException $e) {
-			throw new OCSNotFoundException($this->l->t('Could not create share'));
-		}
-
-		if ($permissions < 0 || $permissions > Constants::PERMISSION_ALL) {
-			throw new OCSNotFoundException($this->l->t('invalid permissions'));
-		}
-
-		// Shares always require read permissions
-		$permissions |= Constants::PERMISSION_READ;
-
-		if ($path instanceof \OCP\Files\File) {
-			// Single file shares should never have delete or create permissions
-			$permissions &= ~Constants::PERMISSION_DELETE;
-			$permissions &= ~Constants::PERMISSION_CREATE;
-		}
-
-		/**
-		 * Hack for https://github.com/owncloud/core/issues/22587
-		 * We check the permissions via webdav. But the permissions of the mount point
-		 * do not equal the share permissions. Here we fix that for federated mounts.
-		 */
-		if ($path->getStorage()->instanceOfStorage(Storage::class)) {
-			$permissions &= ~($permissions & ~$path->getPermissions());
-		}
-
-		if ($shareType === IShare::TYPE_USER) {
-			// Valid user is required to share
-			if ($shareWith === null || !$this->userManager->userExists($shareWith)) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid user'));
-			}
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} elseif ($shareType === IShare::TYPE_GROUP) {
-			if (!$this->shareManager->allowGroupSharing()) {
-				throw new OCSNotFoundException($this->l->t('Group sharing is disabled by the administrator'));
-			}
-
-			// Valid group is required to share
-			if ($shareWith === null || !$this->groupManager->groupExists($shareWith)) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid group'));
-			}
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} elseif ($shareType === IShare::TYPE_LINK
-			|| $shareType === IShare::TYPE_EMAIL) {
-
-			// Can we even share links?
-			if (!$this->shareManager->shareApiAllowLinks()) {
-				throw new OCSNotFoundException($this->l->t('Public link sharing is disabled by the administrator'));
-			}
-
-			if ($publicUpload === 'true') {
-				// Check if public upload is allowed
-				if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
-					throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
-				}
-
-				// Public upload can only be set for folders
-				if ($path instanceof \OCP\Files\File) {
-					throw new OCSNotFoundException($this->l->t('Public upload is only possible for publicly shared folders'));
-				}
-
-				$permissions = Constants::PERMISSION_READ |
-					Constants::PERMISSION_CREATE |
-					Constants::PERMISSION_UPDATE |
-					Constants::PERMISSION_DELETE;
-			} else {
-				$permissions = Constants::PERMISSION_READ;
-			}
-
-			// TODO: It might make sense to have a dedicated setting to allow/deny converting link shares into federated ones
-			if (($permissions & Constants::PERMISSION_READ) && $this->shareManager->outgoingServer2ServerSharesAllowed()) {
-				$permissions |= Constants::PERMISSION_SHARE;
-			}
-
-			$share->setPermissions($permissions);
-
-			// Set password
-			if ($password !== '') {
-				$share->setPassword($password);
-			}
-
-			// Only share by mail have a recipient
-			if ($shareType === IShare::TYPE_EMAIL) {
-				$share->setSharedWith($shareWith);
-			} else {
-				// Only link share have a label
-				if (!empty($label)) {
-					$share->setLabel($label);
-				}
-			}
-
-			if ($sendPasswordByTalk === 'true') {
-				if (!$this->appManager->isEnabledForUser('spreed')) {
-					throw new OCSForbiddenException($this->l->t('Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled', [$path->getPath()]));
-				}
-
-				$share->setSendPasswordByTalk(true);
-			}
-
-			//Expire date
-			if ($expireDate !== '') {
-				try {
-					$expireDate = $this->parseDate($expireDate);
-					$share->setExpirationDate($expireDate);
-				} catch (\Exception $e) {
-					throw new OCSNotFoundException($this->l->t('Invalid date, date format must be YYYY-MM-DD'));
-				}
-			}
-		} elseif ($shareType === IShare::TYPE_REMOTE) {
-			if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
-				throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
-			}
-
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} elseif ($shareType === IShare::TYPE_REMOTE_GROUP) {
-			if (!$this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
-				throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
-			}
-
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} elseif ($shareType === IShare::TYPE_CIRCLE) {
-			if (!\OC::$server->getAppManager()->isEnabledForUser('circles') || !class_exists('\OCA\Circles\ShareByCircleProvider')) {
-				throw new OCSNotFoundException($this->l->t('You cannot share to a Circle if the app is not enabled'));
-			}
-
-			$circle = \OCA\Circles\Api\v1\Circles::detailsCircle($shareWith);
-
-			// Valid circle is required to share
-			if ($circle === null) {
-				throw new OCSNotFoundException($this->l->t('Please specify a valid circle'));
-			}
-			$share->setSharedWith($shareWith);
-			$share->setPermissions($permissions);
-		} elseif ($shareType === IShare::TYPE_ROOM) {
-			try {
-				$this->getRoomShareHelper()->createShare($share, $shareWith, $permissions, $expireDate);
-			} catch (QueryException $e) {
-				throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not support room shares', [$path->getPath()]));
-			}
-		} elseif ($shareType === IShare::TYPE_DECK) {
-			try {
-				$this->getDeckShareHelper()->createShare($share, $shareWith, $permissions, $expireDate);
-			} catch (QueryException $e) {
-				throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not support room shares', [$path->getPath()]));
-			}
-		} else {
-			throw new OCSBadRequestException($this->l->t('Unknown share type'));
-		}
-
-		$share->setShareType($shareType);
-		$share->setSharedBy($this->currentUser);
-
-		try {
-			$share = $this->shareManager->createShare($share);
-		} catch (GenericShareException $e) {
-			$code = $e->getCode() === 0 ? 403 : $e->getCode();
-			throw new OCSException($e->getHint(), $code);
-		} catch (\Exception $e) {
-			throw new OCSForbiddenException($e->getMessage(), $e);
-		}
-
-		$output = $this->formatShare($share);
-
-		return new DataResponse($output);
-	}
-
-	/**
-	 * @param null|Node $node
-	 * @param boolean $includeTags
-	 *
-	 * @return array
-	 */
-	private function getSharedWithMe($node, bool $includeTags): array {
-		$userShares = $this->shareManager->getSharedWith($this->currentUser, IShare::TYPE_USER, $node, -1, 0);
-		$groupShares = $this->shareManager->getSharedWith($this->currentUser, IShare::TYPE_GROUP, $node, -1, 0);
-		$circleShares = $this->shareManager->getSharedWith($this->currentUser, IShare::TYPE_CIRCLE, $node, -1, 0);
-		$roomShares = $this->shareManager->getSharedWith($this->currentUser, IShare::TYPE_ROOM, $node, -1, 0);
-		$deckShares = $this->shareManager->getSharedWith($this->currentUser, IShare::TYPE_DECK, $node, -1, 0);
-
-		$shares = array_merge($userShares, $groupShares, $circleShares, $roomShares, $deckShares);
-
-		$filteredShares = array_filter($shares, function (IShare $share) {
-			return $share->getShareOwner() !== $this->currentUser;
-		});
-
-		$formatted = [];
-		foreach ($filteredShares as $share) {
-			if ($this->canAccessShare($share)) {
-				try {
-					$formatted[] = $this->formatShare($share);
-				} catch (NotFoundException $e) {
-					// Ignore this share
-				}
-			}
-		}
-
-		if ($includeTags) {
-			$formatted = Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
-		}
-
-		return $formatted;
-	}
-
-	/**
-	 * @param \OCP\Files\Node $folder
-	 *
-	 * @return array
-	 * @throws OCSBadRequestException
-	 * @throws NotFoundException
-	 */
-	private function getSharesInDir(Node $folder): array {
-		if (!($folder instanceof \OCP\Files\Folder)) {
-			throw new OCSBadRequestException($this->l->t('Not a directory'));
-		}
-
-		$nodes = $folder->getDirectoryListing();
-
-		/** @var \OCP\Share\IShare[] $shares */
-		$shares = array_reduce($nodes, function ($carry, $node) {
-			$carry = array_merge($carry, $this->getAllShares($node, true));
-			return $carry;
-		}, []);
-
-		// filter out duplicate shares
-		$known = [];
-
-
-		$formatted = $miniFormatted = [];
-		$resharingRight = false;
-		$known = [];
-		foreach ($shares as $share) {
-			if (in_array($share->getId(), $known) || $share->getSharedWith() === $this->currentUser) {
-				continue;
-			}
-
-			try {
-				$format = $this->formatShare($share);
-
-				$known[] = $share->getId();
-				$formatted[] = $format;
-				if ($share->getSharedBy() === $this->currentUser) {
-					$miniFormatted[] = $format;
-				}
-				if (!$resharingRight && $this->shareProviderResharingRights($this->currentUser, $share, $folder)) {
-					$resharingRight = true;
-				}
-			} catch (\Exception $e) {
-				//Ignore this share
-			}
-		}
-
-		if (!$resharingRight) {
-			$formatted = $miniFormatted;
-		}
-
-		return $formatted;
-	}
-
-	/**
-	 * The getShares function.
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $shared_with_me
-	 * @param string $reshares
-	 * @param string $subfiles
-	 * @param string $path
-	 *
-	 * - Get shares by the current user
-	 * - Get shares by the current user and reshares (?reshares=true)
-	 * - Get shares with the current user (?shared_with_me=true)
-	 * - Get shares for a specific path (?path=...)
-	 * - Get all shares in a folder (?subfiles=true&path=..)
-	 *
-	 * @param string $include_tags
-	 *
-	 * @return DataResponse
-	 * @throws NotFoundException
-	 * @throws OCSBadRequestException
-	 * @throws OCSNotFoundException
-	 */
-	public function getShares(
-		string $shared_with_me = 'false',
-		string $reshares = 'false',
-		string $subfiles = 'false',
-		string $path = '',
-		string $include_tags = 'false'
-	): DataResponse {
-		$node = null;
-		if ($path !== '') {
-			$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-			try {
-				$node = $userFolder->get($path);
-				$this->lock($node);
-			} catch (NotFoundException $e) {
-				throw new OCSNotFoundException(
-					$this->l->t('Wrong path, file/folder doesn\'t exist')
-				);
-			} catch (LockedException $e) {
-				throw new OCSNotFoundException($this->l->t('Could not lock node'));
-			}
-		}
-
-		$shares = $this->getFormattedShares(
-			$this->currentUser,
-			$node,
-			($shared_with_me === 'true'),
-			($reshares === 'true'),
-			($subfiles === 'true'),
-			($include_tags === 'true')
-		);
-
-		return new DataResponse($shares);
-	}
-
-
-	/**
-	 * @param string $viewer
-	 * @param Node $node
-	 * @param bool $sharedWithMe
-	 * @param bool $reShares
-	 * @param bool $subFiles
-	 * @param bool $includeTags
-	 *
-	 * @return array
-	 * @throws NotFoundException
-	 * @throws OCSBadRequestException
-	 */
-	private function getFormattedShares(
-		string $viewer,
-		$node = null,
-		bool $sharedWithMe = false,
-		bool $reShares = false,
-		bool $subFiles = false,
-		bool $includeTags = false
-	): array {
-		if ($sharedWithMe) {
-			return $this->getSharedWithMe($node, $includeTags);
-		}
-
-		if ($subFiles) {
-			return $this->getSharesInDir($node);
-		}
-
-		$shares = $this->getSharesFromNode($viewer, $node, $reShares);
-
-		$known = $formatted = $miniFormatted = [];
-		$resharingRight = false;
-		foreach ($shares as $share) {
-			try {
-				$share->getNode();
-			} catch (NotFoundException $e) {
-				/*
+    /** @var IManager */
+    private $shareManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IRootFolder */
+    private $rootFolder;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var string */
+    private $currentUser;
+    /** @var IL10N */
+    private $l;
+    /** @var \OCP\Files\Node */
+    private $lockedNode;
+    /** @var IConfig */
+    private $config;
+    /** @var IAppManager */
+    private $appManager;
+    /** @var IServerContainer */
+    private $serverContainer;
+    /** @var IUserStatusManager */
+    private $userStatusManager;
+    /** @var IPreview */
+    private $previewManager;
+
+    /**
+     * Share20OCS constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IManager $shareManager
+     * @param IGroupManager $groupManager
+     * @param IUserManager $userManager
+     * @param IRootFolder $rootFolder
+     * @param IURLGenerator $urlGenerator
+     * @param string $userId
+     * @param IL10N $l10n
+     * @param IConfig $config
+     * @param IAppManager $appManager
+     * @param IServerContainer $serverContainer
+     * @param IUserStatusManager $userStatusManager
+     */
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IManager $shareManager,
+        IGroupManager $groupManager,
+        IUserManager $userManager,
+        IRootFolder $rootFolder,
+        IURLGenerator $urlGenerator,
+        string $userId = null,
+        IL10N $l10n,
+        IConfig $config,
+        IAppManager $appManager,
+        IServerContainer $serverContainer,
+        IUserStatusManager $userStatusManager,
+        IPreview $previewManager
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->shareManager = $shareManager;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->request = $request;
+        $this->rootFolder = $rootFolder;
+        $this->urlGenerator = $urlGenerator;
+        $this->currentUser = $userId;
+        $this->l = $l10n;
+        $this->config = $config;
+        $this->appManager = $appManager;
+        $this->serverContainer = $serverContainer;
+        $this->userStatusManager = $userStatusManager;
+        $this->previewManager = $previewManager;
+    }
+
+    /**
+     * Convert an IShare to an array for OCS output
+     *
+     * @param \OCP\Share\IShare $share
+     * @param Node|null $recipientNode
+     * @return array
+     * @throws NotFoundException In case the node can't be resolved.
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function formatShare(IShare $share, Node $recipientNode = null): array {
+        $sharedBy = $this->userManager->get($share->getSharedBy());
+        $shareOwner = $this->userManager->get($share->getShareOwner());
+
+        $result = [
+            'id' => $share->getId(),
+            'share_type' => $share->getShareType(),
+            'uid_owner' => $share->getSharedBy(),
+            'displayname_owner' => $sharedBy !== null ? $sharedBy->getDisplayName() : $share->getSharedBy(),
+            // recipient permissions
+            'permissions' => $share->getPermissions(),
+            // current user permissions on this share
+            'can_edit' => $this->canEditShare($share),
+            'can_delete' => $this->canDeleteShare($share),
+            'stime' => $share->getShareTime()->getTimestamp(),
+            'parent' => null,
+            'expiration' => null,
+            'token' => null,
+            'uid_file_owner' => $share->getShareOwner(),
+            'note' => $share->getNote(),
+            'label' => $share->getLabel(),
+            'displayname_file_owner' => $shareOwner !== null ? $shareOwner->getDisplayName() : $share->getShareOwner(),
+        ];
+
+        $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+        if ($recipientNode) {
+            $node = $recipientNode;
+        } else {
+            $nodes = $userFolder->getById($share->getNodeId());
+            if (empty($nodes)) {
+                // fallback to guessing the path
+                $node = $userFolder->get($share->getTarget());
+                if ($node === null || $share->getTarget() === '') {
+                    throw new NotFoundException();
+                }
+            } else {
+                $node = reset($nodes);
+            }
+        }
+
+        $result['path'] = $userFolder->getRelativePath($node->getPath());
+        if ($node instanceof Folder) {
+            $result['item_type'] = 'folder';
+        } else {
+            $result['item_type'] = 'file';
+        }
+
+        $result['mimetype'] = $node->getMimetype();
+        $result['has_preview'] = $this->previewManager->isAvailable($node);
+        $result['storage_id'] = $node->getStorage()->getId();
+        $result['storage'] = $node->getStorage()->getCache()->getNumericStorageId();
+        $result['item_source'] = $node->getId();
+        $result['file_source'] = $node->getId();
+        $result['file_parent'] = $node->getParent()->getId();
+        $result['file_target'] = $share->getTarget();
+
+        $expiration = $share->getExpirationDate();
+        if ($expiration !== null) {
+            $result['expiration'] = $expiration->format('Y-m-d 00:00:00');
+        }
+
+        if ($share->getShareType() === IShare::TYPE_USER) {
+            $sharedWith = $this->userManager->get($share->getSharedWith());
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $sharedWith !== null ? $sharedWith->getDisplayName() : $share->getSharedWith();
+            $result['share_with_displayname_unique'] = $sharedWith !== null ? (
+                    $sharedWith->getEMailAddress() !== '' ? $sharedWith->getEMailAddress() : $sharedWith->getUID()
+            ) : $share->getSharedWith();
+            $result['status'] = [];
+
+            $userStatuses = $this->userStatusManager->getUserStatuses([$share->getSharedWith()]);
+            $userStatus = array_shift($userStatuses);
+            if ($userStatus) {
+                $result['status'] = [
+                    'status' => $userStatus->getStatus(),
+                    'message' => $userStatus->getMessage(),
+                    'icon' => $userStatus->getIcon(),
+                    'clearAt' => $userStatus->getClearAt()
+                        ? (int)$userStatus->getClearAt()->format('U')
+                        : null,
+                ];
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_GROUP) {
+            $group = $this->groupManager->get($share->getSharedWith());
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $group !== null ? $group->getDisplayName() : $share->getSharedWith();
+        } elseif ($share->getShareType() === IShare::TYPE_LINK) {
+
+            // "share_with" and "share_with_displayname" for passwords of link
+            // shares was deprecated in Nextcloud 15, use "password" instead.
+            $result['share_with'] = $share->getPassword();
+            $result['share_with_displayname'] = '(' . $this->l->t('Shared link') . ')';
+
+            $result['password'] = $share->getPassword();
+
+            $result['send_password_by_talk'] = $share->getSendPasswordByTalk();
+
+            $result['token'] = $share->getToken();
+            $result['url'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.showShare', ['token' => $share->getToken()]);
+        } elseif ($share->getShareType() === IShare::TYPE_REMOTE || $share->getShareType() === IShare::TYPE_REMOTE_GROUP) {
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'CLOUD');
+            $result['token'] = $share->getToken();
+        } elseif ($share->getShareType() === IShare::TYPE_EMAIL) {
+            $result['share_with'] = $share->getSharedWith();
+            $result['password'] = $share->getPassword();
+            $result['send_password_by_talk'] = $share->getSendPasswordByTalk();
+            $result['share_with_displayname'] = $this->getDisplayNameFromAddressBook($share->getSharedWith(), 'EMAIL');
+            $result['token'] = $share->getToken();
+        } elseif ($share->getShareType() === IShare::TYPE_CIRCLE) {
+            // getSharedWith() returns either "name (type, owner)" or
+            // "name (type, owner) [id]", depending on the Circles app version.
+            $hasCircleId = (substr($share->getSharedWith(), -1) === ']');
+
+            $result['share_with_displayname'] = $share->getSharedWithDisplayName();
+            if (empty($result['share_with_displayname'])) {
+                $displayNameLength = ($hasCircleId ? strrpos($share->getSharedWith(), ' ') : strlen($share->getSharedWith()));
+                $result['share_with_displayname'] = substr($share->getSharedWith(), 0, $displayNameLength);
+            }
+
+            $result['share_with_avatar'] = $share->getSharedWithAvatar();
+
+            $shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0);
+            $shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' '));
+            if (is_bool($shareWithLength)) {
+                $shareWithLength = -1;
+            }
+            $result['share_with'] = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
+        } elseif ($share->getShareType() === IShare::TYPE_ROOM) {
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = '';
+
+            try {
+                $result = array_merge($result, $this->getRoomShareHelper()->formatShare($share));
+            } catch (QueryException $e) {
+            }
+        } elseif ($share->getShareType() === IShare::TYPE_DECK) {
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = '';
+
+            try {
+                $result = array_merge($result, $this->getDeckShareHelper()->formatShare($share));
+            } catch (QueryException $e) {
+            }
+        }
+
+
+        $result['mail_send'] = $share->getMailSend() ? 1 : 0;
+        $result['hide_download'] = $share->getHideDownload() ? 1 : 0;
+
+        return $result;
+    }
+
+    /**
+     * Check if one of the users address books knows the exact property, if
+     * yes we return the full name.
+     *
+     * @param string $query
+     * @param string $property
+     * @return string
+     */
+    private function getDisplayNameFromAddressBook(string $query, string $property): string {
+        // FIXME: If we inject the contacts manager it gets initialized bofore any address books are registered
+        $result = \OC::$server->getContactsManager()->search($query, [$property]);
+        foreach ($result as $r) {
+            foreach ($r[$property] as $value) {
+                if ($value === $query && $r['FN']) {
+                    return $r['FN'];
+                }
+            }
+        }
+
+        return $query;
+    }
+
+    /**
+     * Get a specific share by id
+     *
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     */
+    public function getShare(string $id): DataResponse {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        try {
+            if ($this->canAccessShare($share)) {
+                $share = $this->formatShare($share);
+                return new DataResponse([$share]);
+            }
+        } catch (NotFoundException $e) {
+            // Fall trough
+        }
+
+        throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+    }
+
+    /**
+     * Delete a share
+     *
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     */
+    public function deleteShare(string $id): DataResponse {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        try {
+            $this->lock($share->getNode());
+        } catch (LockedException $e) {
+            throw new OCSNotFoundException($this->l->t('Could not delete share'));
+        }
+
+        if (!$this->canAccessShare($share)) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        // if it's a group share or a room share
+        // we don't delete the share, but only the
+        // mount point. Allowing it to be restored
+        // from the deleted shares
+        if ($this->canDeleteShareFromSelf($share)) {
+            $this->shareManager->deleteFromSelf($share, $this->currentUser);
+        } else {
+            if (!$this->canDeleteShare($share)) {
+                throw new OCSForbiddenException($this->l->t('Could not delete share'));
+            }
+
+            $this->shareManager->deleteShare($share);
+        }
+
+        return new DataResponse();
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $path
+     * @param int $permissions
+     * @param int $shareType
+     * @param string $shareWith
+     * @param string $publicUpload
+     * @param string $password
+     * @param string $sendPasswordByTalk
+     * @param string $expireDate
+     * @param string $label
+     *
+     * @return DataResponse
+     * @throws NotFoundException
+     * @throws OCSBadRequestException
+     * @throws OCSException
+     * @throws OCSForbiddenException
+     * @throws OCSNotFoundException
+     * @throws InvalidPathException
+     * @suppress PhanUndeclaredClassMethod
+     */
+    public function createShare(
+        string $path = null,
+        int $permissions = null,
+        int $shareType = -1,
+        string $shareWith = null,
+        string $publicUpload = 'false',
+        string $password = '',
+        string $sendPasswordByTalk = null,
+        string $expireDate = '',
+        string $label = ''
+    ): DataResponse {
+        $share = $this->shareManager->newShare();
+
+        if ($permissions === null) {
+            $permissions = $this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL);
+        }
+
+        // Verify path
+        if ($path === null) {
+            throw new OCSNotFoundException($this->l->t('Please specify a file or folder path'));
+        }
+
+        $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+        try {
+            $path = $userFolder->get($path);
+        } catch (NotFoundException $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
+        }
+
+        $share->setNode($path);
+
+        try {
+            $this->lock($share->getNode());
+        } catch (LockedException $e) {
+            throw new OCSNotFoundException($this->l->t('Could not create share'));
+        }
+
+        if ($permissions < 0 || $permissions > Constants::PERMISSION_ALL) {
+            throw new OCSNotFoundException($this->l->t('invalid permissions'));
+        }
+
+        // Shares always require read permissions
+        $permissions |= Constants::PERMISSION_READ;
+
+        if ($path instanceof \OCP\Files\File) {
+            // Single file shares should never have delete or create permissions
+            $permissions &= ~Constants::PERMISSION_DELETE;
+            $permissions &= ~Constants::PERMISSION_CREATE;
+        }
+
+        /**
+         * Hack for https://github.com/owncloud/core/issues/22587
+         * We check the permissions via webdav. But the permissions of the mount point
+         * do not equal the share permissions. Here we fix that for federated mounts.
+         */
+        if ($path->getStorage()->instanceOfStorage(Storage::class)) {
+            $permissions &= ~($permissions & ~$path->getPermissions());
+        }
+
+        if ($shareType === IShare::TYPE_USER) {
+            // Valid user is required to share
+            if ($shareWith === null || !$this->userManager->userExists($shareWith)) {
+                throw new OCSNotFoundException($this->l->t('Please specify a valid user'));
+            }
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } elseif ($shareType === IShare::TYPE_GROUP) {
+            if (!$this->shareManager->allowGroupSharing()) {
+                throw new OCSNotFoundException($this->l->t('Group sharing is disabled by the administrator'));
+            }
+
+            // Valid group is required to share
+            if ($shareWith === null || !$this->groupManager->groupExists($shareWith)) {
+                throw new OCSNotFoundException($this->l->t('Please specify a valid group'));
+            }
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } elseif ($shareType === IShare::TYPE_LINK
+            || $shareType === IShare::TYPE_EMAIL) {
+
+            // Can we even share links?
+            if (!$this->shareManager->shareApiAllowLinks()) {
+                throw new OCSNotFoundException($this->l->t('Public link sharing is disabled by the administrator'));
+            }
+
+            if ($publicUpload === 'true') {
+                // Check if public upload is allowed
+                if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
+                    throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
+                }
+
+                // Public upload can only be set for folders
+                if ($path instanceof \OCP\Files\File) {
+                    throw new OCSNotFoundException($this->l->t('Public upload is only possible for publicly shared folders'));
+                }
+
+                $permissions = Constants::PERMISSION_READ |
+                    Constants::PERMISSION_CREATE |
+                    Constants::PERMISSION_UPDATE |
+                    Constants::PERMISSION_DELETE;
+            } else {
+                $permissions = Constants::PERMISSION_READ;
+            }
+
+            // TODO: It might make sense to have a dedicated setting to allow/deny converting link shares into federated ones
+            if (($permissions & Constants::PERMISSION_READ) && $this->shareManager->outgoingServer2ServerSharesAllowed()) {
+                $permissions |= Constants::PERMISSION_SHARE;
+            }
+
+            $share->setPermissions($permissions);
+
+            // Set password
+            if ($password !== '') {
+                $share->setPassword($password);
+            }
+
+            // Only share by mail have a recipient
+            if ($shareType === IShare::TYPE_EMAIL) {
+                $share->setSharedWith($shareWith);
+            } else {
+                // Only link share have a label
+                if (!empty($label)) {
+                    $share->setLabel($label);
+                }
+            }
+
+            if ($sendPasswordByTalk === 'true') {
+                if (!$this->appManager->isEnabledForUser('spreed')) {
+                    throw new OCSForbiddenException($this->l->t('Sharing %s sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled', [$path->getPath()]));
+                }
+
+                $share->setSendPasswordByTalk(true);
+            }
+
+            //Expire date
+            if ($expireDate !== '') {
+                try {
+                    $expireDate = $this->parseDate($expireDate);
+                    $share->setExpirationDate($expireDate);
+                } catch (\Exception $e) {
+                    throw new OCSNotFoundException($this->l->t('Invalid date, date format must be YYYY-MM-DD'));
+                }
+            }
+        } elseif ($shareType === IShare::TYPE_REMOTE) {
+            if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
+                throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
+            }
+
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } elseif ($shareType === IShare::TYPE_REMOTE_GROUP) {
+            if (!$this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
+                throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
+            }
+
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } elseif ($shareType === IShare::TYPE_CIRCLE) {
+            if (!\OC::$server->getAppManager()->isEnabledForUser('circles') || !class_exists('\OCA\Circles\ShareByCircleProvider')) {
+                throw new OCSNotFoundException($this->l->t('You cannot share to a Circle if the app is not enabled'));
+            }
+
+            $circle = \OCA\Circles\Api\v1\Circles::detailsCircle($shareWith);
+
+            // Valid circle is required to share
+            if ($circle === null) {
+                throw new OCSNotFoundException($this->l->t('Please specify a valid circle'));
+            }
+            $share->setSharedWith($shareWith);
+            $share->setPermissions($permissions);
+        } elseif ($shareType === IShare::TYPE_ROOM) {
+            try {
+                $this->getRoomShareHelper()->createShare($share, $shareWith, $permissions, $expireDate);
+            } catch (QueryException $e) {
+                throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not support room shares', [$path->getPath()]));
+            }
+        } elseif ($shareType === IShare::TYPE_DECK) {
+            try {
+                $this->getDeckShareHelper()->createShare($share, $shareWith, $permissions, $expireDate);
+            } catch (QueryException $e) {
+                throw new OCSForbiddenException($this->l->t('Sharing %s failed because the back end does not support room shares', [$path->getPath()]));
+            }
+        } else {
+            throw new OCSBadRequestException($this->l->t('Unknown share type'));
+        }
+
+        $share->setShareType($shareType);
+        $share->setSharedBy($this->currentUser);
+
+        try {
+            $share = $this->shareManager->createShare($share);
+        } catch (GenericShareException $e) {
+            $code = $e->getCode() === 0 ? 403 : $e->getCode();
+            throw new OCSException($e->getHint(), $code);
+        } catch (\Exception $e) {
+            throw new OCSForbiddenException($e->getMessage(), $e);
+        }
+
+        $output = $this->formatShare($share);
+
+        return new DataResponse($output);
+    }
+
+    /**
+     * @param null|Node $node
+     * @param boolean $includeTags
+     *
+     * @return array
+     */
+    private function getSharedWithMe($node, bool $includeTags): array {
+        $userShares = $this->shareManager->getSharedWith($this->currentUser, IShare::TYPE_USER, $node, -1, 0);
+        $groupShares = $this->shareManager->getSharedWith($this->currentUser, IShare::TYPE_GROUP, $node, -1, 0);
+        $circleShares = $this->shareManager->getSharedWith($this->currentUser, IShare::TYPE_CIRCLE, $node, -1, 0);
+        $roomShares = $this->shareManager->getSharedWith($this->currentUser, IShare::TYPE_ROOM, $node, -1, 0);
+        $deckShares = $this->shareManager->getSharedWith($this->currentUser, IShare::TYPE_DECK, $node, -1, 0);
+
+        $shares = array_merge($userShares, $groupShares, $circleShares, $roomShares, $deckShares);
+
+        $filteredShares = array_filter($shares, function (IShare $share) {
+            return $share->getShareOwner() !== $this->currentUser;
+        });
+
+        $formatted = [];
+        foreach ($filteredShares as $share) {
+            if ($this->canAccessShare($share)) {
+                try {
+                    $formatted[] = $this->formatShare($share);
+                } catch (NotFoundException $e) {
+                    // Ignore this share
+                }
+            }
+        }
+
+        if ($includeTags) {
+            $formatted = Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
+        }
+
+        return $formatted;
+    }
+
+    /**
+     * @param \OCP\Files\Node $folder
+     *
+     * @return array
+     * @throws OCSBadRequestException
+     * @throws NotFoundException
+     */
+    private function getSharesInDir(Node $folder): array {
+        if (!($folder instanceof \OCP\Files\Folder)) {
+            throw new OCSBadRequestException($this->l->t('Not a directory'));
+        }
+
+        $nodes = $folder->getDirectoryListing();
+
+        /** @var \OCP\Share\IShare[] $shares */
+        $shares = array_reduce($nodes, function ($carry, $node) {
+            $carry = array_merge($carry, $this->getAllShares($node, true));
+            return $carry;
+        }, []);
+
+        // filter out duplicate shares
+        $known = [];
+
+
+        $formatted = $miniFormatted = [];
+        $resharingRight = false;
+        $known = [];
+        foreach ($shares as $share) {
+            if (in_array($share->getId(), $known) || $share->getSharedWith() === $this->currentUser) {
+                continue;
+            }
+
+            try {
+                $format = $this->formatShare($share);
+
+                $known[] = $share->getId();
+                $formatted[] = $format;
+                if ($share->getSharedBy() === $this->currentUser) {
+                    $miniFormatted[] = $format;
+                }
+                if (!$resharingRight && $this->shareProviderResharingRights($this->currentUser, $share, $folder)) {
+                    $resharingRight = true;
+                }
+            } catch (\Exception $e) {
+                //Ignore this share
+            }
+        }
+
+        if (!$resharingRight) {
+            $formatted = $miniFormatted;
+        }
+
+        return $formatted;
+    }
+
+    /**
+     * The getShares function.
+     *
+     * @NoAdminRequired
+     *
+     * @param string $shared_with_me
+     * @param string $reshares
+     * @param string $subfiles
+     * @param string $path
+     *
+     * - Get shares by the current user
+     * - Get shares by the current user and reshares (?reshares=true)
+     * - Get shares with the current user (?shared_with_me=true)
+     * - Get shares for a specific path (?path=...)
+     * - Get all shares in a folder (?subfiles=true&path=..)
+     *
+     * @param string $include_tags
+     *
+     * @return DataResponse
+     * @throws NotFoundException
+     * @throws OCSBadRequestException
+     * @throws OCSNotFoundException
+     */
+    public function getShares(
+        string $shared_with_me = 'false',
+        string $reshares = 'false',
+        string $subfiles = 'false',
+        string $path = '',
+        string $include_tags = 'false'
+    ): DataResponse {
+        $node = null;
+        if ($path !== '') {
+            $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+            try {
+                $node = $userFolder->get($path);
+                $this->lock($node);
+            } catch (NotFoundException $e) {
+                throw new OCSNotFoundException(
+                    $this->l->t('Wrong path, file/folder doesn\'t exist')
+                );
+            } catch (LockedException $e) {
+                throw new OCSNotFoundException($this->l->t('Could not lock node'));
+            }
+        }
+
+        $shares = $this->getFormattedShares(
+            $this->currentUser,
+            $node,
+            ($shared_with_me === 'true'),
+            ($reshares === 'true'),
+            ($subfiles === 'true'),
+            ($include_tags === 'true')
+        );
+
+        return new DataResponse($shares);
+    }
+
+
+    /**
+     * @param string $viewer
+     * @param Node $node
+     * @param bool $sharedWithMe
+     * @param bool $reShares
+     * @param bool $subFiles
+     * @param bool $includeTags
+     *
+     * @return array
+     * @throws NotFoundException
+     * @throws OCSBadRequestException
+     */
+    private function getFormattedShares(
+        string $viewer,
+        $node = null,
+        bool $sharedWithMe = false,
+        bool $reShares = false,
+        bool $subFiles = false,
+        bool $includeTags = false
+    ): array {
+        if ($sharedWithMe) {
+            return $this->getSharedWithMe($node, $includeTags);
+        }
+
+        if ($subFiles) {
+            return $this->getSharesInDir($node);
+        }
+
+        $shares = $this->getSharesFromNode($viewer, $node, $reShares);
+
+        $known = $formatted = $miniFormatted = [];
+        $resharingRight = false;
+        foreach ($shares as $share) {
+            try {
+                $share->getNode();
+            } catch (NotFoundException $e) {
+                /*
 				 * Ignore shares where we can't get the node
 				 * For example deleted shares
 				 */
-				continue;
-			}
-
-			if (in_array($share->getId(), $known)
-				|| ($share->getSharedWith() === $this->currentUser && $share->getShareType() === IShare::TYPE_USER)) {
-				continue;
-			}
-
-			$known[] = $share->getId();
-			try {
-				/** @var IShare $share */
-				$format = $this->formatShare($share, $node);
-				$formatted[] = $format;
-
-				// let's also build a list of shares created
-				// by the current user only, in case
-				// there is no resharing rights
-				if ($share->getSharedBy() === $this->currentUser) {
-					$miniFormatted[] = $format;
-				}
-
-				// check if one of those share is shared with me
-				// and if I have resharing rights on it
-				if (!$resharingRight && $this->shareProviderResharingRights($this->currentUser, $share, $node)) {
-					$resharingRight = true;
-				}
-			} catch (InvalidPathException | NotFoundException $e) {
-			}
-		}
-
-		if (!$resharingRight) {
-			$formatted = $miniFormatted;
-		}
-
-		if ($includeTags) {
-			$formatted =
-				Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
-		}
-
-		return $formatted;
-	}
-
-
-	/**
-	 * The getInheritedShares function.
-	 * returns all shares relative to a file, including parent folders shares rights.
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param string $path
-	 *
-	 * - Get shares by the current user
-	 * - Get shares by the current user and reshares (?reshares=true)
-	 * - Get shares with the current user (?shared_with_me=true)
-	 * - Get shares for a specific path (?path=...)
-	 * - Get all shares in a folder (?subfiles=true&path=..)
-	 *
-	 * @return DataResponse
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 * @throws OCSNotFoundException
-	 * @throws OCSBadRequestException
-	 * @throws SharingRightsException
-	 */
-	public function getInheritedShares(string $path): DataResponse {
-
-		// get Node from (string) path.
-		$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-		try {
-			$node = $userFolder->get($path);
-			$this->lock($node);
-		} catch (\OCP\Files\NotFoundException $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
-		} catch (LockedException $e) {
-			throw new OCSNotFoundException($this->l->t('Could not lock path'));
-		}
-
-		if (!($node->getPermissions() & Constants::PERMISSION_SHARE)) {
-			throw new SharingRightsException('no sharing rights on this item');
-		}
-
-		// The current top parent we have access to
-		$parent = $node;
-
-		// initiate real owner.
-		$owner = $node->getOwner()
-					  ->getUID();
-		if (!$this->userManager->userExists($owner)) {
-			return new DataResponse([]);
-		}
-
-		// get node based on the owner, fix owner in case of external storage
-		$userFolder = $this->rootFolder->getUserFolder($owner);
-		if ($node->getId() !== $userFolder->getId() && !$userFolder->isSubNode($node)) {
-			$owner = $node->getOwner()
-						  ->getUID();
-			$userFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $userFolder->getById($node->getId());
-			$node = array_shift($nodes);
-		}
-		$basePath = $userFolder->getPath();
-
-		// generate node list for each parent folders
-		/** @var Node[] $nodes */
-		$nodes = [];
-		while ($node->getPath() !== $basePath) {
-			$node = $node->getParent();
-			$nodes[] = $node;
-		}
-
-		// The user that is requesting this list
-		$currentUserFolder = $this->rootFolder->getUserFolder($this->currentUser);
-
-		// for each nodes, retrieve shares.
-		$shares = [];
-
-		foreach ($nodes as $node) {
-			$getShares = $this->getFormattedShares($owner, $node, false, true);
-
-			$currentUserNodes = $currentUserFolder->getById($node->getId());
-			if (!empty($currentUserNodes)) {
-				$parent = array_pop($currentUserNodes);
-			}
-
-			$subPath = $currentUserFolder->getRelativePath($parent->getPath());
-			foreach ($getShares as &$share) {
-				$share['via_fileid'] = $parent->getId();
-				$share['via_path'] = $subPath;
-			}
-			$this->mergeFormattedShares($shares, $getShares);
-		}
-
-		return new DataResponse(array_values($shares));
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @param int $permissions
-	 * @param string $password
-	 * @param string $sendPasswordByTalk
-	 * @param string $publicUpload
-	 * @param string $expireDate
-	 * @param string $note
-	 * @param string $label
-	 * @param string $hideDownload
-	 * @return DataResponse
-	 * @throws LockedException
-	 * @throws NotFoundException
-	 * @throws OCSBadRequestException
-	 * @throws OCSForbiddenException
-	 * @throws OCSNotFoundException
-	 */
-	public function updateShare(
-		string $id,
-		int $permissions = null,
-		string $password = null,
-		string $sendPasswordByTalk = null,
-		string $publicUpload = null,
-		string $expireDate = null,
-		string $note = null,
-		string $label = null,
-		string $hideDownload = null
-	): DataResponse {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		$this->lock($share->getNode());
-
-		if (!$this->canAccessShare($share, false)) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		if (!$this->canEditShare($share)) {
-			throw new OCSForbiddenException('You are not allowed to edit incoming shares');
-		}
-
-		if (
-			$permissions === null &&
-			$password === null &&
-			$sendPasswordByTalk === null &&
-			$publicUpload === null &&
-			$expireDate === null &&
-			$note === null &&
-			$label === null &&
-			$hideDownload === null
-		) {
-			throw new OCSBadRequestException($this->l->t('Wrong or no update parameter given'));
-		}
-
-		if ($note !== null) {
-			$share->setNote($note);
-		}
-
-		/**
-		 * expirationdate, password and publicUpload only make sense for link shares
-		 */
-		if ($share->getShareType() === IShare::TYPE_LINK
-			|| $share->getShareType() === IShare::TYPE_EMAIL) {
-
-			/**
-			 * We do not allow editing link shares that the current user
-			 * doesn't own. This is confusing and lead to errors when
-			 * someone else edit a password or expiration date without
-			 * the share owner knowing about it.
-			 * We only allow deletion
-			 */
-
-			if ($share->getSharedBy() !== $this->currentUser) {
-				throw new OCSForbiddenException('You are not allowed to edit link shares that you don\'t own');
-			}
-
-			// Update hide download state
-			if ($hideDownload === 'true') {
-				$share->setHideDownload(true);
-			} elseif ($hideDownload === 'false') {
-				$share->setHideDownload(false);
-			}
-
-			$newPermissions = null;
-			if ($publicUpload === 'true') {
-				$newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
-			} elseif ($publicUpload === 'false') {
-				$newPermissions = Constants::PERMISSION_READ;
-			}
-
-			if ($permissions !== null) {
-				$newPermissions = $permissions;
-				$newPermissions = $newPermissions & ~Constants::PERMISSION_SHARE;
-			}
-
-			if ($newPermissions !== null &&
-				!in_array($newPermissions, [
-					Constants::PERMISSION_READ,
-					Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE, // legacy
-					Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE, // correct
-					Constants::PERMISSION_CREATE, // hidden file list
-					Constants::PERMISSION_READ | Constants::PERMISSION_UPDATE, // allow to edit single files
-				], true)
-			) {
-				throw new OCSBadRequestException($this->l->t('Can\'t change permissions for public share links'));
-			}
-
-			if (
-				// legacy
-				$newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE) ||
-				// correct
-				$newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE)
-			) {
-				if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
-					throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
-				}
-
-				if (!($share->getNode() instanceof \OCP\Files\Folder)) {
-					throw new OCSBadRequestException($this->l->t('Public upload is only possible for publicly shared folders'));
-				}
-
-				// normalize to correct public upload permissions
-				$newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
-			}
-
-			if ($newPermissions !== null) {
-				// TODO: It might make sense to have a dedicated setting to allow/deny converting link shares into federated ones
-				if (($newPermissions & Constants::PERMISSION_READ) && $this->shareManager->outgoingServer2ServerSharesAllowed()) {
-					$newPermissions |= Constants::PERMISSION_SHARE;
-				}
-
-				$share->setPermissions($newPermissions);
-				$permissions = $newPermissions;
-			}
-
-			if ($expireDate === '') {
-				$share->setExpirationDate(null);
-			} elseif ($expireDate !== null) {
-				try {
-					$expireDate = $this->parseDate($expireDate);
-				} catch (\Exception $e) {
-					throw new OCSBadRequestException($e->getMessage(), $e);
-				}
-				$share->setExpirationDate($expireDate);
-			}
-
-			if ($password === '') {
-				$share->setPassword(null);
-			} elseif ($password !== null) {
-				$share->setPassword($password);
-			}
-
-			// only link shares have labels
-			if ($share->getShareType() === IShare::TYPE_LINK && $label !== null) {
-				if (strlen($label) > 255) {
-					throw new OCSBadRequestException("Maxmimum label length is 255");
-				}
-				$share->setLabel($label);
-			}
-
-			if ($sendPasswordByTalk === 'true') {
-				if (!$this->appManager->isEnabledForUser('spreed')) {
-					throw new OCSForbiddenException($this->l->t('Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled'));
-				}
-
-				$share->setSendPasswordByTalk(true);
-			} elseif ($sendPasswordByTalk !== null) {
-				$share->setSendPasswordByTalk(false);
-			}
-		}
-
-		// NOT A LINK SHARE
-		else {
-			if ($permissions !== null) {
-				$share->setPermissions($permissions);
-			}
-
-			if ($expireDate === '') {
-				$share->setExpirationDate(null);
-			} elseif ($expireDate !== null) {
-				try {
-					$expireDate = $this->parseDate($expireDate);
-				} catch (\Exception $e) {
-					throw new OCSBadRequestException($e->getMessage(), $e);
-				}
-				$share->setExpirationDate($expireDate);
-			}
-		}
-
-		try {
-			$share = $this->shareManager->updateShare($share);
-		} catch (GenericShareException $e) {
-			$code = $e->getCode() === 0 ? 403 : $e->getCode();
-			throw new OCSException($e->getHint(), $code);
-		} catch (\Exception $e) {
-			throw new OCSBadRequestException($e->getMessage(), $e);
-		}
-
-		return new DataResponse($this->formatShare($share));
-	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function pendingShares(): DataResponse {
-		$pendingShares = [];
-
-		$shareTypes = [
-			IShare::TYPE_USER,
-			IShare::TYPE_GROUP
-		];
-
-		foreach ($shareTypes as $shareType) {
-			$shares = $this->shareManager->getSharedWith($this->currentUser, $shareType, null, -1, 0);
-
-			foreach ($shares as $share) {
-				if ($share->getStatus() === IShare::STATUS_PENDING || $share->getStatus() === IShare::STATUS_REJECTED) {
-					$pendingShares[] = $share;
-				}
-			}
-		}
-
-		$result = array_filter(array_map(function (IShare $share) {
-			$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-			$nodes = $userFolder->getById($share->getNodeId());
-			if (empty($nodes)) {
-				// fallback to guessing the path
-				$node = $userFolder->get($share->getTarget());
-				if ($node === null || $share->getTarget() === '') {
-					return null;
-				}
-			} else {
-				$node = $nodes[0];
-			}
-
-			try {
-				$formattedShare = $this->formatShare($share, $node);
-				$formattedShare['status'] = $share->getStatus();
-				$formattedShare['path'] = $share->getNode()->getName();
-				$formattedShare['permissions'] = 0;
-				return $formattedShare;
-			} catch (NotFoundException $e) {
-				return null;
-			}
-		}, $pendingShares), function ($entry) {
-			return $entry !== null;
-		});
-
-		return new DataResponse($result);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $id
-	 * @return DataResponse
-	 * @throws OCSNotFoundException
-	 * @throws OCSException
-	 * @throws OCSBadRequestException
-	 */
-	public function acceptShare(string $id): DataResponse {
-		try {
-			$share = $this->getShareById($id);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		if (!$this->canAccessShare($share)) {
-			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
-		}
-
-		try {
-			$this->shareManager->acceptShare($share, $this->currentUser);
-		} catch (GenericShareException $e) {
-			$code = $e->getCode() === 0 ? 403 : $e->getCode();
-			throw new OCSException($e->getHint(), $code);
-		} catch (\Exception $e) {
-			throw new OCSBadRequestException($e->getMessage(), $e);
-		}
-
-		return new DataResponse();
-	}
-
-	/**
-	 * Does the user have read permission on the share
-	 *
-	 * @param \OCP\Share\IShare $share the share to check
-	 * @param boolean $checkGroups check groups as well?
-	 * @return boolean
-	 * @throws NotFoundException
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function canAccessShare(\OCP\Share\IShare $share, bool $checkGroups = true): bool {
-		// A file with permissions 0 can't be accessed by us. So Don't show it
-		if ($share->getPermissions() === 0) {
-			return false;
-		}
-
-		// Owner of the file and the sharer of the file can always get share
-		if ($share->getShareOwner() === $this->currentUser
-			|| $share->getSharedBy() === $this->currentUser) {
-			return true;
-		}
-
-		// If the share is shared with you, you can access it!
-		if ($share->getShareType() === IShare::TYPE_USER
-			&& $share->getSharedWith() === $this->currentUser) {
-			return true;
-		}
-
-		// Have reshare rights on the shared file/folder ?
-		// Does the currentUser have access to the shared file?
-		$userFolder = $this->rootFolder->getUserFolder($this->currentUser);
-		$files = $userFolder->getById($share->getNodeId());
-		if (!empty($files) && $this->shareProviderResharingRights($this->currentUser, $share, $files[0])) {
-			return true;
-		}
-
-		// If in the recipient group, you can see the share
-		if ($checkGroups && $share->getShareType() === IShare::TYPE_GROUP) {
-			$sharedWith = $this->groupManager->get($share->getSharedWith());
-			$user = $this->userManager->get($this->currentUser);
-			if ($user !== null && $sharedWith !== null && $sharedWith->inGroup($user)) {
-				return true;
-			}
-		}
-
-		if ($share->getShareType() === IShare::TYPE_CIRCLE) {
-			// TODO: have a sanity check like above?
-			return true;
-		}
-
-		if ($share->getShareType() === IShare::TYPE_ROOM) {
-			try {
-				return $this->getRoomShareHelper()->canAccessShare($share, $this->currentUser);
-			} catch (QueryException $e) {
-				return false;
-			}
-		}
-
-		if ($share->getShareType() === IShare::TYPE_DECK) {
-			try {
-				return $this->getDeckShareHelper()->canAccessShare($share, $this->currentUser);
-			} catch (QueryException $e) {
-				return false;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Does the user have edit permission on the share
-	 *
-	 * @param \OCP\Share\IShare $share the share to check
-	 * @return boolean
-	 */
-	protected function canEditShare(\OCP\Share\IShare $share): bool {
-		// A file with permissions 0 can't be accessed by us. So Don't show it
-		if ($share->getPermissions() === 0) {
-			return false;
-		}
-
-		// The owner of the file and the creator of the share
-		// can always edit the share
-		if ($share->getShareOwner() === $this->currentUser ||
-			$share->getSharedBy() === $this->currentUser
-		) {
-			return true;
-		}
-
-		//! we do NOT support some kind of `admin` in groups.
-		//! You cannot edit shares shared to a group you're
-		//! a member of if you're not the share owner or the file owner!
-
-		return false;
-	}
-
-	/**
-	 * Does the user have delete permission on the share
-	 *
-	 * @param \OCP\Share\IShare $share the share to check
-	 * @return boolean
-	 */
-	protected function canDeleteShare(\OCP\Share\IShare $share): bool {
-		// A file with permissions 0 can't be accessed by us. So Don't show it
-		if ($share->getPermissions() === 0) {
-			return false;
-		}
-
-		// if the user is the recipient, i can unshare
-		// the share with self
-		if ($share->getShareType() === IShare::TYPE_USER &&
-			$share->getSharedWith() === $this->currentUser
-		) {
-			return true;
-		}
-
-		// The owner of the file and the creator of the share
-		// can always delete the share
-		if ($share->getShareOwner() === $this->currentUser ||
-			$share->getSharedBy() === $this->currentUser
-		) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Does the user have delete permission on the share
-	 * This differs from the canDeleteShare function as it only
-	 * remove the share for the current user. It does NOT
-	 * completely delete the share but only the mount point.
-	 * It can then be restored from the deleted shares section.
-	 *
-	 * @param \OCP\Share\IShare $share the share to check
-	 * @return boolean
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function canDeleteShareFromSelf(\OCP\Share\IShare $share): bool {
-		if ($share->getShareType() !== IShare::TYPE_GROUP &&
-			$share->getShareType() !== IShare::TYPE_ROOM &&
-			$share->getShareType() !== IShare::TYPE_DECK
-		) {
-			return false;
-		}
-
-		if ($share->getShareOwner() === $this->currentUser ||
-			$share->getSharedBy() === $this->currentUser
-		) {
-			// Delete the whole share, not just for self
-			return false;
-		}
-
-		// If in the recipient group, you can delete the share from self
-		if ($share->getShareType() === IShare::TYPE_GROUP) {
-			$sharedWith = $this->groupManager->get($share->getSharedWith());
-			$user = $this->userManager->get($this->currentUser);
-			if ($user !== null && $sharedWith !== null && $sharedWith->inGroup($user)) {
-				return true;
-			}
-		}
-
-		if ($share->getShareType() === IShare::TYPE_ROOM) {
-			try {
-				return $this->getRoomShareHelper()->canAccessShare($share, $this->currentUser);
-			} catch (QueryException $e) {
-				return false;
-			}
-		}
-
-		if ($share->getShareType() === IShare::TYPE_DECK) {
-			try {
-				return $this->getDeckShareHelper()->canAccessShare($share, $this->currentUser);
-			} catch (QueryException $e) {
-				return false;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Make sure that the passed date is valid ISO 8601
-	 * So YYYY-MM-DD
-	 * If not throw an exception
-	 *
-	 * @param string $expireDate
-	 *
-	 * @throws \Exception
-	 * @return \DateTime
-	 */
-	private function parseDate(string $expireDate): \DateTime {
-		try {
-			$date = new \DateTime($expireDate);
-		} catch (\Exception $e) {
-			throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
-		}
-
-		if ($date === false) {
-			throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
-		}
-
-		$date->setTime(0, 0, 0);
-
-		return $date;
-	}
-
-	/**
-	 * Since we have multiple providers but the OCS Share API v1 does
-	 * not support this we need to check all backends.
-	 *
-	 * @param string $id
-	 * @return \OCP\Share\IShare
-	 * @throws ShareNotFound
-	 */
-	private function getShareById(string $id): IShare {
-		$share = null;
-
-		// First check if it is an internal share.
-		try {
-			$share = $this->shareManager->getShareById('ocinternal:' . $id, $this->currentUser);
-			return $share;
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-
-		try {
-			if ($this->shareManager->shareProviderExists(IShare::TYPE_CIRCLE)) {
-				$share = $this->shareManager->getShareById('ocCircleShare:' . $id, $this->currentUser);
-				return $share;
-			}
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-		try {
-			if ($this->shareManager->shareProviderExists(IShare::TYPE_EMAIL)) {
-				$share = $this->shareManager->getShareById('ocMailShare:' . $id, $this->currentUser);
-				return $share;
-			}
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-		try {
-			$share = $this->shareManager->getShareById('ocRoomShare:' . $id, $this->currentUser);
-			return $share;
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-		try {
-			if ($this->shareManager->shareProviderExists(IShare::TYPE_DECK)) {
-				$share = $this->shareManager->getShareById('deck:' . $id, $this->currentUser);
-				return $share;
-			}
-		} catch (ShareNotFound $e) {
-			// Do nothing, just try the other share type
-		}
-
-		if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			throw new ShareNotFound();
-		}
-		$share = $this->shareManager->getShareById('ocFederatedSharing:' . $id, $this->currentUser);
-
-		return $share;
-	}
-
-	/**
-	 * Lock a Node
-	 *
-	 * @param \OCP\Files\Node $node
-	 * @throws LockedException
-	 */
-	private function lock(\OCP\Files\Node $node) {
-		$node->lock(ILockingProvider::LOCK_SHARED);
-		$this->lockedNode = $node;
-	}
-
-	/**
-	 * Cleanup the remaining locks
-	 * @throws LockedException
-	 */
-	public function cleanup() {
-		if ($this->lockedNode !== null) {
-			$this->lockedNode->unlock(ILockingProvider::LOCK_SHARED);
-		}
-	}
-
-	/**
-	 * Returns the helper of ShareAPIController for room shares.
-	 *
-	 * If the Talk application is not enabled or the helper is not available
-	 * a QueryException is thrown instead.
-	 *
-	 * @return \OCA\Talk\Share\Helper\ShareAPIController
-	 * @throws QueryException
-	 */
-	private function getRoomShareHelper() {
-		if (!$this->appManager->isEnabledForUser('spreed')) {
-			throw new QueryException();
-		}
-
-		return $this->serverContainer->get('\OCA\Talk\Share\Helper\ShareAPIController');
-	}
-
-	/**
-	 * Returns the helper of ShareAPIHelper for deck shares.
-	 *
-	 * If the Deck application is not enabled or the helper is not available
-	 * a QueryException is thrown instead.
-	 *
-	 * @return \OCA\Deck\Sharing\ShareAPIHelper
-	 * @throws QueryException
-	 */
-	private function getDeckShareHelper() {
-		if (!$this->appManager->isEnabledForUser('deck')) {
-			throw new QueryException();
-		}
-
-		return $this->serverContainer->get('\OCA\Deck\Sharing\ShareAPIHelper');
-	}
-
-	/**
-	 * @param string $viewer
-	 * @param Node $node
-	 * @param bool $reShares
-	 *
-	 * @return IShare[]
-	 */
-	private function getSharesFromNode(string $viewer, $node, bool $reShares): array {
-		$providers = [
-			IShare::TYPE_USER,
-			IShare::TYPE_GROUP,
-			IShare::TYPE_LINK,
-			IShare::TYPE_EMAIL,
-			IShare::TYPE_EMAIL,
-			IShare::TYPE_CIRCLE,
-			IShare::TYPE_ROOM,
-			IShare::TYPE_DECK
-		];
-
-		// Should we assume that the (currentUser) viewer is the owner of the node !?
-		$shares = [];
-		foreach ($providers as $provider) {
-			if (!$this->shareManager->shareProviderExists($provider)) {
-				continue;
-			}
-
-			$providerShares =
-				$this->shareManager->getSharesBy($viewer, $provider, $node, $reShares, -1, 0);
-			$shares = array_merge($shares, $providerShares);
-		}
-
-		if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			$federatedShares = $this->shareManager->getSharesBy(
-				$this->currentUser, IShare::TYPE_REMOTE, $node, $reShares, -1, 0
-			);
-			$shares = array_merge($shares, $federatedShares);
-		}
-
-		if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
-			$federatedShares = $this->shareManager->getSharesBy(
-				$this->currentUser, IShare::TYPE_REMOTE_GROUP, $node, $reShares, -1, 0
-			);
-			$shares = array_merge($shares, $federatedShares);
-		}
-
-		return $shares;
-	}
-
-
-	/**
-	 * @param Node $node
-	 *
-	 * @throws SharingRightsException
-	 */
-	private function confirmSharingRights(Node $node): void {
-		if (!$this->hasResharingRights($this->currentUser, $node)) {
-			throw new SharingRightsException('no sharing rights on this item');
-		}
-	}
-
-
-	/**
-	 * @param string $viewer
-	 * @param Node $node
-	 *
-	 * @return bool
-	 */
-	private function hasResharingRights($viewer, $node): bool {
-		if ($viewer === $node->getOwner()->getUID()) {
-			return true;
-		}
-
-		foreach ([$node, $node->getParent()] as $node) {
-			$shares = $this->getSharesFromNode($viewer, $node, true);
-			foreach ($shares as $share) {
-				try {
-					if ($this->shareProviderResharingRights($viewer, $share, $node)) {
-						return true;
-					}
-				} catch (InvalidPathException | NotFoundException $e) {
-				}
-			}
-		}
-
-		return false;
-	}
-
-
-	/**
-	 * Returns if we can find resharing rights in an IShare object for a specific user.
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 *
-	 * @param string $userId
-	 * @param IShare $share
-	 * @param Node $node
-	 *
-	 * @return bool
-	 * @throws NotFoundException
-	 * @throws InvalidPathException
-	 */
-	private function shareProviderResharingRights(string $userId, IShare $share, $node): bool {
-		if ($share->getShareOwner() === $userId) {
-			return true;
-		}
-
-		// we check that current user have parent resharing rights on the current file
-		if ($node !== null && ($node->getPermissions() & Constants::PERMISSION_SHARE) !== 0) {
-			return true;
-		}
-
-		if ((\OCP\Constants::PERMISSION_SHARE & $share->getPermissions()) === 0) {
-			return false;
-		}
-
-		if ($share->getShareType() === IShare::TYPE_USER && $share->getSharedWith() === $userId) {
-			return true;
-		}
-
-		if ($share->getShareType() === IShare::TYPE_GROUP && $this->groupManager->isInGroup($userId, $share->getSharedWith())) {
-			return true;
-		}
-
-		if ($share->getShareType() === IShare::TYPE_CIRCLE && \OC::$server->getAppManager()->isEnabledForUser('circles')
-			&& class_exists('\OCA\Circles\Api\v1\Circles')) {
-			$hasCircleId = (substr($share->getSharedWith(), -1) === ']');
-			$shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0);
-			$shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' '));
-			if ($shareWithLength === false) {
-				$sharedWith = substr($share->getSharedWith(), $shareWithStart);
-			} else {
-				$sharedWith = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
-			}
-			try {
-				$member = \OCA\Circles\Api\v1\Circles::getMember($sharedWith, $userId, 1);
-				if ($member->getLevel() >= 4) {
-					return true;
-				}
-				return false;
-			} catch (QueryException $e) {
-				return false;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get all the shares for the current user
-	 *
-	 * @param Node|null $path
-	 * @param boolean $reshares
-	 * @return IShare[]
-	 */
-	private function getAllShares(?Node $path = null, bool $reshares = false) {
-		// Get all shares
-		$userShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_USER, $path, $reshares, -1, 0);
-		$groupShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_GROUP, $path, $reshares, -1, 0);
-		$linkShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_LINK, $path, $reshares, -1, 0);
-
-		// EMAIL SHARES
-		$mailShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_EMAIL, $path, $reshares, -1, 0);
-
-		// CIRCLE SHARES
-		$circleShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_CIRCLE, $path, $reshares, -1, 0);
-
-		// TALK SHARES
-		$roomShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_ROOM, $path, $reshares, -1, 0);
-
-		$deckShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_DECK, $path, $reshares, -1, 0);
-
-		// FEDERATION
-		if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			$federatedShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_REMOTE, $path, $reshares, -1, 0);
-		} else {
-			$federatedShares = [];
-		}
-		if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
-			$federatedGroupShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_REMOTE_GROUP, $path, $reshares, -1, 0);
-		} else {
-			$federatedGroupShares = [];
-		}
-
-		return array_merge($userShares, $groupShares, $linkShares, $mailShares, $circleShares, $roomShares, $deckShares, $federatedShares, $federatedGroupShares);
-	}
-
-
-	/**
-	 * merging already formatted shares.
-	 * We'll make an associative array to easily detect duplicate Ids.
-	 * Keys _needs_ to be removed after all shares are retrieved and merged.
-	 *
-	 * @param array $shares
-	 * @param array $newShares
-	 */
-	private function mergeFormattedShares(array &$shares, array $newShares) {
-		foreach ($newShares as $newShare) {
-			if (!array_key_exists($newShare['id'], $shares)) {
-				$shares[$newShare['id']] = $newShare;
-			}
-		}
-	}
+                continue;
+            }
+
+            if (in_array($share->getId(), $known)
+                || ($share->getSharedWith() === $this->currentUser && $share->getShareType() === IShare::TYPE_USER)) {
+                continue;
+            }
+
+            $known[] = $share->getId();
+            try {
+                /** @var IShare $share */
+                $format = $this->formatShare($share, $node);
+                $formatted[] = $format;
+
+                // let's also build a list of shares created
+                // by the current user only, in case
+                // there is no resharing rights
+                if ($share->getSharedBy() === $this->currentUser) {
+                    $miniFormatted[] = $format;
+                }
+
+                // check if one of those share is shared with me
+                // and if I have resharing rights on it
+                if (!$resharingRight && $this->shareProviderResharingRights($this->currentUser, $share, $node)) {
+                    $resharingRight = true;
+                }
+            } catch (InvalidPathException | NotFoundException $e) {
+            }
+        }
+
+        if (!$resharingRight) {
+            $formatted = $miniFormatted;
+        }
+
+        if ($includeTags) {
+            $formatted =
+                Helper::populateTags($formatted, 'file_source', \OC::$server->getTagManager());
+        }
+
+        return $formatted;
+    }
+
+
+    /**
+     * The getInheritedShares function.
+     * returns all shares relative to a file, including parent folders shares rights.
+     *
+     * @NoAdminRequired
+     *
+     * @param string $path
+     *
+     * - Get shares by the current user
+     * - Get shares by the current user and reshares (?reshares=true)
+     * - Get shares with the current user (?shared_with_me=true)
+     * - Get shares for a specific path (?path=...)
+     * - Get all shares in a folder (?subfiles=true&path=..)
+     *
+     * @return DataResponse
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     * @throws OCSNotFoundException
+     * @throws OCSBadRequestException
+     * @throws SharingRightsException
+     */
+    public function getInheritedShares(string $path): DataResponse {
+
+        // get Node from (string) path.
+        $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+        try {
+            $node = $userFolder->get($path);
+            $this->lock($node);
+        } catch (\OCP\Files\NotFoundException $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong path, file/folder doesn\'t exist'));
+        } catch (LockedException $e) {
+            throw new OCSNotFoundException($this->l->t('Could not lock path'));
+        }
+
+        if (!($node->getPermissions() & Constants::PERMISSION_SHARE)) {
+            throw new SharingRightsException('no sharing rights on this item');
+        }
+
+        // The current top parent we have access to
+        $parent = $node;
+
+        // initiate real owner.
+        $owner = $node->getOwner()
+                        ->getUID();
+        if (!$this->userManager->userExists($owner)) {
+            return new DataResponse([]);
+        }
+
+        // get node based on the owner, fix owner in case of external storage
+        $userFolder = $this->rootFolder->getUserFolder($owner);
+        if ($node->getId() !== $userFolder->getId() && !$userFolder->isSubNode($node)) {
+            $owner = $node->getOwner()
+                            ->getUID();
+            $userFolder = $this->rootFolder->getUserFolder($owner);
+            $nodes = $userFolder->getById($node->getId());
+            $node = array_shift($nodes);
+        }
+        $basePath = $userFolder->getPath();
+
+        // generate node list for each parent folders
+        /** @var Node[] $nodes */
+        $nodes = [];
+        while ($node->getPath() !== $basePath) {
+            $node = $node->getParent();
+            $nodes[] = $node;
+        }
+
+        // The user that is requesting this list
+        $currentUserFolder = $this->rootFolder->getUserFolder($this->currentUser);
+
+        // for each nodes, retrieve shares.
+        $shares = [];
+
+        foreach ($nodes as $node) {
+            $getShares = $this->getFormattedShares($owner, $node, false, true);
+
+            $currentUserNodes = $currentUserFolder->getById($node->getId());
+            if (!empty($currentUserNodes)) {
+                $parent = array_pop($currentUserNodes);
+            }
+
+            $subPath = $currentUserFolder->getRelativePath($parent->getPath());
+            foreach ($getShares as &$share) {
+                $share['via_fileid'] = $parent->getId();
+                $share['via_path'] = $subPath;
+            }
+            $this->mergeFormattedShares($shares, $getShares);
+        }
+
+        return new DataResponse(array_values($shares));
+    }
+
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @param int $permissions
+     * @param string $password
+     * @param string $sendPasswordByTalk
+     * @param string $publicUpload
+     * @param string $expireDate
+     * @param string $note
+     * @param string $label
+     * @param string $hideDownload
+     * @return DataResponse
+     * @throws LockedException
+     * @throws NotFoundException
+     * @throws OCSBadRequestException
+     * @throws OCSForbiddenException
+     * @throws OCSNotFoundException
+     */
+    public function updateShare(
+        string $id,
+        int $permissions = null,
+        string $password = null,
+        string $sendPasswordByTalk = null,
+        string $publicUpload = null,
+        string $expireDate = null,
+        string $note = null,
+        string $label = null,
+        string $hideDownload = null
+    ): DataResponse {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        $this->lock($share->getNode());
+
+        if (!$this->canAccessShare($share, false)) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        if (!$this->canEditShare($share)) {
+            throw new OCSForbiddenException('You are not allowed to edit incoming shares');
+        }
+
+        if (
+            $permissions === null &&
+            $password === null &&
+            $sendPasswordByTalk === null &&
+            $publicUpload === null &&
+            $expireDate === null &&
+            $note === null &&
+            $label === null &&
+            $hideDownload === null
+        ) {
+            throw new OCSBadRequestException($this->l->t('Wrong or no update parameter given'));
+        }
+
+        if ($note !== null) {
+            $share->setNote($note);
+        }
+
+        /**
+         * expirationdate, password and publicUpload only make sense for link shares
+         */
+        if ($share->getShareType() === IShare::TYPE_LINK
+            || $share->getShareType() === IShare::TYPE_EMAIL) {
+
+            /**
+             * We do not allow editing link shares that the current user
+             * doesn't own. This is confusing and lead to errors when
+             * someone else edit a password or expiration date without
+             * the share owner knowing about it.
+             * We only allow deletion
+             */
+
+            if ($share->getSharedBy() !== $this->currentUser) {
+                throw new OCSForbiddenException('You are not allowed to edit link shares that you don\'t own');
+            }
+
+            // Update hide download state
+            if ($hideDownload === 'true') {
+                $share->setHideDownload(true);
+            } elseif ($hideDownload === 'false') {
+                $share->setHideDownload(false);
+            }
+
+            $newPermissions = null;
+            if ($publicUpload === 'true') {
+                $newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
+            } elseif ($publicUpload === 'false') {
+                $newPermissions = Constants::PERMISSION_READ;
+            }
+
+            if ($permissions !== null) {
+                $newPermissions = $permissions;
+                $newPermissions = $newPermissions & ~Constants::PERMISSION_SHARE;
+            }
+
+            if ($newPermissions !== null &&
+                !in_array($newPermissions, [
+                    Constants::PERMISSION_READ,
+                    Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE, // legacy
+                    Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE, // correct
+                    Constants::PERMISSION_CREATE, // hidden file list
+                    Constants::PERMISSION_READ | Constants::PERMISSION_UPDATE, // allow to edit single files
+                ], true)
+            ) {
+                throw new OCSBadRequestException($this->l->t('Can\'t change permissions for public share links'));
+            }
+
+            if (
+                // legacy
+                $newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE) ||
+                // correct
+                $newPermissions === (Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE)
+            ) {
+                if (!$this->shareManager->shareApiLinkAllowPublicUpload()) {
+                    throw new OCSForbiddenException($this->l->t('Public upload disabled by the administrator'));
+                }
+
+                if (!($share->getNode() instanceof \OCP\Files\Folder)) {
+                    throw new OCSBadRequestException($this->l->t('Public upload is only possible for publicly shared folders'));
+                }
+
+                // normalize to correct public upload permissions
+                $newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
+            }
+
+            if ($newPermissions !== null) {
+                // TODO: It might make sense to have a dedicated setting to allow/deny converting link shares into federated ones
+                if (($newPermissions & Constants::PERMISSION_READ) && $this->shareManager->outgoingServer2ServerSharesAllowed()) {
+                    $newPermissions |= Constants::PERMISSION_SHARE;
+                }
+
+                $share->setPermissions($newPermissions);
+                $permissions = $newPermissions;
+            }
+
+            if ($expireDate === '') {
+                $share->setExpirationDate(null);
+            } elseif ($expireDate !== null) {
+                try {
+                    $expireDate = $this->parseDate($expireDate);
+                } catch (\Exception $e) {
+                    throw new OCSBadRequestException($e->getMessage(), $e);
+                }
+                $share->setExpirationDate($expireDate);
+            }
+
+            if ($password === '') {
+                $share->setPassword(null);
+            } elseif ($password !== null) {
+                $share->setPassword($password);
+            }
+
+            // only link shares have labels
+            if ($share->getShareType() === IShare::TYPE_LINK && $label !== null) {
+                if (strlen($label) > 255) {
+                    throw new OCSBadRequestException("Maxmimum label length is 255");
+                }
+                $share->setLabel($label);
+            }
+
+            if ($sendPasswordByTalk === 'true') {
+                if (!$this->appManager->isEnabledForUser('spreed')) {
+                    throw new OCSForbiddenException($this->l->t('Sharing sending the password by Nextcloud Talk failed because Nextcloud Talk is not enabled'));
+                }
+
+                $share->setSendPasswordByTalk(true);
+            } elseif ($sendPasswordByTalk !== null) {
+                $share->setSendPasswordByTalk(false);
+            }
+        }
+
+        // NOT A LINK SHARE
+        else {
+            if ($permissions !== null) {
+                $share->setPermissions($permissions);
+            }
+
+            if ($expireDate === '') {
+                $share->setExpirationDate(null);
+            } elseif ($expireDate !== null) {
+                try {
+                    $expireDate = $this->parseDate($expireDate);
+                } catch (\Exception $e) {
+                    throw new OCSBadRequestException($e->getMessage(), $e);
+                }
+                $share->setExpirationDate($expireDate);
+            }
+        }
+
+        try {
+            $share = $this->shareManager->updateShare($share);
+        } catch (GenericShareException $e) {
+            $code = $e->getCode() === 0 ? 403 : $e->getCode();
+            throw new OCSException($e->getHint(), $code);
+        } catch (\Exception $e) {
+            throw new OCSBadRequestException($e->getMessage(), $e);
+        }
+
+        return new DataResponse($this->formatShare($share));
+    }
+
+    /**
+     * @NoAdminRequired
+     */
+    public function pendingShares(): DataResponse {
+        $pendingShares = [];
+
+        $shareTypes = [
+            IShare::TYPE_USER,
+            IShare::TYPE_GROUP
+        ];
+
+        foreach ($shareTypes as $shareType) {
+            $shares = $this->shareManager->getSharedWith($this->currentUser, $shareType, null, -1, 0);
+
+            foreach ($shares as $share) {
+                if ($share->getStatus() === IShare::STATUS_PENDING || $share->getStatus() === IShare::STATUS_REJECTED) {
+                    $pendingShares[] = $share;
+                }
+            }
+        }
+
+        $result = array_filter(array_map(function (IShare $share) {
+            $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+            $nodes = $userFolder->getById($share->getNodeId());
+            if (empty($nodes)) {
+                // fallback to guessing the path
+                $node = $userFolder->get($share->getTarget());
+                if ($node === null || $share->getTarget() === '') {
+                    return null;
+                }
+            } else {
+                $node = $nodes[0];
+            }
+
+            try {
+                $formattedShare = $this->formatShare($share, $node);
+                $formattedShare['status'] = $share->getStatus();
+                $formattedShare['path'] = $share->getNode()->getName();
+                $formattedShare['permissions'] = 0;
+                return $formattedShare;
+            } catch (NotFoundException $e) {
+                return null;
+            }
+        }, $pendingShares), function ($entry) {
+            return $entry !== null;
+        });
+
+        return new DataResponse($result);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $id
+     * @return DataResponse
+     * @throws OCSNotFoundException
+     * @throws OCSException
+     * @throws OCSBadRequestException
+     */
+    public function acceptShare(string $id): DataResponse {
+        try {
+            $share = $this->getShareById($id);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        if (!$this->canAccessShare($share)) {
+            throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
+        }
+
+        try {
+            $this->shareManager->acceptShare($share, $this->currentUser);
+        } catch (GenericShareException $e) {
+            $code = $e->getCode() === 0 ? 403 : $e->getCode();
+            throw new OCSException($e->getHint(), $code);
+        } catch (\Exception $e) {
+            throw new OCSBadRequestException($e->getMessage(), $e);
+        }
+
+        return new DataResponse();
+    }
+
+    /**
+     * Does the user have read permission on the share
+     *
+     * @param \OCP\Share\IShare $share the share to check
+     * @param boolean $checkGroups check groups as well?
+     * @return boolean
+     * @throws NotFoundException
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function canAccessShare(\OCP\Share\IShare $share, bool $checkGroups = true): bool {
+        // A file with permissions 0 can't be accessed by us. So Don't show it
+        if ($share->getPermissions() === 0) {
+            return false;
+        }
+
+        // Owner of the file and the sharer of the file can always get share
+        if ($share->getShareOwner() === $this->currentUser
+            || $share->getSharedBy() === $this->currentUser) {
+            return true;
+        }
+
+        // If the share is shared with you, you can access it!
+        if ($share->getShareType() === IShare::TYPE_USER
+            && $share->getSharedWith() === $this->currentUser) {
+            return true;
+        }
+
+        // Have reshare rights on the shared file/folder ?
+        // Does the currentUser have access to the shared file?
+        $userFolder = $this->rootFolder->getUserFolder($this->currentUser);
+        $files = $userFolder->getById($share->getNodeId());
+        if (!empty($files) && $this->shareProviderResharingRights($this->currentUser, $share, $files[0])) {
+            return true;
+        }
+
+        // If in the recipient group, you can see the share
+        if ($checkGroups && $share->getShareType() === IShare::TYPE_GROUP) {
+            $sharedWith = $this->groupManager->get($share->getSharedWith());
+            $user = $this->userManager->get($this->currentUser);
+            if ($user !== null && $sharedWith !== null && $sharedWith->inGroup($user)) {
+                return true;
+            }
+        }
+
+        if ($share->getShareType() === IShare::TYPE_CIRCLE) {
+            // TODO: have a sanity check like above?
+            return true;
+        }
+
+        if ($share->getShareType() === IShare::TYPE_ROOM) {
+            try {
+                return $this->getRoomShareHelper()->canAccessShare($share, $this->currentUser);
+            } catch (QueryException $e) {
+                return false;
+            }
+        }
+
+        if ($share->getShareType() === IShare::TYPE_DECK) {
+            try {
+                return $this->getDeckShareHelper()->canAccessShare($share, $this->currentUser);
+            } catch (QueryException $e) {
+                return false;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Does the user have edit permission on the share
+     *
+     * @param \OCP\Share\IShare $share the share to check
+     * @return boolean
+     */
+    protected function canEditShare(\OCP\Share\IShare $share): bool {
+        // A file with permissions 0 can't be accessed by us. So Don't show it
+        if ($share->getPermissions() === 0) {
+            return false;
+        }
+
+        // The owner of the file and the creator of the share
+        // can always edit the share
+        if ($share->getShareOwner() === $this->currentUser ||
+            $share->getSharedBy() === $this->currentUser
+        ) {
+            return true;
+        }
+
+        //! we do NOT support some kind of `admin` in groups.
+        //! You cannot edit shares shared to a group you're
+        //! a member of if you're not the share owner or the file owner!
+
+        return false;
+    }
+
+    /**
+     * Does the user have delete permission on the share
+     *
+     * @param \OCP\Share\IShare $share the share to check
+     * @return boolean
+     */
+    protected function canDeleteShare(\OCP\Share\IShare $share): bool {
+        // A file with permissions 0 can't be accessed by us. So Don't show it
+        if ($share->getPermissions() === 0) {
+            return false;
+        }
+
+        // if the user is the recipient, i can unshare
+        // the share with self
+        if ($share->getShareType() === IShare::TYPE_USER &&
+            $share->getSharedWith() === $this->currentUser
+        ) {
+            return true;
+        }
+
+        // The owner of the file and the creator of the share
+        // can always delete the share
+        if ($share->getShareOwner() === $this->currentUser ||
+            $share->getSharedBy() === $this->currentUser
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Does the user have delete permission on the share
+     * This differs from the canDeleteShare function as it only
+     * remove the share for the current user. It does NOT
+     * completely delete the share but only the mount point.
+     * It can then be restored from the deleted shares section.
+     *
+     * @param \OCP\Share\IShare $share the share to check
+     * @return boolean
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function canDeleteShareFromSelf(\OCP\Share\IShare $share): bool {
+        if ($share->getShareType() !== IShare::TYPE_GROUP &&
+            $share->getShareType() !== IShare::TYPE_ROOM &&
+            $share->getShareType() !== IShare::TYPE_DECK
+        ) {
+            return false;
+        }
+
+        if ($share->getShareOwner() === $this->currentUser ||
+            $share->getSharedBy() === $this->currentUser
+        ) {
+            // Delete the whole share, not just for self
+            return false;
+        }
+
+        // If in the recipient group, you can delete the share from self
+        if ($share->getShareType() === IShare::TYPE_GROUP) {
+            $sharedWith = $this->groupManager->get($share->getSharedWith());
+            $user = $this->userManager->get($this->currentUser);
+            if ($user !== null && $sharedWith !== null && $sharedWith->inGroup($user)) {
+                return true;
+            }
+        }
+
+        if ($share->getShareType() === IShare::TYPE_ROOM) {
+            try {
+                return $this->getRoomShareHelper()->canAccessShare($share, $this->currentUser);
+            } catch (QueryException $e) {
+                return false;
+            }
+        }
+
+        if ($share->getShareType() === IShare::TYPE_DECK) {
+            try {
+                return $this->getDeckShareHelper()->canAccessShare($share, $this->currentUser);
+            } catch (QueryException $e) {
+                return false;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Make sure that the passed date is valid ISO 8601
+     * So YYYY-MM-DD
+     * If not throw an exception
+     *
+     * @param string $expireDate
+     *
+     * @throws \Exception
+     * @return \DateTime
+     */
+    private function parseDate(string $expireDate): \DateTime {
+        try {
+            $date = new \DateTime($expireDate);
+        } catch (\Exception $e) {
+            throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
+        }
+
+        if ($date === false) {
+            throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
+        }
+
+        $date->setTime(0, 0, 0);
+
+        return $date;
+    }
+
+    /**
+     * Since we have multiple providers but the OCS Share API v1 does
+     * not support this we need to check all backends.
+     *
+     * @param string $id
+     * @return \OCP\Share\IShare
+     * @throws ShareNotFound
+     */
+    private function getShareById(string $id): IShare {
+        $share = null;
+
+        // First check if it is an internal share.
+        try {
+            $share = $this->shareManager->getShareById('ocinternal:' . $id, $this->currentUser);
+            return $share;
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+
+        try {
+            if ($this->shareManager->shareProviderExists(IShare::TYPE_CIRCLE)) {
+                $share = $this->shareManager->getShareById('ocCircleShare:' . $id, $this->currentUser);
+                return $share;
+            }
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+        try {
+            if ($this->shareManager->shareProviderExists(IShare::TYPE_EMAIL)) {
+                $share = $this->shareManager->getShareById('ocMailShare:' . $id, $this->currentUser);
+                return $share;
+            }
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+        try {
+            $share = $this->shareManager->getShareById('ocRoomShare:' . $id, $this->currentUser);
+            return $share;
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+        try {
+            if ($this->shareManager->shareProviderExists(IShare::TYPE_DECK)) {
+                $share = $this->shareManager->getShareById('deck:' . $id, $this->currentUser);
+                return $share;
+            }
+        } catch (ShareNotFound $e) {
+            // Do nothing, just try the other share type
+        }
+
+        if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
+            throw new ShareNotFound();
+        }
+        $share = $this->shareManager->getShareById('ocFederatedSharing:' . $id, $this->currentUser);
+
+        return $share;
+    }
+
+    /**
+     * Lock a Node
+     *
+     * @param \OCP\Files\Node $node
+     * @throws LockedException
+     */
+    private function lock(\OCP\Files\Node $node) {
+        $node->lock(ILockingProvider::LOCK_SHARED);
+        $this->lockedNode = $node;
+    }
+
+    /**
+     * Cleanup the remaining locks
+     * @throws LockedException
+     */
+    public function cleanup() {
+        if ($this->lockedNode !== null) {
+            $this->lockedNode->unlock(ILockingProvider::LOCK_SHARED);
+        }
+    }
+
+    /**
+     * Returns the helper of ShareAPIController for room shares.
+     *
+     * If the Talk application is not enabled or the helper is not available
+     * a QueryException is thrown instead.
+     *
+     * @return \OCA\Talk\Share\Helper\ShareAPIController
+     * @throws QueryException
+     */
+    private function getRoomShareHelper() {
+        if (!$this->appManager->isEnabledForUser('spreed')) {
+            throw new QueryException();
+        }
+
+        return $this->serverContainer->get('\OCA\Talk\Share\Helper\ShareAPIController');
+    }
+
+    /**
+     * Returns the helper of ShareAPIHelper for deck shares.
+     *
+     * If the Deck application is not enabled or the helper is not available
+     * a QueryException is thrown instead.
+     *
+     * @return \OCA\Deck\Sharing\ShareAPIHelper
+     * @throws QueryException
+     */
+    private function getDeckShareHelper() {
+        if (!$this->appManager->isEnabledForUser('deck')) {
+            throw new QueryException();
+        }
+
+        return $this->serverContainer->get('\OCA\Deck\Sharing\ShareAPIHelper');
+    }
+
+    /**
+     * @param string $viewer
+     * @param Node $node
+     * @param bool $reShares
+     *
+     * @return IShare[]
+     */
+    private function getSharesFromNode(string $viewer, $node, bool $reShares): array {
+        $providers = [
+            IShare::TYPE_USER,
+            IShare::TYPE_GROUP,
+            IShare::TYPE_LINK,
+            IShare::TYPE_EMAIL,
+            IShare::TYPE_EMAIL,
+            IShare::TYPE_CIRCLE,
+            IShare::TYPE_ROOM,
+            IShare::TYPE_DECK
+        ];
+
+        // Should we assume that the (currentUser) viewer is the owner of the node !?
+        $shares = [];
+        foreach ($providers as $provider) {
+            if (!$this->shareManager->shareProviderExists($provider)) {
+                continue;
+            }
+
+            $providerShares =
+                $this->shareManager->getSharesBy($viewer, $provider, $node, $reShares, -1, 0);
+            $shares = array_merge($shares, $providerShares);
+        }
+
+        if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
+            $federatedShares = $this->shareManager->getSharesBy(
+                $this->currentUser, IShare::TYPE_REMOTE, $node, $reShares, -1, 0
+            );
+            $shares = array_merge($shares, $federatedShares);
+        }
+
+        if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
+            $federatedShares = $this->shareManager->getSharesBy(
+                $this->currentUser, IShare::TYPE_REMOTE_GROUP, $node, $reShares, -1, 0
+            );
+            $shares = array_merge($shares, $federatedShares);
+        }
+
+        return $shares;
+    }
+
+
+    /**
+     * @param Node $node
+     *
+     * @throws SharingRightsException
+     */
+    private function confirmSharingRights(Node $node): void {
+        if (!$this->hasResharingRights($this->currentUser, $node)) {
+            throw new SharingRightsException('no sharing rights on this item');
+        }
+    }
+
+
+    /**
+     * @param string $viewer
+     * @param Node $node
+     *
+     * @return bool
+     */
+    private function hasResharingRights($viewer, $node): bool {
+        if ($viewer === $node->getOwner()->getUID()) {
+            return true;
+        }
+
+        foreach ([$node, $node->getParent()] as $node) {
+            $shares = $this->getSharesFromNode($viewer, $node, true);
+            foreach ($shares as $share) {
+                try {
+                    if ($this->shareProviderResharingRights($viewer, $share, $node)) {
+                        return true;
+                    }
+                } catch (InvalidPathException | NotFoundException $e) {
+                }
+            }
+        }
+
+        return false;
+    }
+
+
+    /**
+     * Returns if we can find resharing rights in an IShare object for a specific user.
+     *
+     * @suppress PhanUndeclaredClassMethod
+     *
+     * @param string $userId
+     * @param IShare $share
+     * @param Node $node
+     *
+     * @return bool
+     * @throws NotFoundException
+     * @throws InvalidPathException
+     */
+    private function shareProviderResharingRights(string $userId, IShare $share, $node): bool {
+        if ($share->getShareOwner() === $userId) {
+            return true;
+        }
+
+        // we check that current user have parent resharing rights on the current file
+        if ($node !== null && ($node->getPermissions() & Constants::PERMISSION_SHARE) !== 0) {
+            return true;
+        }
+
+        if ((\OCP\Constants::PERMISSION_SHARE & $share->getPermissions()) === 0) {
+            return false;
+        }
+
+        if ($share->getShareType() === IShare::TYPE_USER && $share->getSharedWith() === $userId) {
+            return true;
+        }
+
+        if ($share->getShareType() === IShare::TYPE_GROUP && $this->groupManager->isInGroup($userId, $share->getSharedWith())) {
+            return true;
+        }
+
+        if ($share->getShareType() === IShare::TYPE_CIRCLE && \OC::$server->getAppManager()->isEnabledForUser('circles')
+            && class_exists('\OCA\Circles\Api\v1\Circles')) {
+            $hasCircleId = (substr($share->getSharedWith(), -1) === ']');
+            $shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0);
+            $shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' '));
+            if ($shareWithLength === false) {
+                $sharedWith = substr($share->getSharedWith(), $shareWithStart);
+            } else {
+                $sharedWith = substr($share->getSharedWith(), $shareWithStart, $shareWithLength);
+            }
+            try {
+                $member = \OCA\Circles\Api\v1\Circles::getMember($sharedWith, $userId, 1);
+                if ($member->getLevel() >= 4) {
+                    return true;
+                }
+                return false;
+            } catch (QueryException $e) {
+                return false;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get all the shares for the current user
+     *
+     * @param Node|null $path
+     * @param boolean $reshares
+     * @return IShare[]
+     */
+    private function getAllShares(?Node $path = null, bool $reshares = false) {
+        // Get all shares
+        $userShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_USER, $path, $reshares, -1, 0);
+        $groupShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_GROUP, $path, $reshares, -1, 0);
+        $linkShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_LINK, $path, $reshares, -1, 0);
+
+        // EMAIL SHARES
+        $mailShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_EMAIL, $path, $reshares, -1, 0);
+
+        // CIRCLE SHARES
+        $circleShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_CIRCLE, $path, $reshares, -1, 0);
+
+        // TALK SHARES
+        $roomShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_ROOM, $path, $reshares, -1, 0);
+
+        $deckShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_DECK, $path, $reshares, -1, 0);
+
+        // FEDERATION
+        if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
+            $federatedShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_REMOTE, $path, $reshares, -1, 0);
+        } else {
+            $federatedShares = [];
+        }
+        if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
+            $federatedGroupShares = $this->shareManager->getSharesBy($this->currentUser, IShare::TYPE_REMOTE_GROUP, $path, $reshares, -1, 0);
+        } else {
+            $federatedGroupShares = [];
+        }
+
+        return array_merge($userShares, $groupShares, $linkShares, $mailShares, $circleShares, $roomShares, $deckShares, $federatedShares, $federatedGroupShares);
+    }
+
+
+    /**
+     * merging already formatted shares.
+     * We'll make an associative array to easily detect duplicate Ids.
+     * Keys _needs_ to be removed after all shares are retrieved and merged.
+     *
+     * @param array $shares
+     * @param array $newShares
+     */
+    private function mergeFormattedShares(array &$shares, array $newShares) {
+        foreach ($newShares as $newShare) {
+            if (!array_key_exists($newShare['id'], $shares)) {
+                $shares[$newShare['id']] = $newShare;
+            }
+        }
+    }
 }

apps/encryption/lib/Controller/SettingsController.php

Indentation +123 added lines, -123 removed lines

@@ -38,128 +38,128 @@
 
 class SettingsController extends Controller {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var KeyManager */
-	private $keyManager;
-
-	/** @var Crypt */
-	private $crypt;
-
-	/** @var Session */
-	private $session;
-
-	/** @var ISession  */
-	private $ocSession;
-
-	/** @var  Util */
-	private $util;
-
-	/**
-	 * @param string $AppName
-	 * @param IRequest $request
-	 * @param IL10N $l10n
-	 * @param IUserManager $userManager
-	 * @param IUserSession $userSession
-	 * @param KeyManager $keyManager
-	 * @param Crypt $crypt
-	 * @param Session $session
-	 * @param ISession $ocSession
-	 * @param Util $util
-	 */
-	public function __construct($AppName,
-								IRequest $request,
-								IL10N $l10n,
-								IUserManager $userManager,
-								IUserSession $userSession,
-								KeyManager $keyManager,
-								Crypt $crypt,
-								Session $session,
-								ISession $ocSession,
-								Util $util
+    /** @var IL10N */
+    private $l;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var KeyManager */
+    private $keyManager;
+
+    /** @var Crypt */
+    private $crypt;
+
+    /** @var Session */
+    private $session;
+
+    /** @var ISession  */
+    private $ocSession;
+
+    /** @var  Util */
+    private $util;
+
+    /**
+     * @param string $AppName
+     * @param IRequest $request
+     * @param IL10N $l10n
+     * @param IUserManager $userManager
+     * @param IUserSession $userSession
+     * @param KeyManager $keyManager
+     * @param Crypt $crypt
+     * @param Session $session
+     * @param ISession $ocSession
+     * @param Util $util
+     */
+    public function __construct($AppName,
+                                IRequest $request,
+                                IL10N $l10n,
+                                IUserManager $userManager,
+                                IUserSession $userSession,
+                                KeyManager $keyManager,
+                                Crypt $crypt,
+                                Session $session,
+                                ISession $ocSession,
+                                Util $util
 ) {
-		parent::__construct($AppName, $request);
-		$this->l = $l10n;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-		$this->keyManager = $keyManager;
-		$this->crypt = $crypt;
-		$this->session = $session;
-		$this->ocSession = $ocSession;
-		$this->util = $util;
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 * @UseSession
-	 *
-	 * @param string $oldPassword
-	 * @param string $newPassword
-	 * @return DataResponse
-	 */
-	public function updatePrivateKeyPassword($oldPassword, $newPassword) {
-		$result = false;
-		$uid = $this->userSession->getUser()->getUID();
-		$errorMessage = $this->l->t('Could not update the private key password.');
-
-		//check if password is correct
-		$passwordCorrect = $this->userManager->checkPassword($uid, $newPassword);
-		if ($passwordCorrect === false) {
-			// if check with uid fails we need to check the password with the login name
-			// e.g. in the ldap case. For local user we need to check the password with
-			// the uid because in this case the login name is case insensitive
-			$loginName = $this->ocSession->get('loginname');
-			$passwordCorrect = $this->userManager->checkPassword($loginName, $newPassword);
-		}
-
-		if ($passwordCorrect !== false) {
-			$encryptedKey = $this->keyManager->getPrivateKey($uid);
-			$decryptedKey = $this->crypt->decryptPrivateKey($encryptedKey, $oldPassword, $uid);
-
-			if ($decryptedKey) {
-				$encryptedKey = $this->crypt->encryptPrivateKey($decryptedKey, $newPassword, $uid);
-				$header = $this->crypt->generateHeader();
-				if ($encryptedKey) {
-					$this->keyManager->setPrivateKey($uid, $header . $encryptedKey);
-					$this->session->setPrivateKey($decryptedKey);
-					$result = true;
-				}
-			} else {
-				$errorMessage = $this->l->t('The old password was not correct, please try again.');
-			}
-		} else {
-			$errorMessage = $this->l->t('The current log-in password was not correct, please try again.');
-		}
-
-		if ($result === true) {
-			$this->session->setStatus(Session::INIT_SUCCESSFUL);
-			return new DataResponse(
-				['message' => $this->l->t('Private key password successfully updated.')]
-			);
-		} else {
-			return new DataResponse(
-				['message' => $errorMessage],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
-	}
-
-	/**
-	 * @UseSession
-	 *
-	 * @param bool $encryptHomeStorage
-	 * @return DataResponse
-	 */
-	public function setEncryptHomeStorage($encryptHomeStorage) {
-		$this->util->setEncryptHomeStorage($encryptHomeStorage);
-		return new DataResponse();
-	}
+        parent::__construct($AppName, $request);
+        $this->l = $l10n;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+        $this->keyManager = $keyManager;
+        $this->crypt = $crypt;
+        $this->session = $session;
+        $this->ocSession = $ocSession;
+        $this->util = $util;
+    }
+
+
+    /**
+     * @NoAdminRequired
+     * @UseSession
+     *
+     * @param string $oldPassword
+     * @param string $newPassword
+     * @return DataResponse
+     */
+    public function updatePrivateKeyPassword($oldPassword, $newPassword) {
+        $result = false;
+        $uid = $this->userSession->getUser()->getUID();
+        $errorMessage = $this->l->t('Could not update the private key password.');
+
+        //check if password is correct
+        $passwordCorrect = $this->userManager->checkPassword($uid, $newPassword);
+        if ($passwordCorrect === false) {
+            // if check with uid fails we need to check the password with the login name
+            // e.g. in the ldap case. For local user we need to check the password with
+            // the uid because in this case the login name is case insensitive
+            $loginName = $this->ocSession->get('loginname');
+            $passwordCorrect = $this->userManager->checkPassword($loginName, $newPassword);
+        }
+
+        if ($passwordCorrect !== false) {
+            $encryptedKey = $this->keyManager->getPrivateKey($uid);
+            $decryptedKey = $this->crypt->decryptPrivateKey($encryptedKey, $oldPassword, $uid);
+
+            if ($decryptedKey) {
+                $encryptedKey = $this->crypt->encryptPrivateKey($decryptedKey, $newPassword, $uid);
+                $header = $this->crypt->generateHeader();
+                if ($encryptedKey) {
+                    $this->keyManager->setPrivateKey($uid, $header . $encryptedKey);
+                    $this->session->setPrivateKey($decryptedKey);
+                    $result = true;
+                }
+            } else {
+                $errorMessage = $this->l->t('The old password was not correct, please try again.');
+            }
+        } else {
+            $errorMessage = $this->l->t('The current log-in password was not correct, please try again.');
+        }
+
+        if ($result === true) {
+            $this->session->setStatus(Session::INIT_SUCCESSFUL);
+            return new DataResponse(
+                ['message' => $this->l->t('Private key password successfully updated.')]
+            );
+        } else {
+            return new DataResponse(
+                ['message' => $errorMessage],
+                Http::STATUS_BAD_REQUEST
+            );
+        }
+    }
+
+    /**
+     * @UseSession
+     *
+     * @param bool $encryptHomeStorage
+     * @return DataResponse
+     */
+    public function setEncryptHomeStorage($encryptHomeStorage) {
+        $this->util->setEncryptHomeStorage($encryptHomeStorage);
+        return new DataResponse();
+    }
 }

apps/encryption/lib/Controller/StatusController.php

Indentation +62 added lines, -62 removed lines

@@ -35,71 +35,71 @@
 
 class StatusController extends Controller {
 
-	/** @var IL10N */
-	private $l;
+    /** @var IL10N */
+    private $l;
 
-	/** @var Session */
-	private $session;
+    /** @var Session */
+    private $session;
 
-	/** @var IManager */
-	private $encryptionManager;
+    /** @var IManager */
+    private $encryptionManager;
 
-	/**
-	 * @param string $AppName
-	 * @param IRequest $request
-	 * @param IL10N $l10n
-	 * @param Session $session
-	 * @param IManager $encryptionManager
-	 */
-	public function __construct($AppName,
-								IRequest $request,
-								IL10N $l10n,
-								Session $session,
-								IManager $encryptionManager
-								) {
-		parent::__construct($AppName, $request);
-		$this->l = $l10n;
-		$this->session = $session;
-		$this->encryptionManager = $encryptionManager;
-	}
+    /**
+     * @param string $AppName
+     * @param IRequest $request
+     * @param IL10N $l10n
+     * @param Session $session
+     * @param IManager $encryptionManager
+     */
+    public function __construct($AppName,
+                                IRequest $request,
+                                IL10N $l10n,
+                                Session $session,
+                                IManager $encryptionManager
+                                ) {
+        parent::__construct($AppName, $request);
+        $this->l = $l10n;
+        $this->session = $session;
+        $this->encryptionManager = $encryptionManager;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @return DataResponse
-	 */
-	public function getStatus() {
-		$status = 'error';
-		$message = 'no valid init status';
-		switch ($this->session->getStatus()) {
-			case Session::INIT_EXECUTED:
-				$status = 'interactionNeeded';
-				$message = $this->l->t(
-					'Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files.'
-				);
-				break;
-			case Session::NOT_INITIALIZED:
-				$status = 'interactionNeeded';
-				if ($this->encryptionManager->isEnabled()) {
-					$message = $this->l->t(
-						'Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.'
-					);
-				} else {
-					$message = $this->l->t(
-						'Please enable server side encryption in the admin settings in order to use the encryption module.'
-					);
-				}
-				break;
-			case Session::INIT_SUCCESSFUL:
-				$status = 'success';
-				$message = $this->l->t('Encryption app is enabled and ready');
-		}
+    /**
+     * @NoAdminRequired
+     * @return DataResponse
+     */
+    public function getStatus() {
+        $status = 'error';
+        $message = 'no valid init status';
+        switch ($this->session->getStatus()) {
+            case Session::INIT_EXECUTED:
+                $status = 'interactionNeeded';
+                $message = $this->l->t(
+                    'Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files.'
+                );
+                break;
+            case Session::NOT_INITIALIZED:
+                $status = 'interactionNeeded';
+                if ($this->encryptionManager->isEnabled()) {
+                    $message = $this->l->t(
+                        'Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.'
+                    );
+                } else {
+                    $message = $this->l->t(
+                        'Please enable server side encryption in the admin settings in order to use the encryption module.'
+                    );
+                }
+                break;
+            case Session::INIT_SUCCESSFUL:
+                $status = 'success';
+                $message = $this->l->t('Encryption app is enabled and ready');
+        }
 
-		return new DataResponse(
-			[
-				'status' => $status,
-				'data' => [
-					'message' => $message]
-			]
-		);
-	}
+        return new DataResponse(
+            [
+                'status' => $status,
+                'data' => [
+                    'message' => $message]
+            ]
+        );
+    }
 }

apps/encryption/lib/Controller/RecoveryController.php

Indentation +153 added lines, -153 removed lines

@@ -35,157 +35,157 @@
 use OCP\IRequest;
 
 class RecoveryController extends Controller {
-	/**
-	 * @var IConfig
-	 */
-	private $config;
-	/**
-	 * @var IL10N
-	 */
-	private $l;
-	/**
-	 * @var Recovery
-	 */
-	private $recovery;
-
-	/**
-	 * @param string $AppName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IL10N $l10n
-	 * @param Recovery $recovery
-	 */
-	public function __construct($AppName,
-								IRequest $request,
-								IConfig $config,
-								IL10N $l10n,
-								Recovery $recovery) {
-		parent::__construct($AppName, $request);
-		$this->config = $config;
-		$this->l = $l10n;
-		$this->recovery = $recovery;
-	}
-
-	/**
-	 * @param string $recoveryPassword
-	 * @param string $confirmPassword
-	 * @param string $adminEnableRecovery
-	 * @return DataResponse
-	 */
-	public function adminRecovery($recoveryPassword, $confirmPassword, $adminEnableRecovery) {
-		// Check if both passwords are the same
-		if (empty($recoveryPassword)) {
-			$errorMessage = $this->l->t('Missing recovery key password');
-			return new DataResponse(['data' => ['message' => $errorMessage]],
-				Http::STATUS_BAD_REQUEST);
-		}
-
-		if (empty($confirmPassword)) {
-			$errorMessage = $this->l->t('Please repeat the recovery key password');
-			return new DataResponse(['data' => ['message' => $errorMessage]],
-				Http::STATUS_BAD_REQUEST);
-		}
-
-		if ($recoveryPassword !== $confirmPassword) {
-			$errorMessage = $this->l->t('Repeated recovery key password does not match the provided recovery key password');
-			return new DataResponse(['data' => ['message' => $errorMessage]],
-				Http::STATUS_BAD_REQUEST);
-		}
-
-		if (isset($adminEnableRecovery) && $adminEnableRecovery === '1') {
-			if ($this->recovery->enableAdminRecovery($recoveryPassword)) {
-				return new DataResponse(['data' => ['message' => $this->l->t('Recovery key successfully enabled')]]);
-			}
-			return new DataResponse(['data' => ['message' => $this->l->t('Could not enable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
-		} elseif (isset($adminEnableRecovery) && $adminEnableRecovery === '0') {
-			if ($this->recovery->disableAdminRecovery($recoveryPassword)) {
-				return new DataResponse(['data' => ['message' => $this->l->t('Recovery key successfully disabled')]]);
-			}
-			return new DataResponse(['data' => ['message' => $this->l->t('Could not disable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
-		}
-		// this response should never be sent but just in case.
-		return new DataResponse(['data' => ['message' => $this->l->t('Missing parameters')]], Http::STATUS_BAD_REQUEST);
-	}
-
-	/**
-	 * @param string $newPassword
-	 * @param string $oldPassword
-	 * @param string $confirmPassword
-	 * @return DataResponse
-	 */
-	public function changeRecoveryPassword($newPassword, $oldPassword, $confirmPassword) {
-		//check if both passwords are the same
-		if (empty($oldPassword)) {
-			$errorMessage = $this->l->t('Please provide the old recovery password');
-			return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
-		}
-
-		if (empty($newPassword)) {
-			$errorMessage = $this->l->t('Please provide a new recovery password');
-			return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
-		}
-
-		if (empty($confirmPassword)) {
-			$errorMessage = $this->l->t('Please repeat the new recovery password');
-			return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
-		}
-
-		if ($newPassword !== $confirmPassword) {
-			$errorMessage = $this->l->t('Repeated recovery key password does not match the provided recovery key password');
-			return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
-		}
-
-		$result = $this->recovery->changeRecoveryKeyPassword($newPassword,
-			$oldPassword);
-
-		if ($result) {
-			return new DataResponse(
-				[
-					'data' => [
-						'message' => $this->l->t('Password successfully changed.')]
-				]
-			);
-		}
-		return new DataResponse(
-			[
-				'data' => [
-					'message' => $this->l->t('Could not change the password. Maybe the old password was not correct.')
-				]
-			], Http::STATUS_BAD_REQUEST);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $userEnableRecovery
-	 * @return DataResponse
-	 */
-	public function userSetRecovery($userEnableRecovery) {
-		if ($userEnableRecovery === '0' || $userEnableRecovery === '1') {
-			$result = $this->recovery->setRecoveryForUser($userEnableRecovery);
-
-			if ($result) {
-				if ($userEnableRecovery === '0') {
-					return new DataResponse(
-						[
-							'data' => [
-								'message' => $this->l->t('Recovery Key disabled')]
-						]
-					);
-				}
-				return new DataResponse(
-					[
-						'data' => [
-							'message' => $this->l->t('Recovery Key enabled')]
-					]
-				);
-			}
-		}
-		return new DataResponse(
-			[
-				'data' => [
-					'message' => $this->l->t('Could not enable the recovery key, please try again or contact your administrator')
-				]
-			], Http::STATUS_BAD_REQUEST);
-	}
+    /**
+     * @var IConfig
+     */
+    private $config;
+    /**
+     * @var IL10N
+     */
+    private $l;
+    /**
+     * @var Recovery
+     */
+    private $recovery;
+
+    /**
+     * @param string $AppName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IL10N $l10n
+     * @param Recovery $recovery
+     */
+    public function __construct($AppName,
+                                IRequest $request,
+                                IConfig $config,
+                                IL10N $l10n,
+                                Recovery $recovery) {
+        parent::__construct($AppName, $request);
+        $this->config = $config;
+        $this->l = $l10n;
+        $this->recovery = $recovery;
+    }
+
+    /**
+     * @param string $recoveryPassword
+     * @param string $confirmPassword
+     * @param string $adminEnableRecovery
+     * @return DataResponse
+     */
+    public function adminRecovery($recoveryPassword, $confirmPassword, $adminEnableRecovery) {
+        // Check if both passwords are the same
+        if (empty($recoveryPassword)) {
+            $errorMessage = $this->l->t('Missing recovery key password');
+            return new DataResponse(['data' => ['message' => $errorMessage]],
+                Http::STATUS_BAD_REQUEST);
+        }
+
+        if (empty($confirmPassword)) {
+            $errorMessage = $this->l->t('Please repeat the recovery key password');
+            return new DataResponse(['data' => ['message' => $errorMessage]],
+                Http::STATUS_BAD_REQUEST);
+        }
+
+        if ($recoveryPassword !== $confirmPassword) {
+            $errorMessage = $this->l->t('Repeated recovery key password does not match the provided recovery key password');
+            return new DataResponse(['data' => ['message' => $errorMessage]],
+                Http::STATUS_BAD_REQUEST);
+        }
+
+        if (isset($adminEnableRecovery) && $adminEnableRecovery === '1') {
+            if ($this->recovery->enableAdminRecovery($recoveryPassword)) {
+                return new DataResponse(['data' => ['message' => $this->l->t('Recovery key successfully enabled')]]);
+            }
+            return new DataResponse(['data' => ['message' => $this->l->t('Could not enable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
+        } elseif (isset($adminEnableRecovery) && $adminEnableRecovery === '0') {
+            if ($this->recovery->disableAdminRecovery($recoveryPassword)) {
+                return new DataResponse(['data' => ['message' => $this->l->t('Recovery key successfully disabled')]]);
+            }
+            return new DataResponse(['data' => ['message' => $this->l->t('Could not disable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
+        }
+        // this response should never be sent but just in case.
+        return new DataResponse(['data' => ['message' => $this->l->t('Missing parameters')]], Http::STATUS_BAD_REQUEST);
+    }
+
+    /**
+     * @param string $newPassword
+     * @param string $oldPassword
+     * @param string $confirmPassword
+     * @return DataResponse
+     */
+    public function changeRecoveryPassword($newPassword, $oldPassword, $confirmPassword) {
+        //check if both passwords are the same
+        if (empty($oldPassword)) {
+            $errorMessage = $this->l->t('Please provide the old recovery password');
+            return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
+        }
+
+        if (empty($newPassword)) {
+            $errorMessage = $this->l->t('Please provide a new recovery password');
+            return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
+        }
+
+        if (empty($confirmPassword)) {
+            $errorMessage = $this->l->t('Please repeat the new recovery password');
+            return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
+        }
+
+        if ($newPassword !== $confirmPassword) {
+            $errorMessage = $this->l->t('Repeated recovery key password does not match the provided recovery key password');
+            return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
+        }
+
+        $result = $this->recovery->changeRecoveryKeyPassword($newPassword,
+            $oldPassword);
+
+        if ($result) {
+            return new DataResponse(
+                [
+                    'data' => [
+                        'message' => $this->l->t('Password successfully changed.')]
+                ]
+            );
+        }
+        return new DataResponse(
+            [
+                'data' => [
+                    'message' => $this->l->t('Could not change the password. Maybe the old password was not correct.')
+                ]
+            ], Http::STATUS_BAD_REQUEST);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $userEnableRecovery
+     * @return DataResponse
+     */
+    public function userSetRecovery($userEnableRecovery) {
+        if ($userEnableRecovery === '0' || $userEnableRecovery === '1') {
+            $result = $this->recovery->setRecoveryForUser($userEnableRecovery);
+
+            if ($result) {
+                if ($userEnableRecovery === '0') {
+                    return new DataResponse(
+                        [
+                            'data' => [
+                                'message' => $this->l->t('Recovery Key disabled')]
+                        ]
+                    );
+                }
+                return new DataResponse(
+                    [
+                        'data' => [
+                            'message' => $this->l->t('Recovery Key enabled')]
+                    ]
+                );
+            }
+        }
+        return new DataResponse(
+            [
+                'data' => [
+                    'message' => $this->l->t('Could not enable the recovery key, please try again or contact your administrator')
+                ]
+            ], Http::STATUS_BAD_REQUEST);
+    }
 }

apps/encryption/lib/Crypto/EncryptAll.php

Indentation +430 added lines, -430 removed lines

@@ -47,434 +47,434 @@
 
 class EncryptAll {
 
-	/** @var Setup */
-	protected $userSetup;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var View */
-	protected $rootView;
-
-	/** @var KeyManager */
-	protected $keyManager;
-
-	/** @var Util */
-	protected $util;
-
-	/** @var array  */
-	protected $userPasswords;
-
-	/** @var  IConfig */
-	protected $config;
-
-	/** @var IMailer */
-	protected $mailer;
-
-	/** @var  IL10N */
-	protected $l;
-
-	/** @var  QuestionHelper */
-	protected $questionHelper;
-
-	/** @var  OutputInterface */
-	protected $output;
-
-	/** @var  InputInterface */
-	protected $input;
-
-	/** @var ISecureRandom */
-	protected $secureRandom;
-
-	/**
-	 * @param Setup $userSetup
-	 * @param IUserManager $userManager
-	 * @param View $rootView
-	 * @param KeyManager $keyManager
-	 * @param Util $util
-	 * @param IConfig $config
-	 * @param IMailer $mailer
-	 * @param IL10N $l
-	 * @param QuestionHelper $questionHelper
-	 * @param ISecureRandom $secureRandom
-	 */
-	public function __construct(
-		Setup $userSetup,
-		IUserManager $userManager,
-		View $rootView,
-		KeyManager $keyManager,
-		Util $util,
-		IConfig $config,
-		IMailer $mailer,
-		IL10N $l,
-		QuestionHelper $questionHelper,
-		ISecureRandom $secureRandom
-	) {
-		$this->userSetup = $userSetup;
-		$this->userManager = $userManager;
-		$this->rootView = $rootView;
-		$this->keyManager = $keyManager;
-		$this->util = $util;
-		$this->config = $config;
-		$this->mailer = $mailer;
-		$this->l = $l;
-		$this->questionHelper = $questionHelper;
-		$this->secureRandom = $secureRandom;
-		// store one time passwords for the users
-		$this->userPasswords = [];
-	}
-
-	/**
-	 * start to encrypt all files
-	 *
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	public function encryptAll(InputInterface $input, OutputInterface $output) {
-		$this->input = $input;
-		$this->output = $output;
-
-		$headline = 'Encrypt all files with the ' . Encryption::DISPLAY_NAME;
-		$this->output->writeln("\n");
-		$this->output->writeln($headline);
-		$this->output->writeln(str_pad('', strlen($headline), '='));
-		$this->output->writeln("\n");
-
-		if ($this->util->isMasterKeyEnabled()) {
-			$this->output->writeln('Use master key to encrypt all files.');
-			$this->keyManager->validateMasterKey();
-		} else {
-			//create private/public keys for each user and store the private key password
-			$this->output->writeln('Create key-pair for every user');
-			$this->output->writeln('------------------------------');
-			$this->output->writeln('');
-			$this->output->writeln('This module will encrypt all files in the users files folder initially.');
-			$this->output->writeln('Already existing versions and files in the trash bin will not be encrypted.');
-			$this->output->writeln('');
-			$this->createKeyPairs();
-		}
-
-
-		// output generated encryption key passwords
-		if ($this->util->isMasterKeyEnabled() === false) {
-			//send-out or display password list and write it to a file
-			$this->output->writeln("\n");
-			$this->output->writeln('Generated encryption key passwords');
-			$this->output->writeln('----------------------------------');
-			$this->output->writeln('');
-			$this->outputPasswords();
-		}
-
-		//setup users file system and encrypt all files one by one (take should encrypt setting of storage into account)
-		$this->output->writeln("\n");
-		$this->output->writeln('Start to encrypt users files');
-		$this->output->writeln('----------------------------');
-		$this->output->writeln('');
-		$this->encryptAllUsersFiles();
-		$this->output->writeln("\n");
-	}
-
-	/**
-	 * create key-pair for every user
-	 */
-	protected function createKeyPairs() {
-		$this->output->writeln("\n");
-		$progress = new ProgressBar($this->output);
-		$progress->setFormat(" %message% \n [%bar%]");
-		$progress->start();
-
-		foreach ($this->userManager->getBackends() as $backend) {
-			$limit = 500;
-			$offset = 0;
-			do {
-				$users = $backend->getUsers('', $limit, $offset);
-				foreach ($users as $user) {
-					if ($this->keyManager->userHasKeys($user) === false) {
-						$progress->setMessage('Create key-pair for ' . $user);
-						$progress->advance();
-						$this->setupUserFS($user);
-						$password = $this->generateOneTimePassword($user);
-						$this->userSetup->setupUser($user, $password);
-					} else {
-						// users which already have a key-pair will be stored with a
-						// empty password and filtered out later
-						$this->userPasswords[$user] = '';
-					}
-				}
-				$offset += $limit;
-			} while (count($users) >= $limit);
-		}
-
-		$progress->setMessage('Key-pair created for all users');
-		$progress->finish();
-	}
-
-	/**
-	 * iterate over all user and encrypt their files
-	 */
-	protected function encryptAllUsersFiles() {
-		$this->output->writeln("\n");
-		$progress = new ProgressBar($this->output);
-		$progress->setFormat(" %message% \n [%bar%]");
-		$progress->start();
-		$numberOfUsers = count($this->userPasswords);
-		$userNo = 1;
-		if ($this->util->isMasterKeyEnabled()) {
-			$this->encryptAllUserFilesWithMasterKey($progress);
-		} else {
-			foreach ($this->userPasswords as $uid => $password) {
-				$userCount = "$uid ($userNo of $numberOfUsers)";
-				$this->encryptUsersFiles($uid, $progress, $userCount);
-				$userNo++;
-			}
-		}
-		$progress->setMessage("all files encrypted");
-		$progress->finish();
-	}
-
-	/**
-	 * encrypt all user files with the master key
-	 *
-	 * @param ProgressBar $progress
-	 */
-	protected function encryptAllUserFilesWithMasterKey(ProgressBar $progress) {
-		$userNo = 1;
-		foreach ($this->userManager->getBackends() as $backend) {
-			$limit = 500;
-			$offset = 0;
-			do {
-				$users = $backend->getUsers('', $limit, $offset);
-				foreach ($users as $user) {
-					$userCount = "$user ($userNo)";
-					$this->encryptUsersFiles($user, $progress, $userCount);
-					$userNo++;
-				}
-				$offset += $limit;
-			} while (count($users) >= $limit);
-		}
-	}
-
-	/**
-	 * encrypt files from the given user
-	 *
-	 * @param string $uid
-	 * @param ProgressBar $progress
-	 * @param string $userCount
-	 */
-	protected function encryptUsersFiles($uid, ProgressBar $progress, $userCount) {
-		$this->setupUserFS($uid);
-		$directories = [];
-		$directories[] = '/' . $uid . '/files';
-
-		while ($root = array_pop($directories)) {
-			$content = $this->rootView->getDirectoryContent($root);
-			foreach ($content as $file) {
-				$path = $root . '/' . $file['name'];
-				if ($this->rootView->is_dir($path)) {
-					$directories[] = $path;
-					continue;
-				} else {
-					$progress->setMessage("encrypt files for user $userCount: $path");
-					$progress->advance();
-					if ($this->encryptFile($path) === false) {
-						$progress->setMessage("encrypt files for user $userCount: $path (already encrypted)");
-						$progress->advance();
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * encrypt file
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	protected function encryptFile($path) {
-
-		// skip already encrypted files
-		$fileInfo = $this->rootView->getFileInfo($path);
-		if ($fileInfo !== false && $fileInfo->isEncrypted()) {
-			return true;
-		}
-
-		$source = $path;
-		$target = $path . '.encrypted.' . time();
-
-		try {
-			$this->rootView->copy($source, $target);
-			$this->rootView->rename($target, $source);
-		} catch (DecryptionFailedException $e) {
-			if ($this->rootView->file_exists($target)) {
-				$this->rootView->unlink($target);
-			}
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * output one-time encryption passwords
-	 */
-	protected function outputPasswords() {
-		$table = new Table($this->output);
-		$table->setHeaders(['Username', 'Private key password']);
-
-		//create rows
-		$newPasswords = [];
-		$unchangedPasswords = [];
-		foreach ($this->userPasswords as $uid => $password) {
-			if (empty($password)) {
-				$unchangedPasswords[] = $uid;
-			} else {
-				$newPasswords[] = [$uid, $password];
-			}
-		}
-
-		if (empty($newPasswords)) {
-			$this->output->writeln("\nAll users already had a key-pair, no further action needed.\n");
-			return;
-		}
-
-		$table->setRows($newPasswords);
-		$table->render();
-
-		if (!empty($unchangedPasswords)) {
-			$this->output->writeln("\nThe following users already had a key-pair which was reused without setting a new password:\n");
-			foreach ($unchangedPasswords as $uid) {
-				$this->output->writeln("    $uid");
-			}
-		}
-
-		$this->writePasswordsToFile($newPasswords);
-
-		$this->output->writeln('');
-		$question = new ConfirmationQuestion('Do you want to send the passwords directly to the users by mail? (y/n) ', false);
-		if ($this->questionHelper->ask($this->input, $this->output, $question)) {
-			$this->sendPasswordsByMail();
-		}
-	}
-
-	/**
-	 * write one-time encryption passwords to a csv file
-	 *
-	 * @param array $passwords
-	 */
-	protected function writePasswordsToFile(array $passwords) {
-		$fp = $this->rootView->fopen('oneTimeEncryptionPasswords.csv', 'w');
-		foreach ($passwords as $pwd) {
-			fputcsv($fp, $pwd);
-		}
-		fclose($fp);
-		$this->output->writeln("\n");
-		$this->output->writeln('A list of all newly created passwords was written to data/oneTimeEncryptionPasswords.csv');
-		$this->output->writeln('');
-		$this->output->writeln('Each of these users need to login to the web interface, go to the');
-		$this->output->writeln('personal settings section "basic encryption module" and');
-		$this->output->writeln('update the private key password to match the login password again by');
-		$this->output->writeln('entering the one-time password into the "old log-in password" field');
-		$this->output->writeln('and their current login password');
-	}
-
-	/**
-	 * setup user file system
-	 *
-	 * @param string $uid
-	 */
-	protected function setupUserFS($uid) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($uid);
-	}
-
-	/**
-	 * generate one time password for the user and store it in a array
-	 *
-	 * @param string $uid
-	 * @return string password
-	 */
-	protected function generateOneTimePassword($uid) {
-		$password = $this->secureRandom->generate(8);
-		$this->userPasswords[$uid] = $password;
-		return $password;
-	}
-
-	/**
-	 * send encryption key passwords to the users by mail
-	 */
-	protected function sendPasswordsByMail() {
-		$noMail = [];
-
-		$this->output->writeln('');
-		$progress = new ProgressBar($this->output, count($this->userPasswords));
-		$progress->start();
-
-		foreach ($this->userPasswords as $uid => $password) {
-			$progress->advance();
-			if (!empty($password)) {
-				$recipient = $this->userManager->get($uid);
-				$recipientDisplayName = $recipient->getDisplayName();
-				$to = $recipient->getEMailAddress();
-
-				if ($to === '') {
-					$noMail[] = $uid;
-					continue;
-				}
-
-				$subject = $this->l->t('one-time password for server-side-encryption');
-				list($htmlBody, $textBody) = $this->createMailBody($password);
-
-				// send it out now
-				try {
-					$message = $this->mailer->createMessage();
-					$message->setSubject($subject);
-					$message->setTo([$to => $recipientDisplayName]);
-					$message->setHtmlBody($htmlBody);
-					$message->setPlainBody($textBody);
-					$message->setFrom([
-						\OCP\Util::getDefaultEmailAddress('admin-noreply')
-					]);
-
-					$this->mailer->send($message);
-				} catch (\Exception $e) {
-					$noMail[] = $uid;
-				}
-			}
-		}
-
-		$progress->finish();
-
-		if (empty($noMail)) {
-			$this->output->writeln("\n\nPassword successfully send to all users");
-		} else {
-			$table = new Table($this->output);
-			$table->setHeaders(['Username', 'Private key password']);
-			$this->output->writeln("\n\nCould not send password to following users:\n");
-			$rows = [];
-			foreach ($noMail as $uid) {
-				$rows[] = [$uid, $this->userPasswords[$uid]];
-			}
-			$table->setRows($rows);
-			$table->render();
-		}
-	}
-
-	/**
-	 * create mail body for plain text and html mail
-	 *
-	 * @param string $password one-time encryption password
-	 * @return array an array of the html mail body and the plain text mail body
-	 */
-	protected function createMailBody($password) {
-		$html = new \OC_Template("encryption", "mail", "");
-		$html->assign('password', $password);
-		$htmlMail = $html->fetchPage();
-
-		$plainText = new \OC_Template("encryption", "altmail", "");
-		$plainText->assign('password', $password);
-		$plainTextMail = $plainText->fetchPage();
-
-		return [$htmlMail, $plainTextMail];
-	}
+    /** @var Setup */
+    protected $userSetup;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var View */
+    protected $rootView;
+
+    /** @var KeyManager */
+    protected $keyManager;
+
+    /** @var Util */
+    protected $util;
+
+    /** @var array  */
+    protected $userPasswords;
+
+    /** @var  IConfig */
+    protected $config;
+
+    /** @var IMailer */
+    protected $mailer;
+
+    /** @var  IL10N */
+    protected $l;
+
+    /** @var  QuestionHelper */
+    protected $questionHelper;
+
+    /** @var  OutputInterface */
+    protected $output;
+
+    /** @var  InputInterface */
+    protected $input;
+
+    /** @var ISecureRandom */
+    protected $secureRandom;
+
+    /**
+     * @param Setup $userSetup
+     * @param IUserManager $userManager
+     * @param View $rootView
+     * @param KeyManager $keyManager
+     * @param Util $util
+     * @param IConfig $config
+     * @param IMailer $mailer
+     * @param IL10N $l
+     * @param QuestionHelper $questionHelper
+     * @param ISecureRandom $secureRandom
+     */
+    public function __construct(
+        Setup $userSetup,
+        IUserManager $userManager,
+        View $rootView,
+        KeyManager $keyManager,
+        Util $util,
+        IConfig $config,
+        IMailer $mailer,
+        IL10N $l,
+        QuestionHelper $questionHelper,
+        ISecureRandom $secureRandom
+    ) {
+        $this->userSetup = $userSetup;
+        $this->userManager = $userManager;
+        $this->rootView = $rootView;
+        $this->keyManager = $keyManager;
+        $this->util = $util;
+        $this->config = $config;
+        $this->mailer = $mailer;
+        $this->l = $l;
+        $this->questionHelper = $questionHelper;
+        $this->secureRandom = $secureRandom;
+        // store one time passwords for the users
+        $this->userPasswords = [];
+    }
+
+    /**
+     * start to encrypt all files
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    public function encryptAll(InputInterface $input, OutputInterface $output) {
+        $this->input = $input;
+        $this->output = $output;
+
+        $headline = 'Encrypt all files with the ' . Encryption::DISPLAY_NAME;
+        $this->output->writeln("\n");
+        $this->output->writeln($headline);
+        $this->output->writeln(str_pad('', strlen($headline), '='));
+        $this->output->writeln("\n");
+
+        if ($this->util->isMasterKeyEnabled()) {
+            $this->output->writeln('Use master key to encrypt all files.');
+            $this->keyManager->validateMasterKey();
+        } else {
+            //create private/public keys for each user and store the private key password
+            $this->output->writeln('Create key-pair for every user');
+            $this->output->writeln('------------------------------');
+            $this->output->writeln('');
+            $this->output->writeln('This module will encrypt all files in the users files folder initially.');
+            $this->output->writeln('Already existing versions and files in the trash bin will not be encrypted.');
+            $this->output->writeln('');
+            $this->createKeyPairs();
+        }
+
+
+        // output generated encryption key passwords
+        if ($this->util->isMasterKeyEnabled() === false) {
+            //send-out or display password list and write it to a file
+            $this->output->writeln("\n");
+            $this->output->writeln('Generated encryption key passwords');
+            $this->output->writeln('----------------------------------');
+            $this->output->writeln('');
+            $this->outputPasswords();
+        }
+
+        //setup users file system and encrypt all files one by one (take should encrypt setting of storage into account)
+        $this->output->writeln("\n");
+        $this->output->writeln('Start to encrypt users files');
+        $this->output->writeln('----------------------------');
+        $this->output->writeln('');
+        $this->encryptAllUsersFiles();
+        $this->output->writeln("\n");
+    }
+
+    /**
+     * create key-pair for every user
+     */
+    protected function createKeyPairs() {
+        $this->output->writeln("\n");
+        $progress = new ProgressBar($this->output);
+        $progress->setFormat(" %message% \n [%bar%]");
+        $progress->start();
+
+        foreach ($this->userManager->getBackends() as $backend) {
+            $limit = 500;
+            $offset = 0;
+            do {
+                $users = $backend->getUsers('', $limit, $offset);
+                foreach ($users as $user) {
+                    if ($this->keyManager->userHasKeys($user) === false) {
+                        $progress->setMessage('Create key-pair for ' . $user);
+                        $progress->advance();
+                        $this->setupUserFS($user);
+                        $password = $this->generateOneTimePassword($user);
+                        $this->userSetup->setupUser($user, $password);
+                    } else {
+                        // users which already have a key-pair will be stored with a
+                        // empty password and filtered out later
+                        $this->userPasswords[$user] = '';
+                    }
+                }
+                $offset += $limit;
+            } while (count($users) >= $limit);
+        }
+
+        $progress->setMessage('Key-pair created for all users');
+        $progress->finish();
+    }
+
+    /**
+     * iterate over all user and encrypt their files
+     */
+    protected function encryptAllUsersFiles() {
+        $this->output->writeln("\n");
+        $progress = new ProgressBar($this->output);
+        $progress->setFormat(" %message% \n [%bar%]");
+        $progress->start();
+        $numberOfUsers = count($this->userPasswords);
+        $userNo = 1;
+        if ($this->util->isMasterKeyEnabled()) {
+            $this->encryptAllUserFilesWithMasterKey($progress);
+        } else {
+            foreach ($this->userPasswords as $uid => $password) {
+                $userCount = "$uid ($userNo of $numberOfUsers)";
+                $this->encryptUsersFiles($uid, $progress, $userCount);
+                $userNo++;
+            }
+        }
+        $progress->setMessage("all files encrypted");
+        $progress->finish();
+    }
+
+    /**
+     * encrypt all user files with the master key
+     *
+     * @param ProgressBar $progress
+     */
+    protected function encryptAllUserFilesWithMasterKey(ProgressBar $progress) {
+        $userNo = 1;
+        foreach ($this->userManager->getBackends() as $backend) {
+            $limit = 500;
+            $offset = 0;
+            do {
+                $users = $backend->getUsers('', $limit, $offset);
+                foreach ($users as $user) {
+                    $userCount = "$user ($userNo)";
+                    $this->encryptUsersFiles($user, $progress, $userCount);
+                    $userNo++;
+                }
+                $offset += $limit;
+            } while (count($users) >= $limit);
+        }
+    }
+
+    /**
+     * encrypt files from the given user
+     *
+     * @param string $uid
+     * @param ProgressBar $progress
+     * @param string $userCount
+     */
+    protected function encryptUsersFiles($uid, ProgressBar $progress, $userCount) {
+        $this->setupUserFS($uid);
+        $directories = [];
+        $directories[] = '/' . $uid . '/files';
+
+        while ($root = array_pop($directories)) {
+            $content = $this->rootView->getDirectoryContent($root);
+            foreach ($content as $file) {
+                $path = $root . '/' . $file['name'];
+                if ($this->rootView->is_dir($path)) {
+                    $directories[] = $path;
+                    continue;
+                } else {
+                    $progress->setMessage("encrypt files for user $userCount: $path");
+                    $progress->advance();
+                    if ($this->encryptFile($path) === false) {
+                        $progress->setMessage("encrypt files for user $userCount: $path (already encrypted)");
+                        $progress->advance();
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * encrypt file
+     *
+     * @param string $path
+     * @return bool
+     */
+    protected function encryptFile($path) {
+
+        // skip already encrypted files
+        $fileInfo = $this->rootView->getFileInfo($path);
+        if ($fileInfo !== false && $fileInfo->isEncrypted()) {
+            return true;
+        }
+
+        $source = $path;
+        $target = $path . '.encrypted.' . time();
+
+        try {
+            $this->rootView->copy($source, $target);
+            $this->rootView->rename($target, $source);
+        } catch (DecryptionFailedException $e) {
+            if ($this->rootView->file_exists($target)) {
+                $this->rootView->unlink($target);
+            }
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * output one-time encryption passwords
+     */
+    protected function outputPasswords() {
+        $table = new Table($this->output);
+        $table->setHeaders(['Username', 'Private key password']);
+
+        //create rows
+        $newPasswords = [];
+        $unchangedPasswords = [];
+        foreach ($this->userPasswords as $uid => $password) {
+            if (empty($password)) {
+                $unchangedPasswords[] = $uid;
+            } else {
+                $newPasswords[] = [$uid, $password];
+            }
+        }
+
+        if (empty($newPasswords)) {
+            $this->output->writeln("\nAll users already had a key-pair, no further action needed.\n");
+            return;
+        }
+
+        $table->setRows($newPasswords);
+        $table->render();
+
+        if (!empty($unchangedPasswords)) {
+            $this->output->writeln("\nThe following users already had a key-pair which was reused without setting a new password:\n");
+            foreach ($unchangedPasswords as $uid) {
+                $this->output->writeln("    $uid");
+            }
+        }
+
+        $this->writePasswordsToFile($newPasswords);
+
+        $this->output->writeln('');
+        $question = new ConfirmationQuestion('Do you want to send the passwords directly to the users by mail? (y/n) ', false);
+        if ($this->questionHelper->ask($this->input, $this->output, $question)) {
+            $this->sendPasswordsByMail();
+        }
+    }
+
+    /**
+     * write one-time encryption passwords to a csv file
+     *
+     * @param array $passwords
+     */
+    protected function writePasswordsToFile(array $passwords) {
+        $fp = $this->rootView->fopen('oneTimeEncryptionPasswords.csv', 'w');
+        foreach ($passwords as $pwd) {
+            fputcsv($fp, $pwd);
+        }
+        fclose($fp);
+        $this->output->writeln("\n");
+        $this->output->writeln('A list of all newly created passwords was written to data/oneTimeEncryptionPasswords.csv');
+        $this->output->writeln('');
+        $this->output->writeln('Each of these users need to login to the web interface, go to the');
+        $this->output->writeln('personal settings section "basic encryption module" and');
+        $this->output->writeln('update the private key password to match the login password again by');
+        $this->output->writeln('entering the one-time password into the "old log-in password" field');
+        $this->output->writeln('and their current login password');
+    }
+
+    /**
+     * setup user file system
+     *
+     * @param string $uid
+     */
+    protected function setupUserFS($uid) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($uid);
+    }
+
+    /**
+     * generate one time password for the user and store it in a array
+     *
+     * @param string $uid
+     * @return string password
+     */
+    protected function generateOneTimePassword($uid) {
+        $password = $this->secureRandom->generate(8);
+        $this->userPasswords[$uid] = $password;
+        return $password;
+    }
+
+    /**
+     * send encryption key passwords to the users by mail
+     */
+    protected function sendPasswordsByMail() {
+        $noMail = [];
+
+        $this->output->writeln('');
+        $progress = new ProgressBar($this->output, count($this->userPasswords));
+        $progress->start();
+
+        foreach ($this->userPasswords as $uid => $password) {
+            $progress->advance();
+            if (!empty($password)) {
+                $recipient = $this->userManager->get($uid);
+                $recipientDisplayName = $recipient->getDisplayName();
+                $to = $recipient->getEMailAddress();
+
+                if ($to === '') {
+                    $noMail[] = $uid;
+                    continue;
+                }
+
+                $subject = $this->l->t('one-time password for server-side-encryption');
+                list($htmlBody, $textBody) = $this->createMailBody($password);
+
+                // send it out now
+                try {
+                    $message = $this->mailer->createMessage();
+                    $message->setSubject($subject);
+                    $message->setTo([$to => $recipientDisplayName]);
+                    $message->setHtmlBody($htmlBody);
+                    $message->setPlainBody($textBody);
+                    $message->setFrom([
+                        \OCP\Util::getDefaultEmailAddress('admin-noreply')
+                    ]);
+
+                    $this->mailer->send($message);
+                } catch (\Exception $e) {
+                    $noMail[] = $uid;
+                }
+            }
+        }
+
+        $progress->finish();
+
+        if (empty($noMail)) {
+            $this->output->writeln("\n\nPassword successfully send to all users");
+        } else {
+            $table = new Table($this->output);
+            $table->setHeaders(['Username', 'Private key password']);
+            $this->output->writeln("\n\nCould not send password to following users:\n");
+            $rows = [];
+            foreach ($noMail as $uid) {
+                $rows[] = [$uid, $this->userPasswords[$uid]];
+            }
+            $table->setRows($rows);
+            $table->render();
+        }
+    }
+
+    /**
+     * create mail body for plain text and html mail
+     *
+     * @param string $password one-time encryption password
+     * @return array an array of the html mail body and the plain text mail body
+     */
+    protected function createMailBody($password) {
+        $html = new \OC_Template("encryption", "mail", "");
+        $html->assign('password', $password);
+        $htmlMail = $html->fetchPage();
+
+        $plainText = new \OC_Template("encryption", "altmail", "");
+        $plainText->assign('password', $password);
+        $plainTextMail = $plainText->fetchPage();
+
+        return [$htmlMail, $plainTextMail];
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -134,7 +134,7 @@ 
 		$this->input = $input;
 		$this->output = $output;
 
-		$headline = 'Encrypt all files with the ' . Encryption::DISPLAY_NAME;
+		$headline = 'Encrypt all files with the '.Encryption::DISPLAY_NAME;
 		$this->output->writeln("\n");
 		$this->output->writeln($headline);
 		$this->output->writeln(str_pad('', strlen($headline), '='));
@@ -190,7 +190,7 @@ 
 				$users = $backend->getUsers('', $limit, $offset);
 				foreach ($users as $user) {
 					if ($this->keyManager->userHasKeys($user) === false) {
-						$progress->setMessage('Create key-pair for ' . $user);
+						$progress->setMessage('Create key-pair for '.$user);
 						$progress->advance();
 						$this->setupUserFS($user);
 						$password = $this->generateOneTimePassword($user);
@@ -264,12 +264,12 @@ 
 	protected function encryptUsersFiles($uid, ProgressBar $progress, $userCount) {
 		$this->setupUserFS($uid);
 		$directories = [];
-		$directories[] = '/' . $uid . '/files';
+		$directories[] = '/'.$uid.'/files';
 
 		while ($root = array_pop($directories)) {
 			$content = $this->rootView->getDirectoryContent($root);
 			foreach ($content as $file) {
-				$path = $root . '/' . $file['name'];
+				$path = $root.'/'.$file['name'];
 				if ($this->rootView->is_dir($path)) {
 					$directories[] = $path;
 					continue;
@@ -300,7 +300,7 @@ 
 		}
 
 		$source = $path;
-		$target = $path . '.encrypted.' . time();
+		$target = $path.'.encrypted.'.time();
 
 		try {
 			$this->rootView->copy($source, $target);