From 141eaab9c4babb883f75fae3b96519dd6a4362a2 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 17 Sep 2020 16:19:41 +0200 Subject: add mount point to quota warning message makes it more clear to the user what the quota applies to Signed-off-by: Robin Appelman --- lib/private/legacy/helper.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php index 0f7b2d1b3af..387999a96da 100644 --- a/lib/private/legacy/helper.php +++ b/lib/private/legacy/helper.php @@ -544,6 +544,7 @@ class OC_Helper { if($owner) { $ownerDisplayName = $owner->getDisplayName(); } + [,,,$mountPoint] = explode('/', $mount->getMountPoint(), 4); return [ 'free' => $free, @@ -553,7 +554,8 @@ class OC_Helper { 'relative' => $relative, 'owner' => $ownerId, 'ownerDisplayName' => $ownerDisplayName, - 'mountType' => $mount->getMountType() + 'mountType' => $mount->getMountType(), + 'mountPoint' => trim($mountPoint, '/'), ]; } -- cgit v1.2.3 From e29eb55f8b709c420689571964dae8e36b18fa37 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 21 Oct 2020 13:37:56 +0200 Subject: Only use index of mount point when it is there Signed-off-by: Joas Schilling --- lib/private/legacy/helper.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php index 387999a96da..ae933421bce 100644 --- a/lib/private/legacy/helper.php +++ b/lib/private/legacy/helper.php @@ -544,7 +544,11 @@ class OC_Helper { if($owner) { $ownerDisplayName = $owner->getDisplayName(); } - [,,,$mountPoint] = explode('/', $mount->getMountPoint(), 4); + if (substr_count($mount->getMountPoint(), '/') < 3) { + $mountPoint = ''; + } else { + [,,,$mountPoint] = explode('/', $mount->getMountPoint(), 4); + } return [ 'free' => $free, -- cgit v1.2.3