Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 08:27:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into master

Browse source
This commit is contained in:
Maarten 2024-02-25 11:31:49 +01:00 • committed by GitHub
commit 2b0ca5d314
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
49 changed files with 399 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

9
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/SMime.php
View file

@ -173,6 +173,15 @@ trait SMime
return $this->DefaultResponse($result);
}
public function DoSMimeImportCertificate() : array
{
return $this->DefaultResponse(
$this->SMIME()->storeCertificate(
$this->GetActionParam('pem', '')
)
);
}
public function DoSMimeImportCertificatesFromMessage() : array
{
/*

1
snappymail/v/0.0.0/app/localization/ar-SA/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "S\/MIME signed message",
"ENCRYPTED_MESSAGE": "S\/MIME encrypted message",

1
snappymail/v/0.0.0/app/localization/bg-BG/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "Подписано с S\/MIME",
"ENCRYPTED_MESSAGE": "Шифровано с S\/MIME",

1
snappymail/v/0.0.0/app/localization/cs-CZ/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "Zpráva podepsaná S\/MIME",
"ENCRYPTED_MESSAGE": "Zpráva šifrovaná S\/MIME",

1
snappymail/v/0.0.0/app/localization/da-DK/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "S\/MIME signeret meddelelse",
"ENCRYPTED_MESSAGE": "S\/MIME krypteret meddelelse",

1
snappymail/v/0.0.0/app/localization/de-DE/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "S\/MIME-signierte Nachricht",
"ENCRYPTED_MESSAGE": "S\/MIME-verschlüsselte Nachricht",

1
snappymail/v/0.0.0/app/localization/el-GR/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "Μήνυμα υπογεγραμμένο με S\/MIME",
"ENCRYPTED_MESSAGE": "Μήνυμα κωδικοποιημένο με S\/MIME",

1
snappymail/v/0.0.0/app/localization/en-GB/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "S\/MIME signed message",
"ENCRYPTED_MESSAGE": "S\/MIME encrypted message",

1
snappymail/v/0.0.0/app/localization/en/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S/MIME certificate",
"CERTIFICATES": "S/MIME Certificates",
"SIGNED_MESSAGE": "S/MIME signed message",
"ENCRYPTED_MESSAGE": "S/MIME encrypted message",

1
snappymail/v/0.0.0/app/localization/es-ES/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "Mensaje firmado mediante S\/MIME",
"ENCRYPTED_MESSAGE": "Mensaje cifrado mediante S\/MIME",

1
snappymail/v/0.0.0/app/localization/et-EE/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "S\/MIME abil signeeritud kiri",
"ENCRYPTED_MESSAGE": "S\/MIME abil krüpteeritud kiri",

1
snappymail/v/0.0.0/app/localization/eu/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "S\/MIME sinatutako mezua",
"ENCRYPTED_MESSAGE": "S\/MIME zifratutako mezua",

1
snappymail/v/0.0.0/app/localization/fa-IR/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "پیام توسط S\/MIME امضاء شد",
"ENCRYPTED_MESSAGE": "پیام توسط S\/MIME رمزنگاری شد",

1
snappymail/v/0.0.0/app/localization/fi-FI/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "S\/MIME allekirjoitettu viesti",
"ENCRYPTED_MESSAGE": "S\/MIME salattu visti",

1
snappymail/v/0.0.0/app/localization/fr-FR/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "Message signé par S\/MIME",
"ENCRYPTED_MESSAGE": "Message chiffré par S\/MIME",

1
snappymail/v/0.0.0/app/localization/hu-HU/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "S\/MIME aláírt üzenet",
"ENCRYPTED_MESSAGE": "S\/MIME kódolt üzenet",

1
snappymail/v/0.0.0/app/localization/id-ID/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "Pesan bertanda-tangan S\/MIME",
"ENCRYPTED_MESSAGE": "Pesan terenkripsi S\/MIME",

1
snappymail/v/0.0.0/app/localization/is-IS/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "Skeyti undirritað með S\/MIME",
"ENCRYPTED_MESSAGE": "Skeyti dulritað með S\/MIME",

1
snappymail/v/0.0.0/app/localization/it-IT/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "Messaggio firmato con S\/MIME",
"ENCRYPTED_MESSAGE": "Messaggio cifrato con S\/MIME",

1
snappymail/v/0.0.0/app/localization/ja-JP/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "S\/MIME署名済みメッセージ",
"ENCRYPTED_MESSAGE": "S\/MIME暗号化メッセージ",

1
snappymail/v/0.0.0/app/localization/ko-KR/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "S\/MIME로 서명된 메세지입니다.",
"ENCRYPTED_MESSAGE": "S\/MIME로 암호화된 메세지입니다.",

1
snappymail/v/0.0.0/app/localization/lt-LT/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "S\/MIME pasirašytas pranešimas",
"ENCRYPTED_MESSAGE": "S\/MIME šifruotas pranešimas",

1
snappymail/v/0.0.0/app/localization/lv-LV/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "S\/MIME signed message",
"ENCRYPTED_MESSAGE": "S\/MIME encrypted message",

1
snappymail/v/0.0.0/app/localization/nb-NO/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "S\/MIME-signert melding",
"ENCRYPTED_MESSAGE": "S\/MIME-kryptert melding",

1
snappymail/v/0.0.0/app/localization/nl-NL/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Maak een back-up van de privésleutel op de server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Importeer S\/MIME certificaat",
"CERTIFICATES": "S\/MIME Certificaten",
"SIGNED_MESSAGE": "S\/MIME ondertekend bericht",
"ENCRYPTED_MESSAGE": "S\/MIME versleuteld bericht",

1
snappymail/v/0.0.0/app/localization/pl-PL/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Utwórz kopię zapasową klucza prywatnego na serwerze"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "Certyfikaty S\/MIME",
"SIGNED_MESSAGE": "Wiadomość podpisana S\/MIME",
"ENCRYPTED_MESSAGE": "Wiadomość zaszyfrowana S\/MIME",

1
snappymail/v/0.0.0/app/localization/pt-BR/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "Mensagem assinada com S\/MIME",
"ENCRYPTED_MESSAGE": "Mensagem criptografada com S\/MIME",

1
snappymail/v/0.0.0/app/localization/pt-PT/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "Mensagem assinada com S\/MIME",
"ENCRYPTED_MESSAGE": "Mensagem encriptada com S\/MIME",

1
snappymail/v/0.0.0/app/localization/pt/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "Mensagem assinada com S\/MIME",
"ENCRYPTED_MESSAGE": "Mensagem encriptada com S\/MIME",

1
snappymail/v/0.0.0/app/localization/ro-RO/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "S\/MIME signed message",
"ENCRYPTED_MESSAGE": "S\/MIME encrypted message",

1
snappymail/v/0.0.0/app/localization/ru-RU/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "S\/MIME подписанное сообщение",
"ENCRYPTED_MESSAGE": "S\/MIME шифрованное сообщение",

1
snappymail/v/0.0.0/app/localization/sk-SK/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "Správa podpísaná s S\/MIME",
"ENCRYPTED_MESSAGE": "Správa šifrovaná s S\/MIME",

1
snappymail/v/0.0.0/app/localization/sl-SI/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "Sporočilo, podpisano z S\/MIME",
"ENCRYPTED_MESSAGE": "Sporočilo, šifrirano z S\/MIME",

1
snappymail/v/0.0.0/app/localization/sv-SE/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "S\/MIME-signerat meddelande",
"ENCRYPTED_MESSAGE": "S\/MIME-krypterat meddelande",

1
snappymail/v/0.0.0/app/localization/tr-TR/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "S\/MIME imzalı mesaj",
"ENCRYPTED_MESSAGE": "S\/MIME şifreli mesaj",

1
snappymail/v/0.0.0/app/localization/uk-UA/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "S\/MIME підписане повідомлення",
"ENCRYPTED_MESSAGE": "S\/MIME шифроване повідомлення",

1
snappymail/v/0.0.0/app/localization/vi-VN/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "Thư đã được ký xác nhận bằng mã S\/MIME",
"ENCRYPTED_MESSAGE": "Thư đã được mã hóa bởi S\/MIME",

1
snappymail/v/0.0.0/app/localization/zh-CN/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "由 S\/MIME 签名",
"ENCRYPTED_MESSAGE": "由 S\/MIME 加密",

1
snappymail/v/0.0.0/app/localization/zh-TW/user.json
View file

@ -302,6 +302,7 @@
"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
},
"SMIME": {
"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
"CERTIFICATES": "S\/MIME Certificates",
"SIGNED_MESSAGE": "已透過 S\/MIME 簽署郵件",
"ENCRYPTED_MESSAGE": "已透過 S\/MIME 加密郵件",

13
snappymail/v/0.0.0/app/templates/Views/User/PopupsSMimeImport.html Normal file
View file

@ -0,0 +1,13 @@
<header>
<a href="#" class="close" data-bind="click: close">×</a>
<h3 data-i18n="SMIME/POPUP_IMPORT_TITLE"></h3>
</header>
<form id="smime-import" class="modal-body" autocomplete="off" data-bind="submit: submitForm">
<div class="alert" data-bind="visible: pemError() && pemErrorMessage(), text: pemErrorMessage"></div>
<div class="control-group" data-bind="css: {'error': pemError}">
<textarea class="input-xxlarge" rows="14" autofocus="" autocomplete="off" data-bind="value: pem" required=""></textarea>
</div>
</form>
<footer>
<button class="btn" form="smime-import" data-icon="✚" data-i18n="OPENPGP/POPUP_IMPORT_BUTTON"></button>
</footer>

2
snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
View file

@ -125,6 +125,8 @@
<details>
<summary class="legend" data-i18n="SMIME/CERTIFICATES"></summary>
<button class="btn" data-bind="click: importToSMime" data-icon="✚" data-i18n="OPENPGP/POPUP_IMPORT_BUTTON"></button>
<table class="table table-hover list-table">
<tbody data-bind="foreach: smimeCertificates, i18nUpdate: smimeCertificates">
<tr>