Skip to content

Delete calendars with their users #1545

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

Merged
MorrisJobke merged 7 commits into from
Sep 28, 2016
Merged

Delete calendars with their users #1545

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7db01ff
delete calendars when users are deleted
tcitworld Aug 23, 2016
18c07f0
delete also addressbooks on user deletion
tcitworld Aug 23, 2016
97a47f4
Adjust delete logic and ann unit tests
DeepDiver1975 Sep 22, 2016
5215833
delete shares to an user
tcitworld Sep 23, 2016
da1543e
fix deletion of calendars
tcitworld Sep 25, 2016
479c427
Add IL10N to unit test
LukasReschke Sep 27, 2016
6c8bcb3
Rename deleteAllSharesForUser() to deleteAllSharesByUser()
tcitworld Sep 28, 2016
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
Next Next commit
delete calendars when users are deleted 
Signed-off-by: Lukas Reschke <[email protected]>
  • Loading branch information
@tcitworld @LukasReschke
tcitworld authored and LukasReschke committed Sep 27, 2016
commit 7db01ff8055c660dfaa2ab9d88865245dcac9e62
14 changes: 13 additions & 1 deletion apps/dav/lib/HookManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ class HookManager {
/** @var IUser[] */
private $usersToDelete;

/** @var array */
private $calendarsToDelete;

/** @var CalDavBackend */
private $calDav;

Expand Down Expand Up @@ -85,14 +88,23 @@ public function postCreateUser($params) {
}

public function preDeleteUser($params) {
$this->usersToDelete[$params['uid']] = $this->userManager->get($params['uid']);
$user = $this->userManager->get($params['uid']);

$this->usersToDelete[$params['uid']] = $user;

$this->calendarsToDelete = $this->calDav->getCalendarsForUser('principals/users/' . $user->getUID());
}

public function postDeleteUser($params) {
$uid = $params['uid'];
if (isset($this->usersToDelete[$uid])){
$this->syncService->deleteUser($this->usersToDelete[$uid]);
}
if (!is_null($this->calendarsToDelete)) {
foreach ($this->calendarsToDelete as $calendar) {
$this->calDav->deleteCalendar($calendar['id']);
}
}
}

public function changeUser($params) {
Expand Down