aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files_encryption')
-rw-r--r--apps/files_encryption/ajax/adminrecovery.php2
-rw-r--r--apps/files_encryption/ajax/changeRecoveryPassword.php2
-rw-r--r--apps/files_encryption/ajax/updatePrivateKeyPassword.php2
-rw-r--r--apps/files_encryption/files/error.php2
-rw-r--r--apps/files_encryption/l10n/bn_BD.php3
-rw-r--r--apps/files_encryption/l10n/da.php2
-rw-r--r--apps/files_encryption/l10n/et_EE.php1
-rw-r--r--apps/files_encryption/lib/session.php22
8 files changed, 20 insertions, 16 deletions
diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php
index 303ba0e16e1..070ca6f667e 100644
--- a/apps/files_encryption/ajax/adminrecovery.php
+++ b/apps/files_encryption/ajax/adminrecovery.php
@@ -13,7 +13,7 @@ use OCA\Encryption;
\OCP\JSON::checkAppEnabled('files_encryption');
\OCP\JSON::callCheck();
-$l = OC_L10N::get('files_encryption');
+$l = \OC::$server->getL10N('files_encryption');
$return = false;
// Enable recoveryAdmin
diff --git a/apps/files_encryption/ajax/changeRecoveryPassword.php b/apps/files_encryption/ajax/changeRecoveryPassword.php
index 99cc7b3cdde..71fbe333fe0 100644
--- a/apps/files_encryption/ajax/changeRecoveryPassword.php
+++ b/apps/files_encryption/ajax/changeRecoveryPassword.php
@@ -15,7 +15,7 @@ use OCA\Encryption;
\OCP\JSON::checkAppEnabled('files_encryption');
\OCP\JSON::callCheck();
-$l = OC_L10N::get('core');
+$l = \OC::$server->getL10N('core');
$return = false;
diff --git a/apps/files_encryption/ajax/updatePrivateKeyPassword.php b/apps/files_encryption/ajax/updatePrivateKeyPassword.php
index a14c9fe5076..f88e9c64dfd 100644
--- a/apps/files_encryption/ajax/updatePrivateKeyPassword.php
+++ b/apps/files_encryption/ajax/updatePrivateKeyPassword.php
@@ -15,7 +15,7 @@ use OCA\Encryption;
\OCP\JSON::checkAppEnabled('files_encryption');
\OCP\JSON::callCheck();
-$l = OC_L10N::get('core');
+$l = \OC::$server->getL10N('core');
$return = false;
diff --git a/apps/files_encryption/files/error.php b/apps/files_encryption/files/error.php
index b436587dfaf..c33a5a531f5 100644
--- a/apps/files_encryption/files/error.php
+++ b/apps/files_encryption/files/error.php
@@ -4,7 +4,7 @@ if (!isset($_)) { //also provide standalone error page
require_once __DIR__ . '/../../../lib/base.php';
require_once __DIR__ . '/../lib/crypt.php';
- $l = OC_L10N::get('files_encryption');
+ $l = \OC::$server->getL10N('files_encryption');
if (isset($_GET['errorCode'])) {
$errorCode = $_GET['errorCode'];
diff --git a/apps/files_encryption/l10n/bn_BD.php b/apps/files_encryption/l10n/bn_BD.php
index 63e335bd2b9..43699906e4d 100644
--- a/apps/files_encryption/l10n/bn_BD.php
+++ b/apps/files_encryption/l10n/bn_BD.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
-"Encryption" => "সংকেতায়ন"
+"Encryption" => "সংকেতায়ন",
+"Change Password" => "কূটশব্দ পরিবর্তন করুন"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php
index b455bf09bc4..dc2cf9e2475 100644
--- a/apps/files_encryption/l10n/da.php
+++ b/apps/files_encryption/l10n/da.php
@@ -30,6 +30,8 @@ $TRANSLATIONS = array(
"New Recovery key password" => "Ny Gendannelsesnøgle kodeord",
"Repeat New Recovery key password" => "Gentag dannelse af ny gendannaleses nøglekode",
"Change Password" => "Skift Kodeord",
+"Your private key password no longer matches your log-in password." => "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.",
+"Set your old private key password to your current log-in password:" => "Sæt dit gamle, private nøglekodeord til at være dit nuværende login-kodeord. ",
" If you don't remember your old password you can ask your administrator to recover your files." => "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer.",
"Old log-in password" => "Gammelt login kodeord",
"Current log-in password" => "Nuvrende login kodeord",
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index f6ef4d09956..7e298d8e663 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
"New Recovery key password" => "Uus taastevõtme parool",
"Repeat New Recovery key password" => "Korda uut taastevõtme parooli",
"Change Password" => "Muuda parooli",
+"Your private key password no longer matches your log-in password." => "Sinu provaatvõtme parool ei kattu enam sinu sisselogimise parooliga.",
" If you don't remember your old password you can ask your administrator to recover your files." => "Kui sa ei mäleta oma vana parooli, siis palu oma süsteemihalduril taastada ligipääs failidele.",
"Old log-in password" => "Vana sisselogimise parool",
"Current log-in password" => "Praegune sisselogimise parool",
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index ff8fbd24ecb..7bd4fd02421 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -117,7 +117,7 @@ class Session {
*/
public function setPrivateKey($privateKey) {
- \OC::$session->set('privateKey', $privateKey);
+ \OC::$server->getSession()->set('privateKey', $privateKey);
return true;
@@ -140,7 +140,7 @@ class Session {
*/
public function setInitialized($init) {
- \OC::$session->set('encryptionInitialized', $init);
+ \OC::$server->getSession()->set('encryptionInitialized', $init);
return true;
@@ -150,8 +150,8 @@ class Session {
* remove encryption keys and init status from session
*/
public function closeSession() {
- \OC::$session->remove('encryptionInitialized');
- \OC::$session->remove('privateKey');
+ \OC::$server->getSession()->remove('encryptionInitialized');
+ \OC::$server->getSession()->remove('privateKey');
}
@@ -162,8 +162,8 @@ class Session {
* @note this doesn not indicate of the init was successful, we just remeber the try!
*/
public function getInitialized() {
- if (!is_null(\OC::$session->get('encryptionInitialized'))) {
- return \OC::$session->get('encryptionInitialized');
+ if (!is_null(\OC::$server->getSession()->get('encryptionInitialized'))) {
+ return \OC::$server->getSession()->get('encryptionInitialized');
} else {
return self::NOT_INITIALIZED;
}
@@ -179,8 +179,8 @@ class Session {
if (\OCA\Encryption\Helper::isPublicAccess()) {
return $this->getPublicSharePrivateKey();
} else {
- if (!is_null(\OC::$session->get('privateKey'))) {
- return \OC::$session->get('privateKey');
+ if (!is_null(\OC::$server->getSession()->get('privateKey'))) {
+ return \OC::$server->getSession()->get('privateKey');
} else {
return false;
}
@@ -194,7 +194,7 @@ class Session {
*/
public function setPublicSharePrivateKey($privateKey) {
- \OC::$session->set('publicSharePrivateKey', $privateKey);
+ \OC::$server->getSession()->set('publicSharePrivateKey', $privateKey);
return true;
@@ -207,8 +207,8 @@ class Session {
*/
public function getPublicSharePrivateKey() {
- if (!is_null(\OC::$session->get('publicSharePrivateKey'))) {
- return \OC::$session->get('publicSharePrivateKey');
+ if (!is_null(\OC::$server->getSession()->get('publicSharePrivateKey'))) {
+ return \OC::$server->getSession()->get('publicSharePrivateKey');
} else {
return false;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-20 13:46:50 +0000