projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
httemplate
/
view
/
svc_broadband.cgi
diff --git
a/httemplate/view/svc_broadband.cgi
b/httemplate/view/svc_broadband.cgi
index
3325416
..
70c0b53
100644
(file)
--- a/
httemplate/view/svc_broadband.cgi
+++ b/
httemplate/view/svc_broadband.cgi
@@
-4,6
+4,9
@@
fields => \@fields,
svc_callback => \&svc_callback,
radius_usage => 1,
fields => \@fields,
svc_callback => \&svc_callback,
radius_usage => 1,
+ 'manage_link' => scalar($conf->config('svc_broadband-manage_link')),
+ 'manage_link_text' => scalar($conf->config('svc_broadband-manage_link_text')),
+ 'manage_link-new_window' => $conf->exists('svc_broadband-manage_link-new_window')
&>
<%init>
&>
<%init>
@@
-32,7
+35,7
@@
my @fields = (
'speed_up',
{ field => 'ip_addr', value_callback => \&ip_addr },
{ field => 'sectornum', value_callback => \§ornum },
'speed_up',
{ field => 'ip_addr', value_callback => \&ip_addr },
{ field => 'sectornum', value_callback => \§ornum },
- { field => 'mac_addr', value_callback => \&mac_addr },
+ { field => 'mac_addr',
type=>'mac_addr',
value_callback => \&mac_addr },
#'latitude',
#'longitude',
{ field => 'coordinates', value_callback => \&coordinates },
#'latitude',
#'longitude',
{ field => 'coordinates', value_callback => \&coordinates },
@@
-78,7
+81,7
@@
sub ip_addr {
sub mac_addr {
my $svc = shift;
sub mac_addr {
my $svc = shift;
-
join(':', $svc->mac_addr =~ /../g
);
+
$svc->mac_addr_formatted('U',':'
);
}
sub usergroup {
}
sub usergroup {