--- experimental/reports/graphing/browser2.php	2002/03/10 16:40:12	1.1
+++ experimental/reports/graphing/browser2.php	2004/08/01 10:39:49	1.4
@@ -1,7 +1,7 @@
 <?php
 
-# Navigation for the i-scream reports.
-# pjm2@ukc.ac.uk
+# Navigation for the i-scream graphs
+# tim@i-scream.org
 #
 # CONFIGURABLE CONSTANTS: -
 
@@ -11,18 +11,6 @@ include("browser2_config.inc.php");
 # END CONFIGURATION
 
 
-
-
-
-# Used to return whether or not a report data file is empty.
-function isReportEmpty($filename, $minFileSize) {
-    if (filesize($filename) < $minFileSize) {
-        return TRUE;
-    }
-    return FALSE;
-}
-
-
 include("iutils.inc.php");
 
 ?>
@@ -42,9 +30,9 @@ include("iutils.inc.php");
     <option selected value="">[select machine]</option>
   <? } ?>
   <?
-     $file_array = getdirArray($rrddir,'asort');
+     $file_array = getdirArray($imgdir,'asort');
      foreach($file_array as $file_name) {
-        if(is_dir("$rrddir/$file_name")) { ?>
+        if(is_dir("$imgdir/$file_name")) { ?>
             <option value="<? echo $file_name ?>"><? echo $file_name ?></option>
      <? }
      }
@@ -62,17 +50,17 @@ include("iutils.inc.php");
     
     <form method="<? echo $formMethod ?>" action="<? echo $thisPage ?>">
      <select size="1" name="graph">
-      <? if ($report) { ?>
-        <option selected value="<? echo $report ?>"><? echo $report ?></option>
+      <? if ($graph) { ?>
+        <option selected value="<? echo $graph ?>"><? echo tidyName($machine_name, $graph) ?></option>
         <option value="">----------------</option>
       <? } else { ?>
-        <option selected value="">[select report]</option>
+        <option selected value="">[select graph]</option>
       <? } ?>
       <?
-         $file_array = getdirArray("$rrddir/$machine_name",'asort');
+         $file_array = getdirArray("$imgdir/$machine_name",'asort');
          foreach($file_array as $file_name) {
             if(preg_match("/^(\S+)\-3h.png$/", $file_name, $matches)) { ?>
-                <option value="<? echo $matches[1] ?>"><? echo $matches[1] ?></option>
+                <option value="<? echo $matches[1] ?>"><? echo tidyName($machine_name, $matches[1]) ?></option>
          <? }
          }
       ?>
@@ -93,13 +81,14 @@ include("iutils.inc.php");
     if ($submit == "Show" && $machine_name && $graph) {
         
       ?>
-        <center><b>[<? echo $machine_name; ?>] - <? echo $graph ?> graphs</b></center>
+        <center><b>[<? echo $machine_name; ?>] - '<? echo tidyName($machine_name, $graph) ?>' graphs</b></center>
         
         <center>
-         <p><b>Last 3 hours :</b><br><img border="0" src="<? echo "$rrdwebdir/$machine_name/$graph-3h.png" ?>"></p>
-         <p><b>Last day :</b><br><img border="0" src="<? echo "$rrdwebdir/$machine_name/$graph-1d.png" ?>"></p>
-         <p><b>Last week :</b><br><img border="0" src="<? echo "$rrdwebdir/$machine_name/$graph-1w.png" ?>"></p>
-         <p><b>Last month :</b><br><img border="0" src="<? echo "$rrdwebdir/$machine_name/$graph-1m.png" ?>"></p>
+         <p><b>Last 3 hours :</b><br><img border="0" src="<? echo "$imgwebdir/$machine_name/$graph-3h.png" ?>"></p>
+         <p><b>Last day :</b><br><img border="0" src="<? echo "$imgwebdir/$machine_name/$graph-1d.png" ?>"></p>
+         <p><b>Last week :</b><br><img border="0" src="<? echo "$imgwebdir/$machine_name/$graph-1w.png" ?>"></p>
+         <p><b>Last month :</b><br><img border="0" src="<? echo "$imgwebdir/$machine_name/$graph-1m.png" ?>"></p>
+         <p><b>Last year :</b><br><img border="0" src="<? echo "$imgwebdir/$machine_name/$graph-1y.png" ?>"></p>
         </center>
         
         <hr weight="1" color="<? echo $lineColor ?>">