summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2014-05-20 17:54:14 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2014-06-14 10:14:07 +0200
commit961317d9114afda53a381802880d6c94af7ccb47 (patch)
treee35bf4e38e9b31f95c0b9b07b25ebb2e13e97a26
parent87b0021e5606888642b5798ba39b0525bf3f3e14 (diff)
downloadnextcloud-server-961317d9114afda53a381802880d6c94af7ccb47.tar.gz
nextcloud-server-961317d9114afda53a381802880d6c94af7ccb47.zip
make sure to enable incognito mode when mounting a public link and update init status of the encryption app
-rw-r--r--apps/files_encryption/lib/session.php2
-rw-r--r--apps/files_sharing/lib/connector/publicauth.php1
2 files changed, 3 insertions, 0 deletions
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 93be6691f96..ef18b924dd8 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -100,6 +100,8 @@ class Session {
$privateKey = Crypt::decryptPrivateKey($encryptedKey, '');
$this->setPublicSharePrivateKey($privateKey);
+ $this->setInitialized(\OCA\Encryption\Session::INIT_SUCCESSFUL);
+
\OC_FileProxy::$enabled = $proxyStatus;
}
}
diff --git a/apps/files_sharing/lib/connector/publicauth.php b/apps/files_sharing/lib/connector/publicauth.php
index ec7b68ba69c..c9d545180b3 100644
--- a/apps/files_sharing/lib/connector/publicauth.php
+++ b/apps/files_sharing/lib/connector/publicauth.php
@@ -38,6 +38,7 @@ class PublicAuth extends \Sabre\DAV\Auth\Backend\AbstractBasic {
*/
protected function validateUserPass($username, $password) {
$linkItem = \OCP\Share::getShareByToken($username, false);
+ \OC_User::setIncognitoMode(true);
$this->share = $linkItem;
if (!$linkItem) {
return false;