Strip of users home path from share api message

Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/19528/head
Joas Schilling 6 years ago
parent a1fc233fcb
commit e97d643969
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
  1. 6
      lib/private/Share20/Manager.php
  2. 3
      tests/lib/Share20/ManagerTest.php

@ -289,7 +289,8 @@ class Manager implements IManager {
// Check if we actually have share permissions
if (!$share->getNode()->isShareable()) {
$message_t = $this->l->t('You are not allowed to share %s', [$share->getNode()->getPath()]);
$path = $userFolder->getRelativePath($share->getNode()->getPath());
$message_t = $this->l->t('You are not allowed to share %s', [$path]);
throw new GenericShareException($message_t, $message_t, 404);
}
@ -333,7 +334,8 @@ class Manager implements IManager {
// Check that we do not share with more permissions than we have
if ($share->getPermissions() & ~$permissions) {
$message_t = $this->l->t('Can’t increase permissions of %s', [$share->getNode()->getPath()]);
$path = $userFolder->getRelativePath($share->getNode()->getPath());
$message_t = $this->l->t('Can’t increase permissions of %s', [$path]);
throw new GenericShareException($message_t, $message_t, 404);
}

@ -708,6 +708,9 @@ class ManagerTest extends \Test\TestCase {
$userFolder = $this->createMock(Folder::class);
$userFolder->method('getPath')->willReturn('myrootfolder');
$userFolder->expects($this->any())
->method('getRelativePath')
->willReturnArgument(0);
$this->rootFolder->method('getUserFolder')->willReturn($userFolder);

Loading…
Cancel
Save