diff options
| author | jeff <jeff> | 2008-02-13 23:49:00 +0000 |
|---|---|---|
| committer | jeff <jeff> | 2008-02-13 23:49:00 +0000 |
| commit | 66368be6c2d465eb44e908c58205d42626ab3f27 (patch) | |
| tree | dc4e54a0bd219c2ec19fc8a53de2410096e50240 | |
| parent | 72fc66f5f5882d670ccce2dfe17d03bb7faad390 (diff) | |
svc_broadband MAC searches RT#2985
| -rwxr-xr-x | FS/FS/svc_broadband.pm | 4 | ||||
| -rw-r--r-- | httemplate/elements/header.html | 4 |
2 files changed, 6 insertions, 2 deletions
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 { <TD COLSPAN=1 BGCOLOR="#000000" ALIGN="right"> <FORM ACTION="<%$fsurl%>search/cust_svc.html" METHOD="GET" STYLE="margin:0"> - <INPUT NAME="search_svc" TYPE="text" VALUE="(user, user@domain or domain)" SIZE="26" onFocus="clearhint_search_svc(this);" onClick="clearhint_search_svc(this);" STYLE="vertical-align:bottom;text-align:right"><BR> + <INPUT NAME="search_svc" TYPE="text" VALUE="(user, email, ip, mac, or domain)" SIZE="26" onFocus="clearhint_search_svc(this);" onClick="clearhint_search_svc(this);" STYLE="vertical-align:bottom;text-align:right"><BR> <A NOTYET="<%$fsurl%>search/svc_Smarter.html" STYLE="color: #000000; font-size: 70%">Advanced</A> <INPUT TYPE="submit" VALUE="Search services" CLASS="fsblackbutton" onMouseOver="this.className='fsblackbuttonselected'; return true;" onMouseOut="this.className='fsblackbutton'; return true;" STYLE="font-size:70%"> </FORM> |