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:
parent
c24e5ea00e
commit
7b09ad4540
|
@ -483,7 +483,7 @@ if (defined($action) && ($action eq 'show_mime_examples')) {
|
||||||
($action eq 'gnupg_do'))) {
|
($action eq 'gnupg_do'))) {
|
||||||
# User wants to manage keys (only for encrypted mailing lists)
|
# User wants to manage keys (only for encrypted mailing lists)
|
||||||
my $subset = $q->param('gnupg_subset');
|
my $subset = $q->param('gnupg_subset');
|
||||||
if ($list && is_list_encrypted($list) && ($subset ne '')) {
|
if ($list && ($subset ne '')) {
|
||||||
if (($subset =~ /^[\w]*$/)
|
if (($subset =~ /^[\w]*$/)
|
||||||
&& (-e "$TEMPLATE_DIR/gnupg_$subset" . ".cs")) {
|
&& (-e "$TEMPLATE_DIR/gnupg_$subset" . ".cs")) {
|
||||||
if ($action eq 'gnupg_do') {
|
if ($action eq 'gnupg_do') {
|
||||||
|
@ -502,8 +502,7 @@ if (defined($action) && ($action eq 'show_mime_examples')) {
|
||||||
$pagename = 'list_select';
|
$pagename = 'list_select';
|
||||||
}
|
}
|
||||||
} elsif ($FEATURES{GPGKEYRING} && ($action eq 'gnupg_export')) {
|
} elsif ($FEATURES{GPGKEYRING} && ($action eq 'gnupg_export')) {
|
||||||
if ($list && is_list_encrypted($list)
|
if ($list && defined($q->param('gnupg_keyid'))) {
|
||||||
&& defined($q->param('gnupg_keyid'))) {
|
|
||||||
if (&gnupg_export_key($list, $q->param('gnupg_keyid'))) {
|
if (&gnupg_export_key($list, $q->param('gnupg_keyid'))) {
|
||||||
# the key was printed to stdout - we can exit now
|
# the key was printed to stdout - we can exit now
|
||||||
# TODO: this should be something like "skip_output" instead
|
# 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 {
|
sub get_dotqmail_files {
|
||||||
my $list = shift;
|
my $list = shift;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue