module Mail::Ezmlm:

* fixed warning in function 'get_charset'
* improved code style
This commit is contained in:
lars 2008-09-27 23:15:53 +00:00
parent 24c9ddb067
commit 7479782d18

View file

@ -52,7 +52,7 @@ require Exporter;
@EXPORT = qw( @EXPORT = qw(
); );
$VERSION = '0.08'; $VERSION = '0.09';
require 5.005; require 5.005;
@ -148,7 +148,7 @@ sub make {
sub update { sub update {
my($self, $switches) = @_; my($self, $switches) = @_;
my($outhost, $inlocal); my($outhost, $inlocal);
# Do we have the command line switches # Do we have the command line switches
($self->_seterror(-1, 'nothing to update()') && return 0) unless(defined($switches)); ($self->_seterror(-1, 'nothing to update()') && return 0) unless(defined($switches));
$switches = '-e' . $switches; $switches = '-e' . $switches;
@ -204,11 +204,11 @@ sub getconfig {
my($options); my($options);
# Read the config file # Read the config file
if(-e "$self->{'LIST_NAME'}/flags") { if(-e $self->{LIST_NAME} . "/flags") {
# this file exists since ezmlm-idx-5.0.0 # this file exists since ezmlm-idx-5.0.0
# 'config' is not authorative anymore since that version # 'config' is not authorative anymore since that version
$options = $self->_getconfig_idx5(); $options = $self->_getconfig_idx5();
} elsif(open(CONFIG, "<$self->{'LIST_NAME'}/config")) { } elsif(open(CONFIG, "<" . $self->{LIST_NAME} . "/config")) {
# 'config' contains the authorative information # 'config' contains the authorative information
while(<CONFIG>) { while(<CONFIG>) {
if (/^F:-(\w+)/) { if (/^F:-(\w+)/) {
@ -245,7 +245,7 @@ sub setlist {
if ($list =~ m/^([\w\d\_\-\.\/\@]+)$/) { if ($list =~ m/^([\w\d\_\-\.\/\@]+)$/) {
$list = $1; $list = $1;
if (-e "$list/lock") { if (-e "$list/lock") {
$self->_seterror(undef); $self->_seterror(undef);
return $self->{'LIST_NAME'} = $list; return $self->{'LIST_NAME'} = $list;
} else { } else {
$self->_seterror(-1, "$list does not appear to be a valid list in setlist()"); $self->_seterror(-1, "$list does not appear to be a valid list in setlist()");
@ -551,7 +551,8 @@ sub set_lang {
sub get_charset { sub get_charset {
my ($self) = shift; my ($self) = shift;
my $charset; my $charset;
chomp($charset = $self->getpart('charset')); $charset = $self->getpart('charset');
$charset = '' unless defined($charset);
# default if no 'charset' file exists # default if no 'charset' file exists
$charset = 'us-ascii' if ($charset eq ''); $charset = 'us-ascii' if ($charset eq '');
return $charset; return $charset;