X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_port.cgi;h=58702eb842bb0e27b23bfacf5e3746e0b0e1ba95;hp=84d0e49e306859a3d622df46c28b43009e89daa3;hb=833cfe5c9938d33c3e6b97ed610c25a7afa6eb04;hpb=6877b0f1447c211f1a992487eeaf9bda787c4b71

diff --git a/httemplate/view/svc_port.cgi b/httemplate/view/svc_port.cgi
index 84d0e49e3..58702eb84 100644
--- a/httemplate/view/svc_port.cgi
+++ b/httemplate/view/svc_port.cgi
@@ -20,26 +20,11 @@ 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);
-    warn "$start $end $date_format";
     $start = time2str($date_format,$start);
     $end = time2str($date_format,$end);
     return '<A HREF="javascript:void(0);" onclick="preset_range(\''
@@ -47,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 = "<BR><BR><IMG SRC=${p}/view/port_graph.html?svcnum=$svcnum;".
-		"start=".str2time($start).";end=".str2time($end).">";
+    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 ) {
+        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 = "<BR><BR><IMG SRC=${p}/view/port_graph.html?svcnum=$svcnum".
+                                  ";start=".str2time("$s 00:00:00").
+                                  ";end=".  str2time("$e 23:59:59").
+                         ">";
     }
 
     return '
@@ -65,6 +63,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)