X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fsvc_port.cgi;h=58702eb842bb0e27b23bfacf5e3746e0b0e1ba95;hb=5f2456557fee6e8d09733aad18200e4b2bbc2d93;hp=eec803d5ae718d96d09c2f9db64ab924c7c6374e;hpb=088428e5937c8dff49bafeddd52c1c64a8d6cec6;p=freeside.git
diff --git a/httemplate/view/svc_port.cgi b/httemplate/view/svc_port.cgi
index eec803d5a..58702eb84 100644
--- a/httemplate/view/svc_port.cgi
+++ b/httemplate/view/svc_port.cgi
@@ -20,16 +20,6 @@ my %labels = map { $_ => ( ref($fields->{$_})
} keys %$fields;
my @fields = keys %$fields;
-my $svcnum;
-if ( $cgi->param('svcnum') ) {
- $cgi->param('svcnum') =~ /^(\d+)$/ or die "unparsable svcnum";
- $svcnum = $1;
-} else {
- my($query) = $cgi->keywords;
- $query =~ /^(\d+)$/ or die "no svcnum";
- $svcnum = $1;
-}
-
my $start = $cgi->param('start');
my $end = $cgi->param('end');
@@ -42,13 +32,26 @@ sub preset_range {
}
my $html_foot = sub {
+ my $svc_port = shift;
+ my $svcnum = $svc_port->svcnum;
my $default_end = time;
my $default_start = $default_end-86400;
my $graph = '';
- if($start && $end) {
- $graph = "
";
+ my $nms = new FS::NetworkMonitoringSystem;
+ my $url = $nms->port_graphs_link($svc_port->serviceid);
+ my $link = $url ? qq(Torrus Graphs
) : '';
+
+ if ( $start && $end ) {
+ my($s, $e) = ($start, $end);
+ if ( $date_format eq '%d/%m/%Y' ) {
+ $start =~ /^\s*(\d+)\D+(\d+)\D+(\d+)\s*$/ and $s = "$2/$1/$3";
+ $end =~ /^\s*(\d+)\D+(\d+)\D+(\d+)\s*$/ and $e = "$2/$1/$3";
+ }
+ $graph = "
";
}
return '
@@ -60,6 +63,7 @@ my $html_foot = sub {