enable CardFortress in test database, #71513

[freeside.git] / httemplate / view / svc_port.cgi

diff --git a/httemplate/view/svc_port.cgi b/httemplate/view/svc_port.cgi
index a2b12b7..58702eb 100644 (file)
--- a/httemplate/view/svc_port.cgi
+++ b/httemplate/view/svc_port.cgi
@@ -39,11 +39,19 @@ my $html_foot = sub {
     my $graph = '';
 
     my $nms = new FS::NetworkMonitoringSystem;
-    my $link = $nms->port_graphs_link($svc_port->serviceid);
+    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 00:00:00").";end=".str2time("$end 23:59:59").">";
+    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 '
@@ -55,7 +63,7 @@ my $html_foot = sub {
     </script>
     <FORM ACTION=? METHOD="GET">
     <INPUT TYPE="HIDDEN" NAME="svcnum" VALUE="'.$svcnum.'">
-    <A HREF="'.$link.'">Torrus Graphs</A><BR><BR>
+    '.$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)