From: jeff Date: Wed, 13 Feb 2008 23:49:00 +0000 (+0000) Subject: svc_broadband MAC searches RT#2985 X-Git-Tag: freeside_1_7_3rc1~104 X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=66368be6c2d465eb44e908c58205d42626ab3f27;p=freeside.git svc_broadband MAC searches RT#2985 --- diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm index e5803513b..7daf7be5a 100755 --- a/FS/FS/svc_broadband.pm +++ b/FS/FS/svc_broadband.pm @@ -114,6 +114,10 @@ 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})$/ ) { + $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") ); } else { '1 = 0'; #false } diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 54cf6e9cd..bb53e9ff5 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -30,7 +30,7 @@ } function clearhint_search_svc (what) { - if ( what.value == '(user, user@domain or domain)' ) + if ( what.value == '(user, email, ip, mac, or domain)' ) what.value = ''; } @@ -190,7 +190,7 @@ input.fsblackbuttonselected {
-
+
Advanced