projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
svc_cable service have a single serial / MAC / model, not one-to-many devices like...
[freeside.git]
/
FS
/
FS
/
svc_broadband.pm
diff --git
a/FS/FS/svc_broadband.pm
b/FS/FS/svc_broadband.pm
index
b5012ca
..
6073902
100755
(executable)
--- 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 );
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));
$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";
} elsif ( $string =~ /^(\d+)$/ ) {
my $table = $class->table;
"$table.svcnum = $1";