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

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-10-20 15:25:59 +0300
committerThomas Müller <thomas.mueller@tmit.eu>2015-10-20 15:25:59 +0300
commitc16a847163bdcfd36790d1bb90fc55421cf52210 (patch)
tree6bf9a78f86bcba5c06d12d6affefc2b8d9a570d0
parentc2ded337e602c6113c4adeb9071ef6581dfa5a81 (diff)
parentdf4348674b23d4be6764c31cdfb3a71774eed763 (diff)
Merge pull request #19832 from owncloud/stable8.1-public-recognizeauthsession
[stable8.1] Allow public 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;