Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/richdocuments.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2020-11-11 14:24:48 +0300
committerJulius Härtl <jus@bitgrid.net>2020-11-12 19:46:36 +0300
commitc3cfb05c12351e09c31dd429370199406704831a (patch)
tree2eabb461d77de5f58be5ca735e7de26b656b51a9 /lib
parent73d0342f875919973238ba2f6a97393ef632a7b5 (diff)
Properly check against empty values for remote server
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib')
-rw-r--r--lib/Controller/WopiController.php6
-rw-r--r--lib/Db/Wopi.php4
2 files changed, 5 insertions, 5 deletions
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;