Skip to content

Retrieve user home folder before deleting a user #16830

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
MorrisJobke wants to merge 2 commits into from
Closed

Retrieve user home folder before deleting a user #16830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d467991
Remove some phpunit deprecation warnings
DeepDiver1975 Oct 19, 2016
b2c21ba
Retrieve user home folder before deleting a user
MorrisJobke Jun 9, 2015
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
4 changes: 4 additions & 0 deletions .htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,7 @@ Options -Indexes
<IfModule pagespeed_module>
ModPagespeed Off
</IfModule>
#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####

ErrorDocument 403 //core/templates/403.php
ErrorDocument 404 //core/templates/404.php
5 changes: 4 additions & 1 deletion lib/private/User/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,9 @@ public function delete() {
if ($this->emitter) {
$this->emitter->emit('\OC\User', 'preDelete', [$this]);
}
// homeDir needs to be retrieved before the user is deleted - otherwise it isn't correct and the fallback is used
$homeDir = $this->getHome();

$result = $this->backend->deleteUser($this->uid);
if ($result) {

Expand All @@ -210,7 +213,7 @@ public function delete() {
\OC::$server->getConfig()->deleteAllUserValues($this->uid);

// Delete user files in /data/
\OC_Helper::rmdirr($this->getHome());
\OC_Helper::rmdirr($homeDir);

// Delete the users entry in the storage table
Storage::remove('home::' . $this->uid);
Expand Down