Fix public link user relative (#170)

* Fixes #164 Don't allow relative save if it's a public link

* Fix "no name for guest user"

Check if editor is equal to null, not ''
master^2
Pranav Kant 6 years ago committed by Andras Timar
parent 5beca83bc9
commit 327dd432ad

@ -114,13 +114,13 @@ class WopiController extends Controller {
'BaseFileName' => $file->getName(), 'BaseFileName' => $file->getName(),
'Size' => $file->getSize(), 'Size' => $file->getSize(),
'Version' => $version, 'Version' => $version,
'UserId' => $res['editor'] !== '' ? $res['editor'] : 'Guest user', 'UserId' => !is_null($res['editor']) ? $res['editor'] : 'guest',
'OwnerId' => $res['owner'], 'OwnerId' => $res['owner'],
'UserFriendlyName' => $res['editor'] !== '' ? \OC_User::getDisplayName($res['editor']) : 'Guest user', 'UserFriendlyName' => !is_null($res['editor']) ? \OC_User::getDisplayName($res['editor']) : 'Guest user',
'UserExtraInfo' => [ 'UserExtraInfo' => [
], ],
'UserCanWrite' => $res['canwrite'] ? true : false, 'UserCanWrite' => $res['canwrite'] ? true : false,
'UserCanNotWriteRelative' => \OC::$server->getEncryptionManager()->isEnabled() ? true : false, 'UserCanNotWriteRelative' => \OC::$server->getEncryptionManager()->isEnabled() ? true : is_null($res['editor']),
'PostMessageOrigin' => $res['server_host'], 'PostMessageOrigin' => $res['server_host'],
'LastModifiedTime' => Helper::toISO8601($file->getMtime()) 'LastModifiedTime' => Helper::toISO8601($file->getMtime())
]; ];

Loading…
Cancel
Save