byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some postfix 'if'

Browse Source
This commit is contained in:
Jared Johnson 2015-01-14 16:05:42 -06:00
parent f8e220e3b5
commit 029db84771
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/ident/geoip
View File

@ -350,8 +350,12 @@ sub set_country_code {
sub get_country_code { sub get_country_code {
my $self = shift; my $self = shift;
my $ip = shift || $self->qp->connection->remote_ip; my $ip = shift || $self->qp->connection->remote_ip;
return $self->get_country_code_gc($ip) if $self->{_geoip_city}; if ( $self->{_geoip_city} ) {
return $self->{_geoip}->country_code_by_addr($ip) if $self->{_geoip}; return $self->get_country_code_gc($ip);
}
if ( $self->{_geoip} ) {
return $self->{_geoip}->country_code_by_addr($ip);
}
return undef; return undef;
} }
@ -374,8 +378,12 @@ sub set_country_name {
sub get_country_name { sub get_country_name {
my $self = shift; my $self = shift;
my $ip = shift || $self->qp->connection->remote_ip; my $ip = shift || $self->qp->connection->remote_ip;
return $self->get_country_name_gc($ip) if $self->{_geoip_city}; if ( $self->{_geoip_city} ) {
return $self->{_geoip}->country_name_by_addr($ip) if $self->{_geoip}; return $self->get_country_name_gc($ip);
}
if ( $self->{_geoip} ) {
return $self->{_geoip}->country_name_by_addr($ip);
}
return undef; return undef;
} }
@ -396,9 +404,12 @@ sub set_continent {
sub get_continent { sub get_continent {
my ( $self, $country_code ) = @_; my ( $self, $country_code ) = @_;
return if ! $country_code; return if ! $country_code;
return $self->get_continent_gc() if $self->{_geoip_city}; if ( $self->{_geoip_city} ) {
return $self->{_geoip}->continent_code_by_country_code($country_code) return $self->get_continent_gc();
if $self->{_geoip}; }
if ( $self->{_geoip} ) {
return $self->{_geoip}->continent_code_by_country_code($country_code);
}
return undef; return undef;
} }