diff options
author | Ivan Kohler <ivan@freeside.biz> | 2013-09-10 01:33:25 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2013-09-10 01:33:25 -0700 |
commit | ec9b0f903dfa57efc0c82791b9efa74f0c746bc0 (patch) | |
tree | a2deef2c89f770fafce26f3d5d1b5770fc7c0536 /FS/FS/svc_broadband.pm | |
parent | fcadc3a661a041b9119c287ade346e70f108f335 (diff) |
svc_cable service have a single serial / MAC / model, not one-to-many devices like svc_phone and svc_dsl, RT#22009
Diffstat (limited to 'FS/FS/svc_broadband.pm')
-rwxr-xr-x | FS/FS/svc_broadband.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm index b5012caa3..6073902e8 100755 --- a/FS/FS/svc_broadband.pm +++ b/FS/FS/svc_broadband.pm @@ -234,10 +234,11 @@ sub search_sql { my( $class, $string ) = @_; if ( $string =~ /^(\d{1,3}\.){3}\d{1,3}$/ ) { $class->search_sql_field('ip_addr', $string ); - } elsif ( $string =~ /^([a-fA-F0-9]{12})$/ ) { + } elsif ( $string =~ /^([A-F0-9]{12})$/i ) { $class->search_sql_field('mac_addr', uc($string)); - } elsif ( $string =~ /^(([a-fA-F0-9]{1,2}:){5}([a-fA-F0-9]{1,2}))$/ ) { - $class->search_sql_field('mac_addr', uc("$2$3$4$5$6$7") ); + } elsif ( $string =~ /^(([A-F0-9]{2}:){5}([A-F0-9]{2}))$/i ) { + $string =~ s/://g; + $class->search_sql_field('mac_addr', uc($string) ); } elsif ( $string =~ /^(\d+)$/ ) { my $table = $class->table; "$table.svcnum = $1"; |