summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-09-28 12:53:33 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-09-28 12:53:33 +0200
commitd007c32907fbd0f11e8866b9f735d8eab78b06d9 (patch)
treeb29e164ec9a1313d57502eb1c44c07a014622336
parent716ff81b27658580dcbe306e6cbe2c0cad8b1411 (diff)
parentb4998e7d299a3a7727878f95df41343e3b5ed426 (diff)
downloadnextcloud-server-d007c32907fbd0f11e8866b9f735d8eab78b06d9.tar.gz
nextcloud-server-d007c32907fbd0f11e8866b9f735d8eab78b06d9.zip
Merge pull request #19402 from owncloud/public-recognizeauthsession
Allow public webdav auth to recognize sesssion
-rw-r--r--apps/files_sharing/lib/connector/publicauth.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/connector/publicauth.php b/apps/files_sharing/lib/connector/publicauth.php
index b1c269867f5..9d1bf391560 100644
--- a/apps/files_sharing/lib/connector/publicauth.php
+++ b/apps/files_sharing/lib/connector/publicauth.php
@@ -82,10 +82,13 @@ class PublicAuth extends \Sabre\DAV\Auth\Backend\AbstractBasic {
}
return true;
+ } else if (\OC::$server->getSession()->exists('public_link_authenticated')
+ && \OC::$server->getSession()->get('public_link_authenticated') === $linkItem['id']) {
+ return true;
} else {
return false;
}
- } elseif ($linkItem['share_type'] == \OCP\Share::SHARE_TYPE_REMOTE) {
+ } else if ($linkItem['share_type'] == \OCP\Share::SHARE_TYPE_REMOTE) {
return true;
} else {
return false;