r422@erker: lars | 2008-09-28 17:58:58 +0200

web interface code:
 * keyring management is also accessible for plaintext lists
 * function "is_list_encrypted" is obsolete
This commit is contained in:
lars 2008-09-29 20:44:55 +00:00
parent c24e5ea00e
commit 7b09ad4540

View file

@ -483,7 +483,7 @@ if (defined($action) && ($action eq 'show_mime_examples')) {
($action eq 'gnupg_do'))) {
# User wants to manage keys (only for encrypted mailing lists)
my $subset = $q->param('gnupg_subset');
if ($list && is_list_encrypted($list) && ($subset ne '')) {
if ($list && ($subset ne '')) {
if (($subset =~ /^[\w]*$/)
&& (-e "$TEMPLATE_DIR/gnupg_$subset" . ".cs")) {
if ($action eq 'gnupg_do') {
@ -502,8 +502,7 @@ if (defined($action) && ($action eq 'show_mime_examples')) {
$pagename = 'list_select';
}
} elsif ($FEATURES{GPGKEYRING} && ($action eq 'gnupg_export')) {
if ($list && is_list_encrypted($list)
&& defined($q->param('gnupg_keyid'))) {
if ($list && defined($q->param('gnupg_keyid'))) {
if (&gnupg_export_key($list, $q->param('gnupg_keyid'))) {
# the key was printed to stdout - we can exit now
# TODO: this should be something like "skip_output" instead
@ -1417,18 +1416,6 @@ sub get_list_part {
# ---------------------------------------------------------------------------
sub is_list_encrypted {
my $list = shift;
if ($list->isa("Mail::Ezmlm::GpgEzmlm")) {
return (0==0);
} else {
return (0==1);
}
}
# ---------------------------------------------------------------------------
sub get_dotqmail_files {
my $list = shift;