diff options
| author | Mark Wells <mark@freeside.biz> | 2015-12-10 01:03:17 -0800 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2015-12-10 01:03:17 -0800 |
| commit | 93606bc1854625bfffb8316630bbd4d987d161ec (patch) | |
| tree | eed58ed41fb71552801c78482e6795daa65de997 | |
| parent | 0414f671da0bb49fd2af12c9adc641fda3478bb1 (diff) | |
| parent | 8fd0a2a920cf5e46c36da85f3346f933727e5dc8 (diff) | |
Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.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_devices.html | 3 | ||||
| -rw-r--r-- | httemplate/view/elements/svc_radius_usage.html | 7 |
4 files changed, 10 insertions, 5 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 d7a1dcf30..296c27bbc 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_devices.html b/httemplate/view/elements/svc_devices.html index 899e6aa47..3d4e1bbc5 100644 --- a/httemplate/view/elements/svc_devices.html +++ b/httemplate/view/elements/svc_devices.html @@ -63,7 +63,8 @@ <% $td %><% $device->part_device->devicename |h %></TD> % } <% $td %><% $device->mac_addr_pretty %> - (<% (Net::MAC::Vendor::lookup($device->mac_addr_formatted('U',':')))->[0] %>) +% my $vendor = Net::MAC::Vendor::lookup($device->mac_addr_formatted('U',':')); + (<% $vendor ? $vendor->[0] : '' %>) </TD> <% $td %><% $export_links %></TD> <% $td %>( diff --git a/httemplate/view/elements/svc_radius_usage.html b/httemplate/view/elements/svc_radius_usage.html index 471969175..56198524c 100644 --- a/httemplate/view/elements/svc_radius_usage.html +++ b/httemplate/view/elements/svc_radius_usage.html @@ -27,8 +27,11 @@ % ) / 1073741824; % % 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]. ')'; % } |