diff options
| author | Mark Wells <mark@freeside.biz> | 2015-12-10 01:01:29 -0800 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2015-12-10 01:01:29 -0800 |
| commit | e7bad3b31830cd1c838c607a3336413a4c5ed50c (patch) | |
| tree | 66a7db8588d6091b9beb06b2d0b88610031b5a27 | |
| parent | 1b821166888962897d6f4b0c87acb00d6b9f392d (diff) | |
| parent | 311a694bf1cb816a48efca116e260d940c5a646f (diff) | |
Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into 3.x
| -rw-r--r-- | conf/card_masking_method | 1 | ||||
| -rw-r--r-- | httemplate/view/elements/svc_Common.html | 4 | ||||
| -rw-r--r-- | httemplate/view/elements/svc_radius_usage.html | 7 |
3 files changed, 8 insertions, 4 deletions
diff --git a/conf/card_masking_method b/conf/card_masking_method new file mode 100644 index 000000000..7f6ed5c40 --- /dev/null +++ b/conf/card_masking_method @@ -0,0 +1 @@ +first4last2 diff --git a/httemplate/view/elements/svc_Common.html b/httemplate/view/elements/svc_Common.html index 771bfb276..207838759 100644 --- a/httemplate/view/elements/svc_Common.html +++ b/httemplate/view/elements/svc_Common.html @@ -283,8 +283,8 @@ my $format_field = sub { } elsif ( $type eq 'checkbox' ) { $value = $value eq 'Y' ? emt('Yes') : emt('No'); } elsif ( $type =~ /(input-)?mac_addr/ and $value =~ /\w/) { - my $vendor = Net::MAC::Vendor::lookup($value)->[0]; - $value .= " ($vendor)" if $vendor; + my $vendor = Net::MAC::Vendor::lookup($value); + $value .= ' ('. $vendor->[0]. ')' if $vendor; $value = $m->scomp('/elements/mac_addr.html', $value); } diff --git a/httemplate/view/elements/svc_radius_usage.html b/httemplate/view/elements/svc_radius_usage.html index 08d6d53d3..5a958ee76 100644 --- a/httemplate/view/elements/svc_radius_usage.html +++ b/httemplate/view/elements/svc_radius_usage.html @@ -27,8 +27,11 @@ % ) / 1048576; % % my $last_mac = $svc->attribute_last_sqlradacct( 'CallingStationId' ); -% if ( $last_mac =~ /^\s*(([\dA-F]{2}[\-:]){5}[\dA-F]{2})/i ) { -% $last_mac .= ' ('. (Net::MAC::Vendor::lookup($1))->[0]. ')'; +% if ( $last_mac =~ /^\s*(([\dA-F]{2}[\-:]){5}[\dA-F]{2})/i +% && my $vendor = Net::MAC::Vendor::lookup($1) +% ) +% { +% $last_mac .= ' ('. $vendor->[0]. ')'; % } |