From c3cfb05c12351e09c31dd429370199406704831a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 11 Nov 2020 12:24:48 +0100 Subject: Properly check against empty values for remote server MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/Controller/WopiController.php | 6 +++--- lib/Db/Wopi.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php index 9aa55362..4000c38b 100644 --- a/lib/Controller/WopiController.php +++ b/lib/Controller/WopiController.php @@ -225,7 +225,7 @@ class WopiController extends Controller { $response['UserExtraInfo']['avatar'] = $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $wopi->getEditorUid(), 'size' => 32]); } - if ($wopi->getRemoteServer() !== '') { + if (!empty($wopi->getRemoteServer())) { $response = $this->setFederationFileInfo($wopi, $response); } @@ -511,7 +511,7 @@ class WopiController extends Controller { // Unless the editor is empty (public link) we modify the files as the current editor $editor = $wopi->getEditorUid(); - if ($editor === null || $wopi->getRemoteServer() !== '') { + if ($editor === null || !empty($wopi->getRemoteServer())) { $editor = $wopi->getOwnerUid(); } @@ -650,7 +650,7 @@ class WopiController extends Controller { private function getFileForWopiToken(Wopi $wopi) { $file = null; - if ($wopi->getRemoteServer() !== '') { + if (!empty($wopi->getRemoteServer())) { $share = $this->shareManager->getShareByToken($wopi->getEditorUid()); $node = $share->getNode(); if ($node instanceof Folder) { diff --git a/lib/Db/Wopi.php b/lib/Db/Wopi.php index 5845219a..529e6b6c 100644 --- a/lib/Db/Wopi.php +++ b/lib/Db/Wopi.php @@ -96,10 +96,10 @@ class Wopi extends Entity { protected $isRemoteToken; /** @var string */ - protected $remoteServer; + protected $remoteServer = ''; /** @var string */ - protected $remoteServerToken; + protected $remoteServerToken = ''; /** @var string */ protected $share; -- cgit v1.2.3