nextcloud / server

apps/settings/lib/Search/SectionSearch.php

Indentation +113 added lines, -113 removed lines

@@ -36,117 +36,117 @@
 
 class SectionSearch implements IProvider {
 
-	/** @var IManager */
-	protected $settingsManager;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var IL10N */
-	protected $l;
-
-	public function __construct(IManager $settingsManager,
-								IGroupManager $groupManager,
-								IURLGenerator $urlGenerator,
-								IL10N $l) {
-		$this->settingsManager = $settingsManager;
-		$this->groupManager = $groupManager;
-		$this->urlGenerator = $urlGenerator;
-		$this->l = $l;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getId(): string {
-		return 'settings';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string {
-		return $this->l->t('Settings');
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getOrder(string $route, array $routeParameters): int {
-		if ($route === 'settings.PersonalSettings.index' || $route === 'settings.AdminSettings.index') {
-			return -1;
-		}
-		// At the very bottom
-		return 500;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function search(IUser $user, ISearchQuery $query): SearchResult {
-		$isAdmin = $this->groupManager->isAdmin($user->getUID());
-
-		$result = $this->searchSections(
-			$query,
-			$this->settingsManager->getPersonalSections(),
-			$isAdmin ? $this->l->t('Personal') : '',
-			'settings.PersonalSettings.index'
-		);
-
-		if ($this->groupManager->isAdmin($user->getUID())) {
-			$result = array_merge($result, $this->searchSections(
-				$query,
-				$this->settingsManager->getAdminSections(),
-				$this->l->t('Administration'),
-				'settings.AdminSettings.index'
-			));
-		}
-
-		return SearchResult::complete(
-			$this->l->t('Settings'),
-			$result
-		);
-	}
-
-	/**
-	 * @param ISearchQuery $query
-	 * @param ISection[][] $sections
-	 * @param string $subline
-	 * @param string $routeName
-	 * @return array
-	 */
-	public function searchSections(ISearchQuery $query, array $sections, string $subline, string $routeName): array {
-		$result = [];
-		foreach ($sections as $priority => $sectionsByPriority) {
-			foreach ($sectionsByPriority as $section) {
-				if (
-					stripos($section->getName(), $query->getTerm()) === false &&
-					stripos($section->getID(), $query->getTerm()) === false
-				) {
-					continue;
-				}
-
-				/**
-				 * We can't use the icon URL at the moment as they don't invert correctly for dark theme
-				 * $iconUrl = '';
-				 * if ($section instanceof IIconSection) {
-				 * $iconUrl = $section->getIcon();
-				 * }
-				 */
-
-				$result[] = new SearchResultEntry(
-					'',
-					$section->getName(),
-					$subline,
-					$this->urlGenerator->linkToRouteAbsolute($routeName, ['section' => $section->getID()]),
-					'icon-settings'
-				);
-			}
-		}
-
-		return $result;
-	}
+    /** @var IManager */
+    protected $settingsManager;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+
+    /** @var IL10N */
+    protected $l;
+
+    public function __construct(IManager $settingsManager,
+                                IGroupManager $groupManager,
+                                IURLGenerator $urlGenerator,
+                                IL10N $l) {
+        $this->settingsManager = $settingsManager;
+        $this->groupManager = $groupManager;
+        $this->urlGenerator = $urlGenerator;
+        $this->l = $l;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string {
+        return 'settings';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string {
+        return $this->l->t('Settings');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOrder(string $route, array $routeParameters): int {
+        if ($route === 'settings.PersonalSettings.index' || $route === 'settings.AdminSettings.index') {
+            return -1;
+        }
+        // At the very bottom
+        return 500;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function search(IUser $user, ISearchQuery $query): SearchResult {
+        $isAdmin = $this->groupManager->isAdmin($user->getUID());
+
+        $result = $this->searchSections(
+            $query,
+            $this->settingsManager->getPersonalSections(),
+            $isAdmin ? $this->l->t('Personal') : '',
+            'settings.PersonalSettings.index'
+        );
+
+        if ($this->groupManager->isAdmin($user->getUID())) {
+            $result = array_merge($result, $this->searchSections(
+                $query,
+                $this->settingsManager->getAdminSections(),
+                $this->l->t('Administration'),
+                'settings.AdminSettings.index'
+            ));
+        }
+
+        return SearchResult::complete(
+            $this->l->t('Settings'),
+            $result
+        );
+    }
+
+    /**
+     * @param ISearchQuery $query
+     * @param ISection[][] $sections
+     * @param string $subline
+     * @param string $routeName
+     * @return array
+     */
+    public function searchSections(ISearchQuery $query, array $sections, string $subline, string $routeName): array {
+        $result = [];
+        foreach ($sections as $priority => $sectionsByPriority) {
+            foreach ($sectionsByPriority as $section) {
+                if (
+                    stripos($section->getName(), $query->getTerm()) === false &&
+                    stripos($section->getID(), $query->getTerm()) === false
+                ) {
+                    continue;
+                }
+
+                /**
+                 * We can't use the icon URL at the moment as they don't invert correctly for dark theme
+                 * $iconUrl = '';
+                 * if ($section instanceof IIconSection) {
+                 * $iconUrl = $section->getIcon();
+                 * }
+                 */
+
+                $result[] = new SearchResultEntry(
+                    '',
+                    $section->getName(),
+                    $subline,
+                    $this->urlGenerator->linkToRouteAbsolute($routeName, ['section' => $section->getID()]),
+                    'icon-settings'
+                );
+            }
+        }
+
+        return $result;
+    }
 }

apps/dav/lib/Search/TasksSearchProvider.php

Indentation +130 added lines, -130 removed lines

@@ -38,134 +38,134 @@
  */
 class TasksSearchProvider extends ACalendarSearchProvider {
 
-	/**
-	 * @var string[]
-	 */
-	private static $searchProperties = [
-		'SUMMARY',
-		'DESCRIPTION',
-		'CATEGORIES',
-	];
-
-	/**
-	 * @var string[]
-	 */
-	private static $searchParameters = [];
-
-	/**
-	 * @var string
-	 */
-	private static $componentType = 'VTODO';
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getId(): string {
-		return 'tasks';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string {
-		return $this->l10n->t('Tasks');
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getOrder(string $route, array $routeParameters): int {
-		if ($route === 'tasks.Page.index') {
-			return -1;
-		}
-		return 35;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function search(IUser $user,
-						   ISearchQuery $query): SearchResult {
-		if (!$this->appManager->isEnabledForUser('tasks', $user)) {
-			return SearchResult::complete($this->getName(), []);
-		}
-
-		$principalUri = 'principals/users/' . $user->getUID();
-		$calendarsById = $this->getSortedCalendars($principalUri);
-		$subscriptionsById = $this->getSortedSubscriptions($principalUri);
-
-		$searchResults = $this->backend->searchPrincipalUri(
-			$principalUri,
-			$query->getTerm(),
-			[self::$componentType],
-			self::$searchProperties,
-			self::$searchParameters,
-			[
-				'limit' => $query->getLimit(),
-				'offset' => $query->getCursor(),
-			]
-		);
-		$formattedResults = \array_map(function (array $taskRow) use ($calendarsById, $subscriptionsById):SearchResultEntry {
-			$component = $this->getPrimaryComponent($taskRow['calendardata'], self::$componentType);
-			$title = (string)($component->SUMMARY ?? $this->l10n->t('Untitled task'));
-			$subline = $this->generateSubline($component);
-
-			if ($taskRow['calendartype'] === CalDavBackend::CALENDAR_TYPE_CALENDAR) {
-				$calendar = $calendarsById[$taskRow['calendarid']];
-			} else {
-				$calendar = $subscriptionsById[$taskRow['calendarid']];
-			}
-			$resourceUrl = $this->getDeepLinkToTasksApp($calendar['uri'], $taskRow['uri']);
-
-			return new SearchResultEntry('', $title, $subline, $resourceUrl, 'icon-checkmark', false);
-		}, $searchResults);
-
-		return SearchResult::paginated(
-			$this->getName(),
-			$formattedResults,
-			$query->getCursor() + count($formattedResults)
-		);
-	}
-
-	/**
-	 * @param string $calendarUri
-	 * @param string $taskUri
-	 * @return string
-	 */
-	protected function getDeepLinkToTasksApp(string $calendarUri,
-											 string $taskUri): string {
-		return $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->linkToRoute('tasks.page.index')
-			. '#/calendars/'
-			. $calendarUri
-			. '/tasks/'
-			. $taskUri
-		);
-	}
-
-	/**
-	 * @param Component $taskComponent
-	 * @return string
-	 */
-	protected function generateSubline(Component $taskComponent): string {
-		if ($taskComponent->COMPLETED) {
-			$completedDateTime = new \DateTime($taskComponent->COMPLETED->getDateTime()->format(\DateTime::ATOM));
-			$formattedDate = $this->l10n->l('date', $completedDateTime, ['width' => 'medium']);
-			return $this->l10n->t('Completed on %s', [$formattedDate]);
-		}
-
-		if ($taskComponent->DUE) {
-			$dueDateTime = new \DateTime($taskComponent->DUE->getDateTime()->format(\DateTime::ATOM));
-			$formattedDate = $this->l10n->l('date', $dueDateTime, ['width' => 'medium']);
-
-			if ($taskComponent->DUE->hasTime()) {
-				$formattedTime =  $this->l10n->l('time', $dueDateTime, ['width' => 'short']);
-				return $this->l10n->t('Due on %s by %s', [$formattedDate, $formattedTime]);
-			}
-
-			return $this->l10n->t('Due on %s', [$formattedDate]);
-		}
-
-		return '';
-	}
+    /**
+     * @var string[]
+     */
+    private static $searchProperties = [
+        'SUMMARY',
+        'DESCRIPTION',
+        'CATEGORIES',
+    ];
+
+    /**
+     * @var string[]
+     */
+    private static $searchParameters = [];
+
+    /**
+     * @var string
+     */
+    private static $componentType = 'VTODO';
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string {
+        return 'tasks';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string {
+        return $this->l10n->t('Tasks');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOrder(string $route, array $routeParameters): int {
+        if ($route === 'tasks.Page.index') {
+            return -1;
+        }
+        return 35;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function search(IUser $user,
+                            ISearchQuery $query): SearchResult {
+        if (!$this->appManager->isEnabledForUser('tasks', $user)) {
+            return SearchResult::complete($this->getName(), []);
+        }
+
+        $principalUri = 'principals/users/' . $user->getUID();
+        $calendarsById = $this->getSortedCalendars($principalUri);
+        $subscriptionsById = $this->getSortedSubscriptions($principalUri);
+
+        $searchResults = $this->backend->searchPrincipalUri(
+            $principalUri,
+            $query->getTerm(),
+            [self::$componentType],
+            self::$searchProperties,
+            self::$searchParameters,
+            [
+                'limit' => $query->getLimit(),
+                'offset' => $query->getCursor(),
+            ]
+        );
+        $formattedResults = \array_map(function (array $taskRow) use ($calendarsById, $subscriptionsById):SearchResultEntry {
+            $component = $this->getPrimaryComponent($taskRow['calendardata'], self::$componentType);
+            $title = (string)($component->SUMMARY ?? $this->l10n->t('Untitled task'));
+            $subline = $this->generateSubline($component);
+
+            if ($taskRow['calendartype'] === CalDavBackend::CALENDAR_TYPE_CALENDAR) {
+                $calendar = $calendarsById[$taskRow['calendarid']];
+            } else {
+                $calendar = $subscriptionsById[$taskRow['calendarid']];
+            }
+            $resourceUrl = $this->getDeepLinkToTasksApp($calendar['uri'], $taskRow['uri']);
+
+            return new SearchResultEntry('', $title, $subline, $resourceUrl, 'icon-checkmark', false);
+        }, $searchResults);
+
+        return SearchResult::paginated(
+            $this->getName(),
+            $formattedResults,
+            $query->getCursor() + count($formattedResults)
+        );
+    }
+
+    /**
+     * @param string $calendarUri
+     * @param string $taskUri
+     * @return string
+     */
+    protected function getDeepLinkToTasksApp(string $calendarUri,
+                                                string $taskUri): string {
+        return $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->linkToRoute('tasks.page.index')
+            . '#/calendars/'
+            . $calendarUri
+            . '/tasks/'
+            . $taskUri
+        );
+    }
+
+    /**
+     * @param Component $taskComponent
+     * @return string
+     */
+    protected function generateSubline(Component $taskComponent): string {
+        if ($taskComponent->COMPLETED) {
+            $completedDateTime = new \DateTime($taskComponent->COMPLETED->getDateTime()->format(\DateTime::ATOM));
+            $formattedDate = $this->l10n->l('date', $completedDateTime, ['width' => 'medium']);
+            return $this->l10n->t('Completed on %s', [$formattedDate]);
+        }
+
+        if ($taskComponent->DUE) {
+            $dueDateTime = new \DateTime($taskComponent->DUE->getDateTime()->format(\DateTime::ATOM));
+            $formattedDate = $this->l10n->l('date', $dueDateTime, ['width' => 'medium']);
+
+            if ($taskComponent->DUE->hasTime()) {
+                $formattedTime =  $this->l10n->l('time', $dueDateTime, ['width' => 'short']);
+                return $this->l10n->t('Due on %s by %s', [$formattedDate, $formattedTime]);
+            }
+
+            return $this->l10n->t('Due on %s', [$formattedDate]);
+        }
+
+        return '';
+    }
 }

apps/dav/lib/Search/EventsSearchProvider.php

Indentation +199 added lines, -199 removed lines

@@ -40,203 +40,203 @@
  */
 class EventsSearchProvider extends ACalendarSearchProvider {
 
-	/**
-	 * @var string[]
-	 */
-	private static $searchProperties = [
-		'SUMMARY',
-		'LOCATION',
-		'DESCRIPTION',
-		'ATTENDEE',
-		'ORGANIZER',
-		'CATEGORIES',
-	];
-
-	/**
-	 * @var string[]
-	 */
-	private static $searchParameters = [
-		'ATTENDEE' => ['CN'],
-		'ORGANIZER' => ['CN'],
-	];
-
-	/**
-	 * @var string
-	 */
-	private static $componentType = 'VEVENT';
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getId(): string {
-		return 'calendar';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string {
-		return $this->l10n->t('Events');
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getOrder(string $route, array $routeParameters): int {
-		if ($route === 'calendar.View.index') {
-			return -1;
-		}
-		return 30;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function search(IUser $user,
-						   ISearchQuery $query): SearchResult {
-		if (!$this->appManager->isEnabledForUser('calendar', $user)) {
-			return SearchResult::complete($this->getName(), []);
-		}
-
-		$principalUri = 'principals/users/' . $user->getUID();
-		$calendarsById = $this->getSortedCalendars($principalUri);
-		$subscriptionsById = $this->getSortedSubscriptions($principalUri);
-
-		$searchResults = $this->backend->searchPrincipalUri(
-			$principalUri,
-			$query->getTerm(),
-			[self::$componentType],
-			self::$searchProperties,
-			self::$searchParameters,
-			[
-				'limit' => $query->getLimit(),
-				'offset' => $query->getCursor(),
-			]
-		);
-		$formattedResults = \array_map(function (array $eventRow) use ($calendarsById, $subscriptionsById):SearchResultEntry {
-			$component = $this->getPrimaryComponent($eventRow['calendardata'], self::$componentType);
-			$title = (string)($component->SUMMARY ?? $this->l10n->t('Untitled event'));
-			$subline = $this->generateSubline($component);
-
-			if ($eventRow['calendartype'] === CalDavBackend::CALENDAR_TYPE_CALENDAR) {
-				$calendar = $calendarsById[$eventRow['calendarid']];
-			} else {
-				$calendar = $subscriptionsById[$eventRow['calendarid']];
-			}
-			$resourceUrl = $this->getDeepLinkToCalendarApp($calendar['principaluri'], $calendar['uri'], $eventRow['uri']);
-
-			return new SearchResultEntry('', $title, $subline, $resourceUrl, 'icon-calendar-dark', false);
-		}, $searchResults);
-
-		return SearchResult::paginated(
-			$this->getName(),
-			$formattedResults,
-			$query->getCursor() + count($formattedResults)
-		);
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @param string $calendarUri
-	 * @param string $calendarObjectUri
-	 * @return string
-	 */
-	protected function getDeepLinkToCalendarApp(string $principalUri,
-												string $calendarUri,
-												string $calendarObjectUri): string {
-		$davUrl = $this->getDavUrlForCalendarObject($principalUri, $calendarUri, $calendarObjectUri);
-		// This route will automatically figure out what recurrence-id to open
-		return $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->linkToRoute('calendar.view.index')
-			. 'edit/'
-			. base64_encode($davUrl)
-		);
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @param string $calendarUri
-	 * @param string $calendarObjectUri
-	 * @return string
-	 */
-	protected function getDavUrlForCalendarObject(string $principalUri,
-												  string $calendarUri,
-												  string $calendarObjectUri): string {
-		[,, $principalId] = explode('/', $principalUri, 3);
-
-		return $this->urlGenerator->linkTo('', 'remote.php') . '/dav/calendars/'
-			. $principalId . '/'
-			. $calendarUri . '/'
-			. $calendarObjectUri;
-	}
-
-	/**
-	 * @param Component $eventComponent
-	 * @return string
-	 */
-	protected function generateSubline(Component $eventComponent): string {
-		$dtStart = $eventComponent->DTSTART;
-		$dtEnd = $this->getDTEndForEvent($eventComponent);
-		$isAllDayEvent = $dtStart instanceof Property\ICalendar\Date;
-		$startDateTime = new \DateTime($dtStart->getDateTime()->format(\DateTime::ATOM));
-		$endDateTime = new \DateTime($dtEnd->getDateTime()->format(\DateTime::ATOM));
-
-		if ($isAllDayEvent) {
-			$endDateTime->modify('-1 day');
-			if ($this->isDayEqual($startDateTime, $endDateTime)) {
-				return $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
-			}
-
-			$formattedStart = $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
-			$formattedEnd = $this->l10n->l('date', $endDateTime, ['width' => 'medium']);
-			return "$formattedStart - $formattedEnd";
-		}
-
-		$formattedStartDate = $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
-		$formattedEndDate = $this->l10n->l('date', $endDateTime, ['width' => 'medium']);
-		$formattedStartTime = $this->l10n->l('time', $startDateTime, ['width' => 'short']);
-		$formattedEndTime = $this->l10n->l('time', $endDateTime, ['width' => 'short']);
-
-		if ($this->isDayEqual($startDateTime, $endDateTime)) {
-			return "$formattedStartDate $formattedStartTime - $formattedEndTime";
-		}
-
-		return "$formattedStartDate $formattedStartTime - $formattedEndDate $formattedEndTime";
-	}
-
-	/**
-	 * @param Component $eventComponent
-	 * @return Property
-	 */
-	protected function getDTEndForEvent(Component $eventComponent):Property {
-		if (isset($eventComponent->DTEND)) {
-			$end = $eventComponent->DTEND;
-		} elseif (isset($eventComponent->DURATION)) {
-			$isFloating = $eventComponent->DTSTART->isFloating();
-			$end = clone $eventComponent->DTSTART;
-			$endDateTime = $end->getDateTime();
-			$endDateTime = $endDateTime->add(DateTimeParser::parse($eventComponent->DURATION->getValue()));
-			$end->setDateTime($endDateTime, $isFloating);
-		} elseif (!$eventComponent->DTSTART->hasTime()) {
-			$isFloating = $eventComponent->DTSTART->isFloating();
-			$end = clone $eventComponent->DTSTART;
-			$endDateTime = $end->getDateTime();
-			$endDateTime = $endDateTime->modify('+1 day');
-			$end->setDateTime($endDateTime, $isFloating);
-		} else {
-			$end = clone $eventComponent->DTSTART;
-		}
-
-		return $end;
-	}
-
-	/**
-	 * @param \DateTime $dtStart
-	 * @param \DateTime $dtEnd
-	 * @return bool
-	 */
-	protected function isDayEqual(\DateTime $dtStart,
-								  \DateTime $dtEnd) {
-		return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
-	}
+    /**
+     * @var string[]
+     */
+    private static $searchProperties = [
+        'SUMMARY',
+        'LOCATION',
+        'DESCRIPTION',
+        'ATTENDEE',
+        'ORGANIZER',
+        'CATEGORIES',
+    ];
+
+    /**
+     * @var string[]
+     */
+    private static $searchParameters = [
+        'ATTENDEE' => ['CN'],
+        'ORGANIZER' => ['CN'],
+    ];
+
+    /**
+     * @var string
+     */
+    private static $componentType = 'VEVENT';
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string {
+        return 'calendar';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string {
+        return $this->l10n->t('Events');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOrder(string $route, array $routeParameters): int {
+        if ($route === 'calendar.View.index') {
+            return -1;
+        }
+        return 30;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function search(IUser $user,
+                            ISearchQuery $query): SearchResult {
+        if (!$this->appManager->isEnabledForUser('calendar', $user)) {
+            return SearchResult::complete($this->getName(), []);
+        }
+
+        $principalUri = 'principals/users/' . $user->getUID();
+        $calendarsById = $this->getSortedCalendars($principalUri);
+        $subscriptionsById = $this->getSortedSubscriptions($principalUri);
+
+        $searchResults = $this->backend->searchPrincipalUri(
+            $principalUri,
+            $query->getTerm(),
+            [self::$componentType],
+            self::$searchProperties,
+            self::$searchParameters,
+            [
+                'limit' => $query->getLimit(),
+                'offset' => $query->getCursor(),
+            ]
+        );
+        $formattedResults = \array_map(function (array $eventRow) use ($calendarsById, $subscriptionsById):SearchResultEntry {
+            $component = $this->getPrimaryComponent($eventRow['calendardata'], self::$componentType);
+            $title = (string)($component->SUMMARY ?? $this->l10n->t('Untitled event'));
+            $subline = $this->generateSubline($component);
+
+            if ($eventRow['calendartype'] === CalDavBackend::CALENDAR_TYPE_CALENDAR) {
+                $calendar = $calendarsById[$eventRow['calendarid']];
+            } else {
+                $calendar = $subscriptionsById[$eventRow['calendarid']];
+            }
+            $resourceUrl = $this->getDeepLinkToCalendarApp($calendar['principaluri'], $calendar['uri'], $eventRow['uri']);
+
+            return new SearchResultEntry('', $title, $subline, $resourceUrl, 'icon-calendar-dark', false);
+        }, $searchResults);
+
+        return SearchResult::paginated(
+            $this->getName(),
+            $formattedResults,
+            $query->getCursor() + count($formattedResults)
+        );
+    }
+
+    /**
+     * @param string $principalUri
+     * @param string $calendarUri
+     * @param string $calendarObjectUri
+     * @return string
+     */
+    protected function getDeepLinkToCalendarApp(string $principalUri,
+                                                string $calendarUri,
+                                                string $calendarObjectUri): string {
+        $davUrl = $this->getDavUrlForCalendarObject($principalUri, $calendarUri, $calendarObjectUri);
+        // This route will automatically figure out what recurrence-id to open
+        return $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->linkToRoute('calendar.view.index')
+            . 'edit/'
+            . base64_encode($davUrl)
+        );
+    }
+
+    /**
+     * @param string $principalUri
+     * @param string $calendarUri
+     * @param string $calendarObjectUri
+     * @return string
+     */
+    protected function getDavUrlForCalendarObject(string $principalUri,
+                                                    string $calendarUri,
+                                                    string $calendarObjectUri): string {
+        [,, $principalId] = explode('/', $principalUri, 3);
+
+        return $this->urlGenerator->linkTo('', 'remote.php') . '/dav/calendars/'
+            . $principalId . '/'
+            . $calendarUri . '/'
+            . $calendarObjectUri;
+    }
+
+    /**
+     * @param Component $eventComponent
+     * @return string
+     */
+    protected function generateSubline(Component $eventComponent): string {
+        $dtStart = $eventComponent->DTSTART;
+        $dtEnd = $this->getDTEndForEvent($eventComponent);
+        $isAllDayEvent = $dtStart instanceof Property\ICalendar\Date;
+        $startDateTime = new \DateTime($dtStart->getDateTime()->format(\DateTime::ATOM));
+        $endDateTime = new \DateTime($dtEnd->getDateTime()->format(\DateTime::ATOM));
+
+        if ($isAllDayEvent) {
+            $endDateTime->modify('-1 day');
+            if ($this->isDayEqual($startDateTime, $endDateTime)) {
+                return $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
+            }
+
+            $formattedStart = $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
+            $formattedEnd = $this->l10n->l('date', $endDateTime, ['width' => 'medium']);
+            return "$formattedStart - $formattedEnd";
+        }
+
+        $formattedStartDate = $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
+        $formattedEndDate = $this->l10n->l('date', $endDateTime, ['width' => 'medium']);
+        $formattedStartTime = $this->l10n->l('time', $startDateTime, ['width' => 'short']);
+        $formattedEndTime = $this->l10n->l('time', $endDateTime, ['width' => 'short']);
+
+        if ($this->isDayEqual($startDateTime, $endDateTime)) {
+            return "$formattedStartDate $formattedStartTime - $formattedEndTime";
+        }
+
+        return "$formattedStartDate $formattedStartTime - $formattedEndDate $formattedEndTime";
+    }
+
+    /**
+     * @param Component $eventComponent
+     * @return Property
+     */
+    protected function getDTEndForEvent(Component $eventComponent):Property {
+        if (isset($eventComponent->DTEND)) {
+            $end = $eventComponent->DTEND;
+        } elseif (isset($eventComponent->DURATION)) {
+            $isFloating = $eventComponent->DTSTART->isFloating();
+            $end = clone $eventComponent->DTSTART;
+            $endDateTime = $end->getDateTime();
+            $endDateTime = $endDateTime->add(DateTimeParser::parse($eventComponent->DURATION->getValue()));
+            $end->setDateTime($endDateTime, $isFloating);
+        } elseif (!$eventComponent->DTSTART->hasTime()) {
+            $isFloating = $eventComponent->DTSTART->isFloating();
+            $end = clone $eventComponent->DTSTART;
+            $endDateTime = $end->getDateTime();
+            $endDateTime = $endDateTime->modify('+1 day');
+            $end->setDateTime($endDateTime, $isFloating);
+        } else {
+            $end = clone $eventComponent->DTSTART;
+        }
+
+        return $end;
+    }
+
+    /**
+     * @param \DateTime $dtStart
+     * @param \DateTime $dtEnd
+     * @return bool
+     */
+    protected function isDayEqual(\DateTime $dtStart,
+                                    \DateTime $dtEnd) {
+        return $dtStart->format('Y-m-d') === $dtEnd->format('Y-m-d');
+    }
 }

apps/dav/lib/Search/ContactsSearchProvider.php

Indentation +159 added lines, -159 removed lines

@@ -38,163 +38,163 @@
 
 class ContactsSearchProvider implements IProvider {
 
-	/** @var IAppManager */
-	private $appManager;
-
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var CardDavBackend */
-	private $backend;
-
-	/**
-	 * @var string[]
-	 */
-	private static $searchProperties = [
-		'N',
-		'FN',
-		'NICKNAME',
-		'EMAIL',
-		'ADR',
-	];
-
-	/**
-	 * ContactsSearchProvider constructor.
-	 *
-	 * @param IAppManager $appManager
-	 * @param IL10N $l10n
-	 * @param IURLGenerator $urlGenerator
-	 * @param CardDavBackend $backend
-	 */
-	public function __construct(IAppManager $appManager,
-								IL10N $l10n,
-								IURLGenerator $urlGenerator,
-								CardDavBackend $backend) {
-		$this->appManager = $appManager;
-		$this->l10n = $l10n;
-		$this->urlGenerator = $urlGenerator;
-		$this->backend = $backend;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getId(): string {
-		return 'contacts';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getName(): string {
-		return $this->l10n->t('Contacts');
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getOrder(string $route, array $routeParameters): int {
-		if ($route === 'contacts.Page.index') {
-			return -1;
-		}
-		return 25;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function search(IUser $user, ISearchQuery $query): SearchResult {
-		if (!$this->appManager->isEnabledForUser('contacts', $user)) {
-			return SearchResult::complete($this->getName(), []);
-		}
-
-		$principalUri = 'principals/users/' . $user->getUID();
-		$addressBooks = $this->backend->getAddressBooksForUser($principalUri);
-		$addressBooksById = [];
-		foreach ($addressBooks as $addressBook) {
-			$addressBooksById[(int) $addressBook['id']] = $addressBook;
-		}
-
-		$searchResults = $this->backend->searchPrincipalUri(
-			$principalUri,
-			$query->getTerm(),
-			self::$searchProperties,
-			[
-				'limit' => $query->getLimit(),
-				'offset' => $query->getCursor(),
-			]
-		);
-		$formattedResults = \array_map(function (array $contactRow) use ($addressBooksById):SearchResultEntry {
-			$addressBook = $addressBooksById[$contactRow['addressbookid']];
-
-			/** @var VCard $vCard */
-			$vCard = Reader::read($contactRow['carddata']);
-			$thumbnailUrl = '';
-			if ($vCard->PHOTO) {
-				$thumbnailUrl = $this->getDavUrlForContact($addressBook['principaluri'], $addressBook['uri'], $contactRow['uri']) . '?photo';
-			}
-
-			$title = (string)$vCard->FN;
-			$subline = $this->generateSubline($vCard);
-			$resourceUrl = $this->getDeepLinkToContactsApp($addressBook['uri'], (string) $vCard->UID);
-
-			return new SearchResultEntry($thumbnailUrl, $title, $subline, $resourceUrl, 'icon-contacts-dark', true);
-		}, $searchResults);
-
-		return SearchResult::paginated(
-			$this->getName(),
-			$formattedResults,
-			$query->getCursor() + count($formattedResults)
-		);
-	}
-
-	/**
-	 * @param string $principalUri
-	 * @param string $addressBookUri
-	 * @param string $contactsUri
-	 * @return string
-	 */
-	protected function getDavUrlForContact(string $principalUri,
-										   string $addressBookUri,
-										   string $contactsUri): string {
-		[, $principalType, $principalId] = explode('/', $principalUri, 3);
-
-		return $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->linkTo('', 'remote.php') . '/dav/addressbooks/'
-				. $principalType . '/'
-				. $principalId . '/'
-				. $addressBookUri . '/'
-				. $contactsUri
-		);
-	}
-
-	/**
-	 * @param string $addressBookUri
-	 * @param string $contactUid
-	 * @return string
-	 */
-	protected function getDeepLinkToContactsApp(string $addressBookUri,
-												string $contactUid): string {
-		return $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->linkToRoute('contacts.contacts.direct', [
-				'contact' => $contactUid . '~' . $addressBookUri
-			])
-		);
-	}
-
-	/**
-	 * @param VCard $vCard
-	 * @return string
-	 */
-	protected function generateSubline(VCard $vCard): string {
-		$emailAddresses = $vCard->select('EMAIL');
-		if (!is_array($emailAddresses) || empty($emailAddresses)) {
-			return '';
-		}
-
-		return (string)$emailAddresses[0];
-	}
+    /** @var IAppManager */
+    private $appManager;
+
+    /** @var IL10N */
+    private $l10n;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var CardDavBackend */
+    private $backend;
+
+    /**
+     * @var string[]
+     */
+    private static $searchProperties = [
+        'N',
+        'FN',
+        'NICKNAME',
+        'EMAIL',
+        'ADR',
+    ];
+
+    /**
+     * ContactsSearchProvider constructor.
+     *
+     * @param IAppManager $appManager
+     * @param IL10N $l10n
+     * @param IURLGenerator $urlGenerator
+     * @param CardDavBackend $backend
+     */
+    public function __construct(IAppManager $appManager,
+                                IL10N $l10n,
+                                IURLGenerator $urlGenerator,
+                                CardDavBackend $backend) {
+        $this->appManager = $appManager;
+        $this->l10n = $l10n;
+        $this->urlGenerator = $urlGenerator;
+        $this->backend = $backend;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getId(): string {
+        return 'contacts';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string {
+        return $this->l10n->t('Contacts');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOrder(string $route, array $routeParameters): int {
+        if ($route === 'contacts.Page.index') {
+            return -1;
+        }
+        return 25;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function search(IUser $user, ISearchQuery $query): SearchResult {
+        if (!$this->appManager->isEnabledForUser('contacts', $user)) {
+            return SearchResult::complete($this->getName(), []);
+        }
+
+        $principalUri = 'principals/users/' . $user->getUID();
+        $addressBooks = $this->backend->getAddressBooksForUser($principalUri);
+        $addressBooksById = [];
+        foreach ($addressBooks as $addressBook) {
+            $addressBooksById[(int) $addressBook['id']] = $addressBook;
+        }
+
+        $searchResults = $this->backend->searchPrincipalUri(
+            $principalUri,
+            $query->getTerm(),
+            self::$searchProperties,
+            [
+                'limit' => $query->getLimit(),
+                'offset' => $query->getCursor(),
+            ]
+        );
+        $formattedResults = \array_map(function (array $contactRow) use ($addressBooksById):SearchResultEntry {
+            $addressBook = $addressBooksById[$contactRow['addressbookid']];
+
+            /** @var VCard $vCard */
+            $vCard = Reader::read($contactRow['carddata']);
+            $thumbnailUrl = '';
+            if ($vCard->PHOTO) {
+                $thumbnailUrl = $this->getDavUrlForContact($addressBook['principaluri'], $addressBook['uri'], $contactRow['uri']) . '?photo';
+            }
+
+            $title = (string)$vCard->FN;
+            $subline = $this->generateSubline($vCard);
+            $resourceUrl = $this->getDeepLinkToContactsApp($addressBook['uri'], (string) $vCard->UID);
+
+            return new SearchResultEntry($thumbnailUrl, $title, $subline, $resourceUrl, 'icon-contacts-dark', true);
+        }, $searchResults);
+
+        return SearchResult::paginated(
+            $this->getName(),
+            $formattedResults,
+            $query->getCursor() + count($formattedResults)
+        );
+    }
+
+    /**
+     * @param string $principalUri
+     * @param string $addressBookUri
+     * @param string $contactsUri
+     * @return string
+     */
+    protected function getDavUrlForContact(string $principalUri,
+                                            string $addressBookUri,
+                                            string $contactsUri): string {
+        [, $principalType, $principalId] = explode('/', $principalUri, 3);
+
+        return $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->linkTo('', 'remote.php') . '/dav/addressbooks/'
+                . $principalType . '/'
+                . $principalId . '/'
+                . $addressBookUri . '/'
+                . $contactsUri
+        );
+    }
+
+    /**
+     * @param string $addressBookUri
+     * @param string $contactUid
+     * @return string
+     */
+    protected function getDeepLinkToContactsApp(string $addressBookUri,
+                                                string $contactUid): string {
+        return $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->linkToRoute('contacts.contacts.direct', [
+                'contact' => $contactUid . '~' . $addressBookUri
+            ])
+        );
+    }
+
+    /**
+     * @param VCard $vCard
+     * @return string
+     */
+    protected function generateSubline(VCard $vCard): string {
+        $emailAddresses = $vCard->select('EMAIL');
+        if (!is_array($emailAddresses) || empty($emailAddresses)) {
+            return '';
+        }
+
+        return (string)$emailAddresses[0];
+    }
 }