Skip to content

respect privacy options of event/task in activity for shared calendar#13331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fdellwing wants to merge 4 commits into from
Closed

respect privacy options of event/task in activity for shared calendar #13331

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bdb5201
respect privacy options of event
Jan 3, 2019
d124d72
fix regression
Jan 3, 2019
7fd4bef
also hide private tasks
Jan 4, 2019
24eae49
skip loop earlier, use const instead of hardcoded number
Jan 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions apps/dav/lib/CalDAV/Activity/Backend.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@

use OCA\DAV\CalDAV\Activity\Provider\Calendar;
use OCA\DAV\CalDAV\Activity\Provider\Event;
use OCA\DAV\CalDAV\CalDavBackend;
use OCP\Activity\IEvent;
use OCP\Activity\IManager as IActivityManager;
use OCP\IGroup;
Expand DownExpand Up@@ -415,6 +416,8 @@ public function onTouchCalendarObject($action, array $calendarData, array $share
$currentUser = $owner;
}

$classification = (isset($objectData['classification']) ? $objectData['classification'] : CalDavBackend::CLASSIFICATION_PUBLIC);

$object = $this->getObjectNameAndType($objectData);
$action = $action . '_' . $object['type'];

Expand All@@ -434,6 +437,9 @@ public function onTouchCalendarObject($action, array $calendarData, array $share
$users[] = $owner;

foreach ($users as $user) {
if ($classification !== CalDavBackend::CLASSIFICATION_PUBLIC && $user !== $owner) {

@nickvergessennickvergessenJan 8, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if ($classification === CalDavBackend::CLASSIFICATION_PRIVATE && $user !== $owner) {

continue;
}
$event->setAffectedUser($user)
->setSubject(
$user === $currentUser ? $action . '_self' : $action,
Expand Down