summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files_encryption')
-rw-r--r--apps/files_encryption/l10n/el.php6
-rw-r--r--apps/files_encryption/l10n/es.php6
-rw-r--r--apps/files_encryption/l10n/et_EE.php6
-rw-r--r--apps/files_encryption/l10n/fr.php6
-rw-r--r--apps/files_encryption/l10n/id.php20
-rw-r--r--apps/files_encryption/l10n/pl.php1
-rw-r--r--apps/files_encryption/l10n/pt_PT.php6
-rw-r--r--apps/files_encryption/l10n/ru.php6
-rw-r--r--apps/files_encryption/l10n/sl.php6
-rw-r--r--apps/files_encryption/l10n/uk.php44
-rw-r--r--[-rwxr-xr-x]apps/files_encryption/lib/crypt.php7
-rw-r--r--[-rwxr-xr-x]apps/files_encryption/lib/helper.php12
-rw-r--r--[-rwxr-xr-x]apps/files_encryption/lib/keymanager.php0
-rwxr-xr-xapps/files_encryption/tests/crypt.php8
-rw-r--r--apps/files_encryption/tests/helper.php18
-rw-r--r--apps/files_encryption/tests/hooks.php8
-rw-r--r--apps/files_encryption/tests/keymanager.php8
-rw-r--r--apps/files_encryption/tests/proxy.php8
-rwxr-xr-xapps/files_encryption/tests/share.php8
-rw-r--r--apps/files_encryption/tests/stream.php8
-rwxr-xr-xapps/files_encryption/tests/trashbin.php8
-rwxr-xr-xapps/files_encryption/tests/util.php9
-rwxr-xr-xapps/files_encryption/tests/webdav.php8
23 files changed, 198 insertions, 19 deletions
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index e1fabbb169c..5d293e7a06f 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -1,9 +1,15 @@
<?php
$TRANSLATIONS = array(
"Unknown error" => "Άγνωστο σφάλμα",
+"Missing recovery key password" => "Λείπει το κλειδί επαναφοράς κωδικού",
+"Please repeat the recovery key password" => "Παρακαλώ επαναλάβετε το κλειδί επαναφοράς κωδικού",
+"Repeated recovery key password does not match the provided recovery key password" => "Η επανάληψη του κλειδιού επαναφοράς κωδικού δεν ταιριάζει με το δοσμένο κλειδί επαναφοράς κωδικού",
"Recovery key successfully enabled" => "Επιτυχής ενεργοποίηση κλειδιού ανάκτησης",
"Could not disable recovery key. Please check your recovery key password!" => "Αποτυχία απενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
"Recovery key successfully disabled" => "Επιτυχής απενεργοποίηση κλειδιού ανάκτησης",
+"Please provide the old recovery password" => "Παρακαλώ παρέχετε τον παλιό κωδικό επαναφοράς",
+"Please provide a new recovery password" => "Παρακαλώ παρέχετε ένα νέο κωδικό επαναφοράς",
+"Please repeat the new recovery password" => "Παρακαλώ επαναλάβετε το νέο κωδικό επαναφοράς",
"Password successfully changed." => "Ο κωδικός αλλάχτηκε επιτυχώς.",
"Could not change the password. Maybe the old password was not correct." => "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
"Private key password successfully updated." => "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς",
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 164db17f4a7..d26aa449b3b 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -1,9 +1,15 @@
<?php
$TRANSLATIONS = array(
"Unknown error" => "Error desconocido",
+"Missing recovery key password" => "Falta contraseña de recuperacion.",
+"Please repeat the recovery key password" => "Por favor repita la contraseña de recuperacion",
+"Repeated recovery key password does not match the provided recovery key password" => "la contraseña de recuperacion repetida no es igual a la contraseña de recuperacion",
"Recovery key successfully enabled" => "Se ha habilitado la recuperación de archivos",
"Could not disable recovery key. Please check your recovery key password!" => "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
+"Please provide the old recovery password" => "Por favor ingrese su antigua contraseña de recuperacion",
+"Please provide a new recovery password" => "Por favor ingrese una nueva contraseña de recuperacion",
+"Please repeat the new recovery password" => "Por favor repita su nueva contraseña de recuperacion",
"Password successfully changed." => "Su contraseña ha sido cambiada",
"Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
"Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.",
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index 0d786b6ce7d..7362c61bc71 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -1,9 +1,15 @@
<?php
$TRANSLATIONS = array(
"Unknown error" => "Tundmatu viga",
+"Missing recovery key password" => "Muuda taastevõtme parool",
+"Please repeat the recovery key password" => "Palun korda uut taastevõtme parooli",
+"Repeated recovery key password does not match the provided recovery key password" => "Lahtritesse sisestatud taastevõtme paroolid ei kattu",
"Recovery key successfully enabled" => "Taastevõtme lubamine õnnestus",
"Could not disable recovery key. Please check your recovery key password!" => "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
"Recovery key successfully disabled" => "Taastevõtme keelamine õnnestus",
+"Please provide the old recovery password" => "Palun sisesta vana taastevõtme parool",
+"Please provide a new recovery password" => "Palun sisesta uus taastevõtme parool",
+"Please repeat the new recovery password" => "Palun korda uut taastevõtme parooli",
"Password successfully changed." => "Parool edukalt vahetatud.",
"Could not change the password. Maybe the old password was not correct." => "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
"Private key password successfully updated." => "Privaatse võtme parool edukalt uuendatud.",
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index 44919fbc0a3..2ca5eec48f0 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -1,9 +1,15 @@
<?php
$TRANSLATIONS = array(
"Unknown error" => "Erreur Inconnue ",
+"Missing recovery key password" => "Mot de passe de la clef de récupération manquant",
+"Please repeat the recovery key password" => "Répétez le mot de passe de la clé de récupération",
+"Repeated recovery key password does not match the provided recovery key password" => "Le mot de passe de la clé de récupération et sa répétition ne sont pas identiques.",
"Recovery key successfully enabled" => "Clé de récupération activée avec succès",
"Could not disable recovery key. Please check your recovery key password!" => "Impossible de désactiver la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
"Recovery key successfully disabled" => "Clé de récupération désactivée avec succès",
+"Please provide the old recovery password" => "Veuillez entrer l'ancien mot de passe de récupération",
+"Please provide a new recovery password" => "Veuillez entrer un nouveau mot de passe de récupération",
+"Please repeat the new recovery password" => "Veuillez répéter le nouveau mot de passe de récupération",
"Password successfully changed." => "Mot de passe changé avec succès ",
"Could not change the password. Maybe the old password was not correct." => "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
"Private key password successfully updated." => "Mot de passe de la clé privé mis à jour avec succès.",
diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
index c31c3e52089..c1d171d1fc0 100644
--- a/apps/files_encryption/l10n/id.php
+++ b/apps/files_encryption/l10n/id.php
@@ -1,19 +1,31 @@
<?php
$TRANSLATIONS = array(
-"Unknown error" => "Galat tidak diketahui",
+"Unknown error" => "Kesalahan tidak diketahui",
+"Missing recovery key password" => "Sandi kunci pemuliahan hilang",
+"Please repeat the recovery key password" => "Silakan ulangi sandi kunci pemulihan",
+"Repeated recovery key password does not match the provided recovery key password" => "Sandi kunci pemulihan yang diulangi tidak cocok dengan sandi kunci pemulihan yang diberikan",
"Recovery key successfully enabled" => "Kunci pemulihan berhasil diaktifkan",
"Could not disable recovery key. Please check your recovery key password!" => "Tidak dapat menonaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
"Recovery key successfully disabled" => "Kunci pemulihan berhasil dinonaktifkan",
+"Please provide the old recovery password" => "Mohon berikan sandi pemulihan lama",
+"Please provide a new recovery password" => "Mohon berikan sandi pemulihan baru",
+"Please repeat the new recovery password" => "Silakan ulangi sandi pemulihan baru",
"Password successfully changed." => "Sandi berhasil diubah",
"Could not change the password. Maybe the old password was not correct." => "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.",
"Private key password successfully updated." => "Sandi kunci privat berhasil diperbarui.",
"Could not update the private key password. Maybe the old password was not correct." => "Tidak dapat memperbarui sandi kunci privat. Kemungkinan sandi lama yang Anda masukkan salah.",
"File recovery settings updated" => "Pengaturan pemulihan berkas diperbarui",
"Could not update file recovery" => "Tidak dapat memperbarui pemulihan berkas",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Aplikasi enkripsi tidak dimulai! Kemungkinan aplikasi enkripsi telah diaktifkan ulang saat sesi Anda. Silakan coba untuk keluar dan kembali lagi untuk memulai aplikasi enkripsi.",
+"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Kunci private Anda tidak sah! Nampaknya sandi Anda telah diubah diluar %s (misal direktori perusahaan Anda). Anda dapat memperbarui sandi kunci private untuk memulihakan akses ke berkas terenkripsi Anda.",
"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Tidak dapat mendekripsi berkas ini, mungkin ini adalah berkas bersama. Silakan meminta pemilik berkas ini untuk membagikan kembali dengan Anda.",
-"Missing requirements." => "Persyaratan yang hilang.",
+"Unknown error. Please check your system settings or contact your administrator" => "Kesalahan tidak diketahui. Silakan periksa pengaturan sistem Anda atau hubungi administrator",
+"Missing requirements." => "Persyaratan tidak terpenuhi.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Pastikan bahwa PHP 5.3.3 atau yang lebih baru telah diinstal dan OpenSSL bersama ekstensi PHP telah diaktifkan dan dikonfigurasi dengan benar. Untuk saat ini, aplikasi enkripsi akan dinonaktifkan.",
"Following users are not set up for encryption:" => "Pengguna berikut belum diatur untuk enkripsi:",
-"Initial encryption started... This can take some time. Please wait." => "Inisial enskripsi dijalankan... Ini dapat memakan waktu. Silakan tunggu.",
+"Initial encryption started... This can take some time. Please wait." => "Enskripsi awal dijalankan... Ini dapat memakan waktu. Silakan tunggu.",
+"Initial encryption running... Please try again later." => "Enkripsi awal sedang berjalan... Sialakn coba lagi nanti.",
+"Go directly to your %spersonal settings%s." => "Langsung ke %spengaturan pribadi%s Anda.",
"Encryption" => "Enkripsi",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
"Enable recovery key (allow to recover users files in case of password loss):" => "Aktifkan kunci pemulihan (memungkinkan pengguna untuk memulihkan berkas dalam kasus kehilangan sandi):",
@@ -26,6 +38,8 @@ $TRANSLATIONS = array(
"New Recovery key password" => "Sandi kunci Pemulihan Baru",
"Repeat New Recovery key password" => "Ulangi sandi kunci Pemulihan baru",
"Change Password" => "Ubah sandi",
+"Your private key password no longer matches your log-in password." => "Sandi kunci private Anda tidak lagi cocok dengan sandi masuk Anda.",
+"Set your old private key password to your current log-in password:" => "Setel sandi kunci private Anda untuk sandi masuk Anda saat ini:",
" If you don't remember your old password you can ask your administrator to recover your files." => "Jika Anda tidak ingat sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
"Old log-in password" => "Sandi masuk yang lama",
"Current log-in password" => "Sandi masuk saat ini",
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index b7a66462ef2..c52c3ddee99 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -1,6 +1,7 @@
<?php
$TRANSLATIONS = array(
"Unknown error" => "Nieznany błąd",
+"Please repeat the recovery key password" => "Proszę powtórz nowe hasło klucza odzyskiwania",
"Recovery key successfully enabled" => "Klucz odzyskiwania włączony",
"Could not disable recovery key. Please check your recovery key password!" => "Nie można wyłączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
"Recovery key successfully disabled" => "Klucz odzyskiwania wyłączony",
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index aede53f6414..e52165492d9 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -1,9 +1,15 @@
<?php
$TRANSLATIONS = array(
"Unknown error" => "Erro Desconhecido",
+"Missing recovery key password" => "Palavra-passe de recuperação em falta",
+"Please repeat the recovery key password" => "Repita a palavra-passe de recuperação",
+"Repeated recovery key password does not match the provided recovery key password" => "A palavra-passe de recuperação repetida não corresponde à palavra-passe fornecida",
"Recovery key successfully enabled" => "A chave de recuperação foi ativada com sucesso",
"Could not disable recovery key. Please check your recovery key password!" => "Não foi possível desativar a chave de recuperação. Por favor, verifique a senha da chave de recuperação.",
"Recovery key successfully disabled" => "A chave de recuperação foi desativada com sucesso",
+"Please provide the old recovery password" => "Escreva a palavra-passe de recuperação antiga",
+"Please provide a new recovery password" => "Escreva a nova palavra-passe de recuperação",
+"Please repeat the new recovery password" => "Escreva de novo a nova palavra-passe de recuperação",
"Password successfully changed." => "Senha alterada com sucesso.",
"Could not change the password. Maybe the old password was not correct." => "Não foi possível alterar a senha. Possivelmente a senha antiga não está correta.",
"Private key password successfully updated." => "A senha da chave privada foi atualizada com sucesso. ",
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index 16c0f05cc71..0a4e2cbbc27 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,9 +1,15 @@
<?php
$TRANSLATIONS = array(
"Unknown error" => "Неизвестная ошибка",
+"Missing recovery key password" => "Отсутствует пароль восстановления ключа",
+"Please repeat the recovery key password" => "Пожалуйста, повторите пароль восстановления ключа",
+"Repeated recovery key password does not match the provided recovery key password" => "Пароль восстановления ключа и его повтор не совпадают",
"Recovery key successfully enabled" => "Ключ восстановления успешно установлен",
"Could not disable recovery key. Please check your recovery key password!" => "Невозможно выключить ключ восстановления. Проверьте правильность пароля от ключа!",
"Recovery key successfully disabled" => "Ключ восстановления успешно отключен",
+"Please provide the old recovery password" => "Пожалуйста, введите старый пароль для восстановления",
+"Please provide a new recovery password" => "Пожалуйста, введите новый пароль для восстановления",
+"Please repeat the new recovery password" => "Пожалуйста, повторите новый пароль для восстановления",
"Password successfully changed." => "Пароль изменен удачно.",
"Could not change the password. Maybe the old password was not correct." => "Невозможно изменить пароль. Возможно старый пароль не был верен.",
"Private key password successfully updated." => "Пароль секретного ключа успешно обновлён.",
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index 7c0f438fe4e..83fef18ea0a 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -1,9 +1,15 @@
<?php
$TRANSLATIONS = array(
"Unknown error" => "Neznana napaka",
+"Missing recovery key password" => "Manjka ključ za obnovitev",
+"Please repeat the recovery key password" => "Ponovite vpis ključa za obnovitev",
+"Repeated recovery key password does not match the provided recovery key password" => "Ponovljen vpis ključa za obnovitev ni enak prvemu vpisu tega ključa",
"Recovery key successfully enabled" => "Ključ za obnovitev gesla je uspešno nastavljen",
"Could not disable recovery key. Please check your recovery key password!" => "Ključa za obnovitev gesla ni mogoče onemogočiti. Preverite ključ!",
"Recovery key successfully disabled" => "Ključ za obnovitev gesla je uspešno onemogočen",
+"Please provide the old recovery password" => "Vpišite star ključ za obnovitev",
+"Please provide a new recovery password" => "Vpišite nov ključ za obnovitev",
+"Please repeat the new recovery password" => "Ponovno vpišite nov ključ za obnovitev",
"Password successfully changed." => "Geslo je uspešno spremenjeno.",
"Could not change the password. Maybe the old password was not correct." => "Gesla ni mogoče spremeniti. Morda vnos starega gesla ni pravilen.",
"Private key password successfully updated." => "Zasebni ključ za geslo je uspešno posodobljen.",
diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php
index a2f67ebec75..674d5445bb7 100644
--- a/apps/files_encryption/l10n/uk.php
+++ b/apps/files_encryption/l10n/uk.php
@@ -1,8 +1,50 @@
<?php
$TRANSLATIONS = array(
"Unknown error" => "Невідома помилка",
+"Missing recovery key password" => "Відсутній пароль ключа відновлення",
+"Please repeat the recovery key password" => "Введіть ще раз пароль для ключа відновлення",
+"Repeated recovery key password does not match the provided recovery key password" => "Введені паролі ключа відновлення не співпадають",
+"Recovery key successfully enabled" => "Ключ відновлення підключено",
+"Could not disable recovery key. Please check your recovery key password!" => "Не вдалося відключити ключ відновлення. Будь ласка, перевірте пароль ключа відновлення!",
+"Recovery key successfully disabled" => "Ключ відновлення відключено",
+"Please provide the old recovery password" => "Будь ласка, введіть старий пароль відновлення",
+"Please provide a new recovery password" => "Будь ласка, введіть новий пароль відновлення",
+"Please repeat the new recovery password" => "Будь ласка, введіть новий пароль відновлення ще раз",
+"Password successfully changed." => "Пароль змінено.",
+"Could not change the password. Maybe the old password was not correct." => "Не вдалося змінити пароль. Можливо ви неправильно ввели старий пароль.",
+"Private key password successfully updated." => "Пароль секретного ключа оновлено.",
+"Could not update the private key password. Maybe the old password was not correct." => "Не вдалося оновити пароль секретного ключа. Можливо ви не правильно ввели старий пароль.",
+"File recovery settings updated" => "Налаштування файла відновлення оновлено",
+"Could not update file recovery" => "Не вдалося оновити файл відновлення ",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Додаток шифрувння не ініціалізовано! Можливо цей додаток редагувався під час вашої сесії. Будь ласка, спробуйте вийти і зайти знову щоб проініціалізувати додаток шифрування.",
+"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ваш секретний ключ не дійсний! Ймовірно ваш пароль був змінений ззовні %s (наприклад, корпоративний каталог). Ви можете оновити секретний ключ в особистих налаштуваннях на сторінці відновлення доступу до зашифрованих файлів.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Не можу розшифрувати цей файл, можливо він опублікований. Будь ласка, попросіть власника опублікувати його заново.",
+"Unknown error. Please check your system settings or contact your administrator" => "Невідома помилка. Будь ласка, перевірте налаштування системи або зверніться до адміністратора.",
+"Missing requirements." => "Відсутні вимоги.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Будь ласка, впевніться, що встановлена версія PHP 5.3.3 або новіша, а також, що OpenSSL та інші розширення PHP підключені та вірно налаштовані. На даний момент додаток шифрування відключений.",
+"Following users are not set up for encryption:" => "Для наступних користувачів шифрування не налаштоване:",
+"Initial encryption started... This can take some time. Please wait." => "Початкове шифрування почалося... Це може зайняти деякий час. Будь ласка, почекайте.",
+"Initial encryption running... Please try again later." => "Початкове шифрування працює... Це може зайняти деякий час. Будь ласка, почекайте.",
+"Go directly to your %spersonal settings%s." => "Перейти навпростець до ваших %spersonal settings%s.",
"Encryption" => "Шифрування",
"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
-"Change Password" => "Змінити Пароль"
+"Enable recovery key (allow to recover users files in case of password loss):" => "Ввімкнути ключ відновлення (дозволяє користувачам відновлювати файли при втраті паролю):",
+"Recovery key password" => "Пароль ключа відновлення",
+"Repeat Recovery key password" => "Введіть ще раз пароль ключа відновлення",
+"Enabled" => "Увімкнено",
+"Disabled" => "Вимкнено",
+"Change recovery key password:" => "Змінити пароль ключа відновлення:",
+"Old Recovery key password" => "Старий пароль ключа відновлення",
+"New Recovery key password" => "Новий пароль ключа відновлення",
+"Repeat New Recovery key password" => "Введіть ще раз новий пароль ключа відновлення",
+"Change Password" => "Змінити Пароль",
+"Your private key password no longer matches your log-in password." => "Пароль вашого закритого ключа більше не відповідає паролю від вашого облікового запису.",
+"Set your old private key password to your current log-in password:" => "Замініть старий пароль від закритого ключа на новий пароль входу:",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Якщо ви не пам'ятаєте ваш старий пароль, ви можете звернутися до адміністратора щоб його відновити.",
+"Old log-in password" => "Старий пароль входу",
+"Current log-in password" => "Поточний пароль входу",
+"Update Private Key Password" => "Оновити пароль для закритого ключа",
+"Enable password recovery:" => "Ввімкнути відновлення паролю:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Включення цієї опції дозволить вам отримати доступ до своїх зашифрованих файлів у випадку втрати паролю"
);
$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index c4fc29db03a..59b191097af 100755..100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -24,6 +24,7 @@
*/
namespace OCA\Encryption;
+use OCA\Encryption\Exceptions\EncryptionException;
/**
* Class for common cryptography functionality
@@ -289,9 +290,9 @@ class Crypt {
$padded = self::addPadding($catfile);
return $padded;
- } catch (OCA\Encryption\Exceptions\EncryptionException $e) {
- $message = 'Could not encrypt file content (code: ' . $e->getCode . '): ';
- \OCP\Util::writeLog('files_encryption', $message . $e->getMessage, \OCP\Util::ERROR);
+ } catch (EncryptionException $e) {
+ $message = 'Could not encrypt file content (code: ' . $e->getCode() . '): ';
+ \OCP\Util::writeLog('files_encryption', $message . $e->getMessage(), \OCP\Util::ERROR);
return false;
}
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index ab19938d633..53c380ab2b3 100755..100644
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -89,7 +89,7 @@ class Helper {
* @param string $password
* @return bool
*/
- public static function setupUser($util, $password) {
+ public static function setupUser(Util $util, $password) {
// Check files_encryption infrastructure is ready for action
if (!$util->ready()) {
@@ -333,7 +333,7 @@ class Helper {
* @param string $path
* @param \OC\Files\View $view
*/
- public static function mkdirr($path, $view) {
+ public static function mkdirr($path, \OC\Files\View $view) {
$dirname = \OC\Files\Filesystem::normalizePath(dirname($path));
$dirParts = explode('/', $dirname);
$dir = "";
@@ -348,8 +348,10 @@ class Helper {
/**
* redirect to a error page
* @param Session $session
+ * @param int|null $errorCode
+ * @throws \Exception
*/
- public static function redirectToErrorPage($session, $errorCode = null) {
+ public static function redirectToErrorPage(Session $session, $errorCode = null) {
if ($errorCode === null) {
$init = $session->getInitialized();
@@ -439,7 +441,7 @@ class Helper {
* @param \OC\Files\View $rootView root view, relative to data/
* @return array list of share key files, path relative to data/$user
*/
- public static function findShareKeys($filePath, $shareKeyPath, $rootView) {
+ public static function findShareKeys($filePath, $shareKeyPath, \OC\Files\View $rootView) {
$result = array();
$user = \OCP\User::getUser();
@@ -461,7 +463,7 @@ class Helper {
} else {
\OC_Log::write(
'Encryption library',
- 'No share key found for user "' . $user . '" for file "' . $pathOld . '"',
+ 'No share key found for user "' . $user . '" for file "' . $fileName . '"',
\OC_Log::WARN
);
}
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 9560126ef33..9560126ef33 100755..100644
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 1bebb3cd36c..a89754d4a14 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -102,6 +102,14 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
public static function tearDownAfterClass() {
// cleanup test user
\OC_User::deleteUser(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
+
+ \OC_Hook::clear();
+ \OC_FileProxy::clearProxies();
+
+ // Delete keys in /data/
+ $view = new \OC\Files\View('/');
+ $view->rmdir('public-keys');
+ $view->rmdir('owncloud_private_key');
}
/**
diff --git a/apps/files_encryption/tests/helper.php b/apps/files_encryption/tests/helper.php
index b94fdeb4d6c..df7ff8cdb11 100644
--- a/apps/files_encryption/tests/helper.php
+++ b/apps/files_encryption/tests/helper.php
@@ -20,18 +20,27 @@ class Test_Encryption_Helper extends \PHPUnit_Framework_TestCase {
const TEST_ENCRYPTION_HELPER_USER1 = "test-helper-user1";
const TEST_ENCRYPTION_HELPER_USER2 = "test-helper-user2";
- public static function setUpBeforeClass() {
+ public function setUp() {
// create test user
\Test_Encryption_Util::loginHelper(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER2, true);
\Test_Encryption_Util::loginHelper(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER1, true);
}
- public static function tearDownAfterClass() {
+ public function tearDown() {
// cleanup test user
\OC_User::deleteUser(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER1);
\OC_User::deleteUser(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER2);
+ }
+
+ public static function tearDownAfterClass() {
+
\OC_Hook::clear();
\OC_FileProxy::clearProxies();
+
+ // Delete keys in /data/
+ $view = new \OC\Files\View('/');
+ $view->rmdir('public-keys');
+ $view->rmdir('owncloud_private_key');
}
/**
@@ -157,11 +166,6 @@ class Test_Encryption_Helper extends \PHPUnit_Framework_TestCase {
$result
);
}
-
- // clean up
- $rootView->unlink($baseDir);
- \Test_Encryption_Util::logoutHelper();
- \OC_User::deleteUser($userName);
}
}
diff --git a/apps/files_encryption/tests/hooks.php b/apps/files_encryption/tests/hooks.php
index 14d44fe5bb3..c7353deee22 100644
--- a/apps/files_encryption/tests/hooks.php
+++ b/apps/files_encryption/tests/hooks.php
@@ -117,6 +117,14 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
// cleanup test user
\OC_User::deleteUser(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1);
\OC_User::deleteUser(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2);
+
+ \OC_Hook::clear();
+ \OC_FileProxy::clearProxies();
+
+ // Delete keys in /data/
+ $view = new \OC\Files\View('/');
+ $view->rmdir('public-keys');
+ $view->rmdir('owncloud_private_key');
}
function testDisableHook() {
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index e8a9d7dda53..ad7d2cfcd45 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -98,6 +98,14 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
if (self::$stateFilesTrashbin) {
OC_App::enable('files_trashbin');
}
+
+ \OC_Hook::clear();
+ \OC_FileProxy::clearProxies();
+
+ // Delete keys in /data/
+ $view = new \OC\Files\View('/');
+ $view->rmdir('public-keys');
+ $view->rmdir('owncloud_private_key');
}
/**
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index 42637a52e04..56d6cd2f736 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -89,6 +89,14 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
public static function tearDownAfterClass() {
// cleanup test user
\OC_User::deleteUser(\Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1);
+
+ \OC_Hook::clear();
+ \OC_FileProxy::clearProxies();
+
+ // Delete keys in /data/
+ $view = new \OC\Files\View('/');
+ $view->rmdir('public-keys');
+ $view->rmdir('owncloud_private_key');
}
/**
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 1cd7cfc738b..f4ce94b7ee9 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -124,6 +124,14 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4);
+
+ \OC_Hook::clear();
+ \OC_FileProxy::clearProxies();
+
+ // Delete keys in /data/
+ $view = new \OC\Files\View('/');
+ $view->rmdir('public-keys');
+ $view->rmdir('owncloud_private_key');
}
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index 254c5e87ed1..b8c18fbe049 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -96,6 +96,14 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
public static function tearDownAfterClass() {
// cleanup test user
\OC_User::deleteUser(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1);
+
+ \OC_Hook::clear();
+ \OC_FileProxy::clearProxies();
+
+ // Delete keys in /data/
+ $view = new \OC\Files\View('/');
+ $view->rmdir('public-keys');
+ $view->rmdir('owncloud_private_key');
}
function testStreamOptions() {
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
index ae0974431be..5890292cd7b 100755
--- a/apps/files_encryption/tests/trashbin.php
+++ b/apps/files_encryption/tests/trashbin.php
@@ -110,6 +110,14 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
public static function tearDownAfterClass() {
// cleanup test user
\OC_User::deleteUser(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1);
+
+ \OC_Hook::clear();
+ \OC_FileProxy::clearProxies();
+
+ // Delete keys in /data/
+ $view = new \OC\Files\View('/');
+ $view->rmdir('public-keys');
+ $view->rmdir('owncloud_private_key');
}
/**
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 811530546e8..d5bfb86a2e4 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -124,9 +124,18 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER2);
\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+
//cleanup groups
\OC_Group::deleteGroup(self::TEST_ENCRYPTION_UTIL_GROUP1);
\OC_Group::deleteGroup(self::TEST_ENCRYPTION_UTIL_GROUP2);
+
+ \OC_Hook::clear();
+ \OC_FileProxy::clearProxies();
+
+ // Delete keys in /data/
+ $view = new \OC\Files\View('/');
+ $view->rmdir('public-keys');
+ $view->rmdir('owncloud_private_key');
}
public static function setupHooks() {
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
index c46d3bf0899..cc0cff9aa5c 100755
--- a/apps/files_encryption/tests/webdav.php
+++ b/apps/files_encryption/tests/webdav.php
@@ -108,6 +108,14 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
public static function tearDownAfterClass() {
// cleanup test user
\OC_User::deleteUser(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
+
+ \OC_Hook::clear();
+ \OC_FileProxy::clearProxies();
+
+ // Delete keys in /data/
+ $view = new \OC\Files\View('/');
+ $view->rmdir('public-keys');
+ $view->rmdir('owncloud_private_key');
}
/**
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 08:45:31 +0000