diff options
| author | Julius Härtl <jus@bitgrid.net> | 2019-05-19 20:30:07 +0300 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2019-05-19 20:30:07 +0300 |
| commit | 45dc32fc6c5b4ebb0efd2dd8a932ccfe216dde3a (patch) | |
| tree | 9d352023cbfaec2bcf7d12c4859281275ebb64d4 /lib | |
| parent | 53792b37f6a6b00dcfd7c8958a4012c0627d5247 (diff) | |
Improve user list for sessions though the public link
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Controller/DocumentController.php | 2 | ||||
| -rw-r--r-- | lib/Controller/WopiController.php | 3 | ||||
| -rw-r--r-- | lib/TokenManager.php | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php index 1ba3abbf..734ad41d 100644 --- a/lib/Controller/DocumentController.php +++ b/lib/Controller/DocumentController.php @@ -288,7 +288,7 @@ class DocumentController extends Controller { $item = $node; } if ($item instanceof Node) { - list($urlSrc, $token) = $this->tokenManager->getToken($item->getId(), $shareToken); + list($urlSrc, $token) = $this->tokenManager->getToken($item->getId(), $shareToken, $this->uid); $params = [ 'permissions' => $share->getPermissions(), 'title' => $item->getName(), diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php index 647b6dc0..7484ec44 100644 --- a/lib/Controller/WopiController.php +++ b/lib/Controller/WopiController.php @@ -139,11 +139,12 @@ class WopiController extends Controller { return new JSONResponse([], Http::STATUS_FORBIDDEN); } + $guestUserId = 'Guest-' . \OC::$server->getSecureRandom()->generate(8); $response = [ 'BaseFileName' => $file->getName(), 'Size' => $file->getSize(), 'Version' => $version, - 'UserId' => !is_null($wopi->getEditorUid()) ? $wopi->getEditorUid() : 'guest', + 'UserId' => !is_null($wopi->getEditorUid()) ? $wopi->getEditorUid() : $guestUserId, 'OwnerId' => $wopi->getOwnerUid(), 'UserFriendlyName' => !is_null($wopi->getEditorUid()) ? \OC_User::getDisplayName($wopi->getEditorUid()) : $wopi->getGuestDisplayname(), 'UserExtraInfo' => [ diff --git a/lib/TokenManager.php b/lib/TokenManager.php index 0d73e45f..63787596 100644 --- a/lib/TokenManager.php +++ b/lib/TokenManager.php @@ -163,8 +163,8 @@ class TokenManager { } $serverHost = $this->urlGenerator->getAbsoluteURL('/');//$this->request->getServerProtocol() . '://' . $this->request->getServerHost(); - if ($this->userId === null && isset($_COOKIE['guestUser'])) { - $guest_name = $this->trans->t('Guest: %s', \OC_Util::sanitizeHTML($_COOKIE['guestUser'])); + if ($this->userId === null && isset($_COOKIE['guestUser']) && $_COOKIE['guestUser'] !== '') { + $guest_name = $this->trans->t('%s (Guest)', \OC_Util::sanitizeHTML($_COOKIE['guestUser'])); } else { $guest_name = NULL; } |