[Pkg-owncloud-commits] [owncloud] 113/223: make sure to enable incognito mode when mounting a public link and update init status of the encryption app
David Prévot
taffit at moszumanska.debian.org
Sun Jun 22 01:54:13 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 961317d9114afda53a381802880d6c94af7ccb47
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date: Tue May 20 17:54:14 2014 +0200
make sure to enable incognito mode when mounting a public link and update init status of the encryption app
---
apps/files_encryption/lib/session.php | 2 ++
apps/files_sharing/lib/connector/publicauth.php | 1 +
2 files changed, 3 insertions(+)
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 93be669..ef18b92 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 ec7b68b..c9d5451 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;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list