ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/reports/php/historical/browser.php
(Generate patch)

Comparing projects/cms/source/reports/php/historical/browser.php (file contents):
Revision 1.28 by pjm2, Fri Mar 2 10:06:59 2001 UTC vs.
Revision 1.37 by pjm2, Tue Mar 13 19:22:44 2001 UTC

# Line 3 | Line 3
3   # Navigation for the i-scream reports.
4   # pjm2@ukc.ac.uk
5   #
6 < # CONFIGURABLE CONSTANTS
7 < #
6 > # CONFIGURABLE CONSTANTS: -
7  
8 < # The report directory, and the number of days to display.
10 < $reportDirectory = "/home/cut/pjm2/webpages/reports";
11 < $maxDaysShown = 7;
8 > include("browser_config.inc.php");
9  
13 # Page appearance.
14 $scaleImage = "24hour.gif";
15 $lineColor = "#9999ff";
16
17 # Files to include
18 $titleHTML = "title.inc";
19 $bottomHTML = "bottom.inc";
20 $machineNameHTML = "machine_name.inc";
21 $reportHTML = "report.inc";
22
23 # What are the names of the report files?
24 $reportLimitsFile = "i-maxmin.txt";
25 $reportChartFile = "i-chart.gif";
26 $reportChartDataFile = "i-data.txt";
27
28 # Submission details.
29 $formMethod = "GET";
30 $thisPage = "browser.php";
31
32 # Leave this alone unless you know what you're doing ;)
33 $minFileSize = 33;
34
10   #
11   # END CONFIGURATION
12  
# Line 40 | Line 15 | $minFileSize = 33;
15  
16  
17   # Used to return whether or not a report data file is empty.
18 < function isReportEmpty($filename) {
19 <    if (filesize($filename) < minFileSize) {
18 > function isReportEmpty($filename, $minFileSize) {
19 >    if (filesize($filename) < $minFileSize) {
20          return TRUE;
21      }
22      return FALSE;
23   }
24  
25  
26 < # return an array of subdirectories in the current directory.
52 < function getdirArray($dir='./',$sort='asort') {
53 <    global $dir_file_count;
54 <    if ( is_dir($dir) ) {
55 <        $fd = @opendir($dir);
56 <        while ( ($part = @readdir($fd)) == TRUE ) {
57 <            clearstatcache();
58 <            if ($part != "." && $part != "..") {
59 <                if (preg_match("/^[0-9]{4}\-[0-9]{2}\-[0-9]{2}$/", $part)) {
60 <                    $dir_array[] = $part;
61 <                }
62 <            }
63 <        }
64 <        if($fd == TRUE) {
65 <            closedir($fd);
66 <        }
67 <        if (is_array($dir_array)) {
68 <            $sort($dir_array);
69 <            $dir_file_count = count($dir_array);
70 <            Return $dir_array;
71 <        } else {
72 <            Return FALSE;
73 <        }
74 <    } else {
75 <        Return FALSE;
76 <    }
77 < }
26 > include("iutils.inc.php");
27  
28   ?>
29  
# Line 88 | Line 37 | function getdirArray($dir='./',$sort='asort') {
37  
38      $file_array = getdirArray($reportDirectory,'rsort');
39      print "<select size=\"1\" name=\"day\">";
40 +    if ($day) { ?>
41 +        <option selected value="<? echo $day ?>"><? echo $day ?></option>
42 +        <option value="">----------------</option>
43 +    <? }
44      foreach($file_array as $file_name) {
45 <        if (is_dir($file_name)) {
45 >        #if (is_dir($file_name)) {
46 >        if (preg_match("/^[0-9]{4}\-[0-9]{2}\-[0-9]{2}$/", $file_name)) {
47              $i++;
48              print "<option value=\"$file_name\">$file_name</option>";
49          }
# Line 117 | Line 71 | function getdirArray($dir='./',$sort='asort') {
71        <? } else { ?>
72          <option selected value="">[select machine]</option>
73        <? } ?>
74 <      <? include("$day/$machineNameHTML"); ?>
74 >      <? include("$reportDirectory/$day/$machineNameHTML"); ?>
75       </select>
76  
77       <select size="1" name="report">
# Line 127 | Line 81 | function getdirArray($dir='./',$sort='asort') {
81        <? } else { ?>
82          <option selected value="">[select report]</option>
83        <? } ?>
84 <      <? include("$day/$reportHTML"); ?>
84 >      <? include("$reportDirectory/$day/$reportHTML"); ?>
85       </select>
86  
87       <input type="hidden" name="day" value="<? echo $day ?>">
# Line 144 | Line 98 | function getdirArray($dir='./',$sort='asort') {
98   <?
99      if ($submit == "Show" && $machine_name && $report) {
100          
101 <        include("$day/$machine_name/$report/$reportLimitsFile");
101 >        include("$reportDirectory/$day/$machine_name/$report/$reportLimitsFile");
102          
103          $url = escapeshellcmd("$day/$machine_name/$report/$reportChartFile");
104 <        if (isReportEmpty("$day/$machine_name/$report/$reportChartDataFile")) {
104 >        if (isReportEmpty("$reportDirectory/$day/$machine_name/$report/$reportChartDataFile", $minFileSize)) {
105              echo "Host <b>$machine_name</b> did not send any information about <b>$report</b> on <b>$day</b>.  Please select another report.";
106          }
107          else if (file_exists($url)) {  ?>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines