X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_port.cgi;h=24717a761c0f04dab7a6ed93cd132baf3cfeae20;hb=8ef00c68688492b2afa3dde8d3d467f89f238c40;hp=0df826366c1babc06b109d263c6da18c286cc351;hpb=ec681a87b33fe272276f367aea4da3ed4d689605;p=freeside.git

diff --git a/httemplate/view/svc_port.cgi b/httemplate/view/svc_port.cgi
index 0df826366..24717a761 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,19 @@ 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 = '';
 
+    my $nms = new FS::NetworkMonitoringSystem;
+    my $url = $nms->port_graphs_link($svc_port->serviceid);
+    my $link = $url ? qq(<A HREF="$url">Torrus Graphs</A><BR><BR>) : '';
+
     if($start && $end) {
 	$graph = "<BR><BR><IMG SRC=${p}/view/port_graph.html?svcnum=$svcnum;".
-		"start=".str2time($start).";end=".str2time($end).">";
+		"start=".str2time("$start 00:00:00").";end=".str2time("$end 23:59:59").">";
     }
 
     return '
@@ -64,6 +56,7 @@ my $html_foot = sub {
     </script>
     <FORM ACTION=? METHOD="GET">
     <INPUT TYPE="HIDDEN" NAME="svcnum" VALUE="'.$svcnum.'">
+    '.$link.'
     <B>Bandwidth Graph</B><BR>
 &nbsp; '.preset_range($default_start,$default_end,'Last Day',$date_format)
     .' | '.preset_range($default_end-86400*7,$default_end,'Last Week',$date_format)