diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-02-27 01:50:24 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-02-27 01:50:24 -0800 |
| commit | 1d0f88642d94e7bbc4861c7c08290967794883b3 (patch) | |
| tree | ec21c669f73704af02fb0e6c6fb386a74437abde /FS/FS/svc_broadband.pm | |
| parent | efa799391aeba085b65145428cab1cf1074d3f6d (diff) | |
| parent | 0babd0e62f87f5c36535b30c40002c5c1abff7ea (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'FS/FS/svc_broadband.pm')
| -rwxr-xr-x | FS/FS/svc_broadband.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm index 87c73f2..01495ca 100755 --- a/FS/FS/svc_broadband.pm +++ b/FS/FS/svc_broadband.pm @@ -243,7 +243,7 @@ Returns the IP address. sub label { my $self = shift; my $label = 'IP:'. ($self->ip_addr || 'Unknown'); - $label .= '", MAC:'. $self->mac_addr + $label .= ', MAC:'. $self->mac_addr if $self->mac_addr; $label .= ' ('. $self->description. ')' if $self->description; @@ -311,7 +311,7 @@ sub check { # remove delimiters my $mac_addr = uc($self->get('mac_addr')); - $mac_addr =~ s/[-: ]//g; + $mac_addr =~ s/[\W_]//g; $self->set('mac_addr', $mac_addr); my $error = |