diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-12-03 16:52:44 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-12-09 09:47:26 +0100 |
| commit | efac8ced90879f34919eb55055423523b146d33e (patch) | |
| tree | ee2778caa0a8ddf5c181a590625d98081e0c7d63 /apps/files_encryption/lib/session.php | |
| parent | 78a307995c510c0184d915fcab26baa3be815342 (diff) | |
| download | nextcloud-server-efac8ced90879f34919eb55055423523b146d33e.tar.gz nextcloud-server-efac8ced90879f34919eb55055423523b146d33e.zip | |
Update OCA\Encryption to OCA\Files_Encryption in the encryption app itself
Diffstat (limited to 'apps/files_encryption/lib/session.php')
| -rw-r--r-- | apps/files_encryption/lib/session.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php index e84befb6ede..4c70bc7e8fc 100644 --- a/apps/files_encryption/lib/session.php +++ b/apps/files_encryption/lib/session.php @@ -72,8 +72,8 @@ class Session { Keymanager::setPublicKey($keypair['publicKey'], $publicShareKeyId); // Encrypt private key empty passphrase - $cipher = \OCA\Encryption\Helper::getCipher(); - $encryptedKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($keypair['privateKey'], '', $cipher); + $cipher = Helper::getCipher(); + $encryptedKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], '', $cipher); if ($encryptedKey) { Keymanager::setPrivateSystemKey($encryptedKey, $publicShareKeyId); } else { @@ -82,7 +82,7 @@ class Session { } - if (\OCA\Encryption\Helper::isPublicAccess() && !self::getPublicSharePrivateKey()) { + if (Helper::isPublicAccess() && !self::getPublicSharePrivateKey()) { // Disable encryption proxy to prevent recursive calls $proxyStatus = \OC_FileProxy::$enabled; \OC_FileProxy::$enabled = false; @@ -151,7 +151,7 @@ class Session { public function getInitialized() { if (!is_null(\OC::$server->getSession()->get('encryptionInitialized'))) { return \OC::$server->getSession()->get('encryptionInitialized'); - } else if (\OCA\Encryption\Helper::isPublicAccess() && self::getPublicSharePrivateKey()) { + } else if (Helper::isPublicAccess() && self::getPublicSharePrivateKey()) { return self::INIT_SUCCESSFUL; } else { return self::NOT_INITIALIZED; @@ -165,7 +165,7 @@ class Session { */ public function getPrivateKey() { // return the public share private key if this is a public access - if (\OCA\Encryption\Helper::isPublicAccess()) { + if (Helper::isPublicAccess()) { return self::getPublicSharePrivateKey(); } else { if (!is_null(\OC::$server->getSession()->get('privateKey'))) { |