From 7b09ad45409e80f6d92dcd6902c2ad6b027124a1 Mon Sep 17 00:00:00 2001 From: lars Date: Mon, 29 Sep 2008 20:44:55 +0000 Subject: [PATCH] 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 --- ezmlm-web.cgi | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/ezmlm-web.cgi b/ezmlm-web.cgi index 0c2e0c9..b7fd335 100755 --- a/ezmlm-web.cgi +++ b/ezmlm-web.cgi @@ -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;