updated templates:
* support separate modules for GpgKeyRing and GpgEzmlm * revert to specifically support GpgEzmlm instead of the not-yet-released encryption plugin
This commit is contained in:
parent
0ffe2e9e35
commit
47cecc292e
|
@ -1,23 +0,0 @@
|
|||
<div class="title">
|
||||
<h1><?cs var:html_escape(Lang.Title.GnupgOptions) ?></h1>
|
||||
</div>
|
||||
|
||||
<div class="introduction">
|
||||
<p><?cs var:html_escape(Lang.Introduction.GnupgOptions) ?></p>
|
||||
</div>
|
||||
|
||||
<fieldset>
|
||||
<legend><?cs var:html_escape(Lang.Legend.GnupgOptions) ?> </legend>
|
||||
|
||||
<?cs call:form_header("config_encryption") ?>
|
||||
<input type="hidden" name="config_subset" value="encryption" />
|
||||
|
||||
<?cs call:show_options(UI.Options.Config.GnupgOptions) ?>
|
||||
|
||||
<ul><li>
|
||||
<input type="hidden" name="action" value="config_do" />
|
||||
<button type="submit" name="send" value="do"><?cs var:html_escape(Lang.Buttons.UpdateConfiguration) ?></button></li></ul>
|
||||
|
||||
</form>
|
||||
|
||||
</fieldset>
|
23
template/config_gpgezmlm.cs
Normal file
23
template/config_gpgezmlm.cs
Normal file
|
@ -0,0 +1,23 @@
|
|||
<div class="title">
|
||||
<h1><?cs var:html_escape(Lang.Title.GpgEzmlmOptions) ?></h1>
|
||||
</div>
|
||||
|
||||
<div class="introduction">
|
||||
<p><?cs var:html_escape(Lang.Introduction.GpgEzmlmOptions) ?></p>
|
||||
</div>
|
||||
|
||||
<fieldset>
|
||||
<legend><?cs var:html_escape(Lang.Legend.GpgEzmlmOptions) ?> </legend>
|
||||
|
||||
<?cs call:form_header("config_gpgezmlm") ?>
|
||||
<input type="hidden" name="config_subset" value="gpgezmlm" />
|
||||
|
||||
<?cs call:show_options(UI.Options.Config.GpgEzmlmOptions) ?>
|
||||
|
||||
<ul><li>
|
||||
<input type="hidden" name="action" value="config_do" />
|
||||
<button type="submit" name="send" value="do"><?cs var:html_escape(Lang.Buttons.UpdateConfiguration) ?></button></li></ul>
|
||||
|
||||
</form>
|
||||
|
||||
</fieldset>
|
|
@ -1,4 +1,4 @@
|
|||
<?cs if:Data.List.Features.Crypto ?>
|
||||
<?cs if:Data.List.Features.GpgKeyRing ?>
|
||||
<!-- comment for the key (second part of the human readable key description) -->
|
||||
|
||||
<label for="gnupg_keycomment"><?cs var:html_escape(Lang.Misc.GnupgKeyComment) ?>:</label>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?cs if:Data.List.Features.Crypto ?>
|
||||
<?cs if:Data.List.Features.GpgKeyRing ?>
|
||||
<!-- expiration of the key (in years) -->
|
||||
|
||||
<label for="gnupg_keyexpires"><?cs var:html_escape(Lang.Misc.GnupgKeyExpires) ?>:</label>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?cs if:Data.List.Features.Crypto ?>
|
||||
<?cs if:Data.List.Features.GpgKeyRing ?>
|
||||
<!-- name of the key (first part of the human readable key description) -->
|
||||
|
||||
<label for="gnupg_keyname"><?cs var:html_escape(Lang.Misc.GnupgKeyName) ?>:</label>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?cs if:Data.List.Features.Crypto ?>
|
||||
<?cs if:Data.List.Features.GpgKeyRing ?>
|
||||
<!-- REMOVE --><?cs include:TemplateDir + '/macros.cs' ?>
|
||||
<!-- length of the key (bytes) -->
|
||||
<label for="gnupg_keysize"><?cs var:html_escape(Lang.Misc.GnupgKeySize) ?>:</label>
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
<?cs if:Data.List.Features.Crypto ?>
|
||||
<!-- REMOVE --><?cs include:TemplateDir + '/macros.cs' ?>
|
||||
<!-- Gnupg: send plaintext if no key is available -->
|
||||
<?cs call:checkbox("gnupg_plain_without_key") ?>
|
||||
<?cs /if ?>
|
||||
|
6
template/config_options/gpgezmlm_nokeynocrypt.cs
Normal file
6
template/config_options/gpgezmlm_nokeynocrypt.cs
Normal file
|
@ -0,0 +1,6 @@
|
|||
<?cs if:Data.List.Features.GpgEzmlm ?>
|
||||
<!-- REMOVE --><?cs include:TemplateDir + '/macros.cs' ?>
|
||||
<!-- Gnupg: send warning without original content if no key is available -->
|
||||
<?cs call:checkbox("gpgezmlm_nokeynocrypt") ?>
|
||||
<?cs /if ?>
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?cs if:Data.List.Features.Crypto ?>
|
||||
<?cs if:Data.List.Features.GpgEzmlm ?>
|
||||
<!-- REMOVE --><?cs include:TemplateDir + '/macros.cs' ?>
|
||||
<!-- Gnupg: sign outgoing messages -->
|
||||
<?cs call:checkbox("gnupg_sign_messages") ?>
|
||||
<?cs call:checkbox("gpgezmlm_signmessages") ?>
|
||||
<?cs /if ?>
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
<div class="title">
|
||||
<h1><?cs var:html_escape(Lang.Title.GnupgConvert) ?></h1>
|
||||
</div>
|
||||
|
||||
<div class="introduction">
|
||||
<p><?cs var:html_escape(Lang.Introduction.GnupgConvert) ?></p>
|
||||
</div>
|
||||
|
||||
<fieldset>
|
||||
<legend><?cs var:html_escape(Lang.Legend.GnupgConvert) ?> </legend>
|
||||
|
||||
<?cs call:form_header("gnupg_convert") ?>
|
||||
<ul><li>
|
||||
<?cs if:Data.List.Features.Crypto
|
||||
?><button type="submit" name="send" value="do"><?cs
|
||||
var:html_escape(Lang.Buttons.GnupgConvertToPlain) ?></button>
|
||||
<input type="hidden" name="action" value="gnupg_convert_disable" /><?cs
|
||||
else
|
||||
?><button type="submit" name="send" value="do"><?cs
|
||||
var:html_escape(Lang.Buttons.GnupgConvertToEncrypted) ?></button>
|
||||
<input type="hidden" name="action" value="gnupg_convert_enable" /><?cs
|
||||
/if ?>
|
||||
</li></ul>
|
||||
</form>
|
||||
|
||||
</fieldset>
|
26
template/gpgezmlm_convert.cs
Normal file
26
template/gpgezmlm_convert.cs
Normal file
|
@ -0,0 +1,26 @@
|
|||
<div class="title">
|
||||
<h1><?cs var:html_escape(Lang.Title.GpgEzmlmConvert) ?></h1>
|
||||
</div>
|
||||
|
||||
<div class="introduction">
|
||||
<p><?cs var:html_escape(Lang.Introduction.GpgEzmlmConvert) ?></p>
|
||||
</div>
|
||||
|
||||
<fieldset>
|
||||
<legend><?cs var:html_escape(Lang.Legend.GpgEzmlmConvert) ?> </legend>
|
||||
|
||||
<?cs call:form_header("gpgezmlm_convert") ?>
|
||||
<ul><li>
|
||||
<?cs if:Data.List.Features.GpgEzmlm
|
||||
?><button type="submit" name="send" value="do"><?cs
|
||||
var:html_escape(Lang.Buttons.GpgEzmlmConvertToPlain) ?></button>
|
||||
<input type="hidden" name="action" value="gpgezmlm_convert_disable" /><?cs
|
||||
else
|
||||
?><button type="submit" name="send" value="do"><?cs
|
||||
var:html_escape(Lang.Buttons.GpgEzmlmConvertToEncrypted) ?></button>
|
||||
<input type="hidden" name="action" value="gpgezmlm_convert_enable" /><?cs
|
||||
/if ?>
|
||||
</li></ul>
|
||||
</form>
|
||||
|
||||
</fieldset>
|
|
@ -101,14 +101,14 @@
|
|||
"config_subset","processing") ?>"
|
||||
title="<?cs var:html_escape(Lang.Menue.ConfigProcess) ?>"><?cs
|
||||
var:html_escape(Lang.Menue.ConfigProcess) ?></a></li><?cs /if ?>
|
||||
<?cs if:(UI.Navigation.Config.GnupgOptions == 1) &&
|
||||
Data.List.Features.Crypto
|
||||
?><li><a <?cs if:(Data.Action == "config_encryption")
|
||||
<?cs if:(UI.Navigation.Config.GpgEzmlmOptions == 1) &&
|
||||
Data.List.Features.GpgEzmlm
|
||||
?><li><a <?cs if:(Data.Action == "config_gpgezmlm")
|
||||
?> class="nav_active"<?cs /if ?>
|
||||
href="<?cs call:link("list",Data.List.Name,"action","config_ask",
|
||||
"config_subset","encryption") ?>"
|
||||
title="<?cs var:html_escape(Lang.Menue.GnupgOptions) ?>"><?cs
|
||||
var:html_escape(Lang.Menue.GnupgOptions) ?></a></li><?cs /if ?>
|
||||
"config_subset","gpgezmlm") ?>"
|
||||
title="<?cs var:html_escape(Lang.Menue.GpgEzmlmOptions) ?>"><?cs
|
||||
var:html_escape(Lang.Menue.GpgEzmlmOptions) ?></a></li><?cs /if ?>
|
||||
<?cs if:UI.Navigation.Config.Archive == 1
|
||||
?><li><a <?cs if:(Data.Action == "config_archive") ?>
|
||||
class="nav_active"<?cs /if ?>
|
||||
|
@ -132,7 +132,7 @@
|
|||
var:html_escape(Lang.Menue.ConfigAll) ?></a></li><?cs /if ?>
|
||||
</ul></li>
|
||||
|
||||
<?cs if:(subcount(UI.Navigation.Gnupg) > 0) && (Data.List.Features.GpgKeyring)
|
||||
<?cs if:(subcount(UI.Navigation.Gnupg) > 0) && (Data.List.Features.GpgKeyRing)
|
||||
?><li><font class="no_link"><?cs var:html_escape(Lang.Menue.Gnupg)
|
||||
?></font>
|
||||
<ul>
|
||||
|
@ -166,12 +166,12 @@
|
|||
title="<?cs var:html_escape(Lang.Menue.TextFiles) ?>"><?cs
|
||||
var:html_escape(Lang.Menue.TextFiles) ?></a></li><?cs /if ?>
|
||||
|
||||
<?cs if:(UI.Navigation.GnupgConvert == 1) && Config.Features.Crypto
|
||||
?><li><a <?cs if:(Data.Action == "gnupg_convert")
|
||||
<?cs if:(UI.Navigation.GpgEzmlmConvert == 1) && Config.Features.GpgEzmlm
|
||||
?><li><a <?cs if:(Data.Action == "gpgezmlm_convert")
|
||||
?> class="nav_active"<?cs /if ?>
|
||||
href="<?cs call:link("list",Data.List.Name,"action","gnupg_convert_ask","","") ?>"
|
||||
title="<?cs var:html_escape(Lang.Menue.GnupgConvert) ?>"><?cs
|
||||
var:html_escape(Lang.Menue.GnupgConvert) ?></a></li><?cs /if ?>
|
||||
href="<?cs call:link("list",Data.List.Name,"action","gpgezmlm_convert_ask","","") ?>"
|
||||
title="<?cs var:html_escape(Lang.Menue.GpgEzmlmConvert) ?>"><?cs
|
||||
var:html_escape(Lang.Menue.GpgEzmlmConvert) ?></a></li><?cs /if ?>
|
||||
|
||||
<?cs if:UI.Navigation.SubscribeLog == 1
|
||||
?><li><a <?cs if:(Data.Action == "show_subscription_log")
|
||||
|
|
|
@ -29,7 +29,7 @@ UI {
|
|||
TextEdit = 1
|
||||
ListDelete = 1
|
||||
SubscribeLog = 1
|
||||
GnupgConvert = 1
|
||||
GpgEzmlmConvert = 1
|
||||
Help = 1
|
||||
}
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ UI {
|
|||
Subscription = 1
|
||||
Posting = 1
|
||||
Processing = 1
|
||||
GnupgOptions = 1
|
||||
GpgEzmlmOptions = 1
|
||||
Archive = 1
|
||||
Admin = 1
|
||||
All = 1
|
||||
|
@ -37,7 +37,7 @@ UI {
|
|||
TextEdit = 1
|
||||
ListDelete = 1
|
||||
SubscribeLog = 1
|
||||
GnupgConvert = 1
|
||||
GpgEzmlmConvert = 1
|
||||
Help = 1
|
||||
}
|
||||
|
||||
|
@ -131,9 +131,9 @@ UI {
|
|||
Path = mod_post_path
|
||||
}
|
||||
|
||||
GnupgOptions {
|
||||
SignMessages = gnupg_sign_messages
|
||||
PlainWithoutKey = gnupg_plain_without_key
|
||||
GpgEzmlmOptions {
|
||||
SignMessages = gpgezmlm_signmessages
|
||||
PlainWithoutKey = gpgezmlm_plainwithoutkey
|
||||
}
|
||||
|
||||
Processing {
|
||||
|
|
|
@ -22,7 +22,7 @@ UI {
|
|||
Subscription = 1
|
||||
Posting = 1
|
||||
Processing = 1
|
||||
GnupgOptions = 1
|
||||
GpgEzmlmOptions = 1
|
||||
Archive = 1
|
||||
Admin = 1
|
||||
}
|
||||
|
@ -36,7 +36,7 @@ UI {
|
|||
TextEdit = 1
|
||||
ListDelete = 1
|
||||
SubscribeLog = 1
|
||||
GnupgConvert = 1
|
||||
GpgEzmlmConvert = 1
|
||||
Help = 1
|
||||
}
|
||||
|
||||
|
@ -117,9 +117,9 @@ UI {
|
|||
MimeReject = mimereject
|
||||
}
|
||||
|
||||
GnupgOptions {
|
||||
SignMessages = gnupg_sign_messages
|
||||
PlainWithoutKey = gnupg_plain_without_key
|
||||
GpgEzmlmOptions {
|
||||
SignMessages = gpgezmlm_signmessages
|
||||
PlainWithoutKey = gpgezmlm_nokeynocrypt
|
||||
}
|
||||
|
||||
Processing {
|
||||
|
|
Loading…
Reference in a new issue