#my %labels = ();
$labels{'description'} = emt('Description');
-$labels{'router'} = emt('Router');
$labels{'speed_down'} = emt('Download Speed');
$labels{'speed_up'} = emt('Upload Speed');
$labels{'ip_addr'} = emt('IP Address');
my @fields = (
'description',
- { field => 'routernum', value => \&router },
+ { field => 'routernum', value_callback => \&router },
'speed_down',
'speed_up',
- { field => 'ip_addr', value => \&ip_addr },
- { field => 'sectornum', value => \§ornum },
- 'mac_addr',
+ { field => 'ip_addr', value_callback => \&ip_addr },
+ { field => 'sectornum', value_callback => \§ornum },
+ { field => 'mac_addr', value_callback => \&mac_addr },
#'latitude',
#'longitude',
- { field => 'coordinates', value => \&coordinates },
+ { field => 'coordinates', value_callback => \&coordinates },
'altitude',
'vlan_profile',
'authkey',
);
push @fields,
- { field => 'usergroup', value => \&usergroup }
+ { field => 'usergroup', value_callback => \&usergroup }
if $conf->exists('svc_broadband-radius');
sub router {
my $svc = shift;
- my $router = $svc->router or return '';
+ my $router = $svc->router;
my $block = $svc->addr_block;
+ $router = $router->routernum . ': ' . $router->routername if $router;
$block = '; '.$block->cidr if $block;
- $router->routernum . ': ' . $router->routername . $block
+ $router . $block
}
sub ip_addr {
$out;
}
+sub mac_addr {
+ my $svc = shift;
+ join(':', $svc->mac_addr =~ /../g);
+}
+
sub usergroup {
my $svc = shift;
my $usergroup = $svc->usergroup;
return '' unless $s->latitude && $s->longitude;
my $d = $s->description;
+ my $agentnum;
unless ($d) {
- my $cust_pkg = $s->cust_svc->cust_pkg;
- $d = $cust_pkg->cust_main->name_short if $cust_pkg;
+ if ( my $cust_pkg = $s->cust_svc->cust_pkg ) {
+ $d = $cust_pkg->cust_main->name_short;
+ $agentnum = $cust_pkg->cust_main->agentnum;
+ }
}
#'Latitude: '. $s->latitude. ', Longitude: '. $s->longitude. ' '.
$s->latitude. ', '. $s->longitude. ' '.
- include('/elements/coord-links.html', $s->latitude, $s->longitude, $d);
+ include('/elements/coord-links.html',
+ $s->latitude,
+ $s->longitude,
+ $d,
+ $agentnum
+ );
}
sub svc_callback {