X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fsvc_port.cgi;h=58702eb842bb0e27b23bfacf5e3746e0b0e1ba95;hb=5b2872a065cd65c823e9056b9153e4548ee7c201;hp=0df826366c1babc06b109d263c6da18c286cc351;hpb=ec681a87b33fe272276f367aea4da3ed4d689605;p=freeside.git
diff --git a/httemplate/view/svc_port.cgi b/httemplate/view/svc_port.cgi
index 0df826366..58702eb84 100644
--- a/httemplate/view/svc_port.cgi
+++ b/httemplate/view/svc_port.cgi
@@ -20,22 +20,8 @@ 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 = '';
-my $end = '';
-if ( $cgi->param('start') && $cgi->param('end') ) {
- $start = $cgi->param('start');
- $end = $cgi->param('end');
-}
+my $start = $cgi->param('start');
+my $end = $cgi->param('end');
sub preset_range {
my($start,$end,$label,$date_format) = (shift,shift,shift,shift);
@@ -46,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 '
@@ -64,6 +63,7 @@ my $html_foot = sub {