From 8b503dbae3c41e067877ae8085d42c23d3610f5f Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Tue, 19 Nov 2019 10:08:58 -0700
Subject: [PATCH] Admin: change delete user filemanager hook to move home dir,
 but only search /home for other files - Translation from Birgit

---
 admin/inc/class.admin_account.inc.php | 2 +-
 admin/lang/egw_de.lang                | 1 +
 admin/lang/egw_en.lang                | 2 +-
 api/src/Vfs/Hooks.php                 | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/admin/inc/class.admin_account.inc.php b/admin/inc/class.admin_account.inc.php
index 978a9368ce..da1fb61201 100644
--- a/admin/inc/class.admin_account.inc.php
+++ b/admin/inc/class.admin_account.inc.php
@@ -325,7 +325,7 @@ class admin_account
 			$app = 'filemanager';
 			$sel_options['delete_apps'][] = array(
 				'value' => $app,
-				'label' => lang($app) . ': ' . lang('home directory')
+				'label' => lang($app) . ': /home'
 			);
 			$content['delete_apps'][] = $app;
 		}
diff --git a/admin/lang/egw_de.lang b/admin/lang/egw_de.lang
index 0884019fa2..ac523b1520 100644
--- a/admin/lang/egw_de.lang
+++ b/admin/lang/egw_de.lang
@@ -201,6 +201,7 @@ change config settings	admin	de	Konfiguration der Anwendung ändern
 change domain of email address and aliases	admin	de	ändert Domain von E-Mail-Adressen oder Aliase
 change login screen message	admin	de	Nachricht der Startseite ändern
 change owner	admin	de	Besitzer ändern
+change owner of found files to the new user, and move the home folder to /home/new-user/old-home-username.	admin	de	Ändert den Besitzer der gefundenen Dateien in /home auf den neuen Benutzer und verschiebt den Benutzerordner in /home/new-user/old-home-username.
 change password for %1	admin	de	Ändern des Passworts für %1
 change password hash to	admin	de	Passwort Verschlüsselung ändern in
 changed password hash for %1 to %2.	admin	de	Passwort Verschlüsselung für %1 ändern in %2.
diff --git a/admin/lang/egw_en.lang b/admin/lang/egw_en.lang
index f2db603457..42b96f4b35 100644
--- a/admin/lang/egw_en.lang
+++ b/admin/lang/egw_en.lang
@@ -201,7 +201,7 @@ change config settings	admin	en	Change config settings
 change domain of email address and aliases	admin	en	change domain of email address and aliases
 change login screen message	admin	en	Change login screen message
 change owner	admin	en	Change owner
-change owner of found files to the new user, and move the home folder to /home/new-user/old-home-username.	admin	en	Found files will have owner changed to the new user.  The home folder will be moved to /home/new-user/old-home-username.
+change owner of found files to the new user, and move the home folder to /home/new-user/old-home-username.	admin	en	Files in /home will have owner changed to the new user.  The home folder will be moved to /home/new-user/old-home-username.
 change password for %1	admin	en	Change password for %1
 change password hash to	admin	en	Change password hash to
 changed password hash for %1 to %2.	admin	en	Changed password hash for %1 to %2.
diff --git a/api/src/Vfs/Hooks.php b/api/src/Vfs/Hooks.php
index 6be56f2fb5..b885e23189 100644
--- a/api/src/Vfs/Hooks.php
+++ b/api/src/Vfs/Hooks.php
@@ -110,9 +110,9 @@ class Hooks
 			throw new Api\Exception\AssertionFailed(__METHOD__.'('.array2string($data).') account_lid NOT set!');
 		}
 
-		// Other files
+		// Other files in home
 		Api\Vfs::find(
-				'/',
+				'/home',
 				array('user' => $data['account_lid']),
 				$data['new_owner'] ? 'EGroupware\Api\Vfs::chown' : 'EGroupware\Api\Vfs::remove', $data['new_owner']
 		);