# | 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. | |
9 | < | $reportDirectory = "/home/cut/pjm2/webpages/reports"; |
9 | > | $reportDirectory = "/home/cut/pjm2/webpages/reports/historical"; |
10 | $maxDaysShown = 7; | |
11 | ||
12 | # Page appearance. | |
# | Line 36 | Line 35 | $minFileSize = 33; | |
35 | # END CONFIGURATION | |
36 | ||
37 | ||
38 | < | function isReportEmpty($filename) { |
39 | < | if (filesize($filename) < minFileSize) { |
38 | > | |
39 | > | |
40 | > | |
41 | > | # Used to return whether or not a report data file is empty. |
42 | > | function isReportEmpty($filename, $minFileSize) { |
43 | > | if (filesize($filename) < $minFileSize) { |
44 | return TRUE; | |
45 | } | |
46 | return FALSE; | |
47 | } | |
48 | ||
46 | – | function getdirArray($dir='./',$sort='asort') { |
47 | – | global $dir_file_count; |
48 | – | if ( is_dir($dir) ) { |
49 | – | $fd = @opendir($dir); |
50 | – | while ( ($part = @readdir($fd)) == TRUE ) { |
51 | – | clearstatcache(); |
52 | – | if ($part != "." && $part != "..") { |
53 | – | $dir_array[] = $part; |
54 | – | } |
55 | – | } |
56 | – | if($fd == TRUE) { |
57 | – | closedir($fd); |
58 | – | } |
59 | – | if (is_array($dir_array)) { |
60 | – | $sort($dir_array); |
61 | – | $dir_file_count = count($dir_array); |
62 | – | Return $dir_array; |
63 | – | } else { |
64 | – | Return FALSE; |
65 | – | } |
66 | – | } else { |
67 | – | Return FALSE; |
68 | – | } |
69 | – | } |
49 | ||
50 | + | include("iutils.inc.php"); |
51 | + | |
52 | ?> | |
53 | ||
54 | < | <? include("title.inc"); ?> |
54 | > | <? include($titleHTML); ?> |
55 | ||
56 | <hr weight="1" color="<? echo $lineColor ?>"> | |
57 | ||
58 | <b>Most recent reports available</b> | |
59 | < | <form method="GET" action="browser.php"> |
59 | > | <form method="<? echo $formMethod ?>" action="<? echo $thisPage ?>"> |
60 | <? | |
61 | ||
62 | $file_array = getdirArray($reportDirectory,'rsort'); | |
63 | print "<select size=\"1\" name=\"day\">"; | |
64 | + | if ($day) { ?> |
65 | + | <option selected value="<? echo $day ?>"><? echo $day ?></option> |
66 | + | <option value="">----------------</option> |
67 | + | <? } |
68 | foreach($file_array as $file_name) { | |
69 | if (is_dir($file_name)) { | |
70 | $i++; | |
# | Line 101 | Line 86 | function getdirArray($dir='./',$sort='asort') { | |
86 | ||
87 | <b>Available reports for <? echo $day ?></b> | |
88 | ||
89 | < | <form method="GET" action="browser.php"> |
89 | > | <form method="<? echo $formMethod ?>" action="<? echo $thisPage ?>"> |
90 | <select size="1" name="machine_name"> | |
91 | <? if ($machine_name) { ?> | |
92 | <option selected value="<? echo $machine_name ?>"><? echo $machine_name ?></option> | |
# | Line 109 | Line 94 | function getdirArray($dir='./',$sort='asort') { | |
94 | <? } else { ?> | |
95 | <option selected value="">[select machine]</option> | |
96 | <? } ?> | |
97 | < | <? include("$day/machine_name.inc"); ?> |
97 | > | <? include("$day/$machineNameHTML"); ?> |
98 | </select> | |
99 | ||
100 | <select size="1" name="report"> | |
# | Line 119 | Line 104 | function getdirArray($dir='./',$sort='asort') { | |
104 | <? } else { ?> | |
105 | <option selected value="">[select report]</option> | |
106 | <? } ?> | |
107 | < | <? include("$day/report.inc"); ?> |
107 | > | <? include("$day/$reportHTML"); ?> |
108 | </select> | |
109 | ||
110 | <input type="hidden" name="day" value="<? echo $day ?>"> | |
# | Line 136 | Line 121 | function getdirArray($dir='./',$sort='asort') { | |
121 | <? | |
122 | if ($submit == "Show" && $machine_name && $report) { | |
123 | ||
124 | < | include("$day/$machine_name/$report/i-maxmin.txt"); |
124 | > | include("$day/$machine_name/$report/$reportLimitsFile"); |
125 | ||
126 | < | $url = escapeshellcmd("$day/$machine_name/$report/i-chart.gif"); |
127 | < | if (isReportEmpty("$day/$machine_name/$report/i-data.txt")) { |
126 | > | $url = escapeshellcmd("$day/$machine_name/$report/$reportChartFile"); |
127 | > | if (isReportEmpty("$day/$machine_name/$report/$reportChartDataFile", $minFileSize)) { |
128 | echo "Host <b>$machine_name</b> did not send any information about <b>$report</b> on <b>$day</b>. Please select another report."; | |
129 | } | |
130 | else if (file_exists($url)) { ?> | |
# | Line 170 | Line 155 | function getdirArray($dir='./',$sort='asort') { | |
155 | ||
156 | <b>Extra data</b> | |
157 | <p> | |
158 | < | <a href="<? echo "$day/$machine_name/$report/i-data.txt" ?>">Raw plot data</a><br> |
159 | < | <a href="<? echo "$day/$machine_name/$report/i-chart.gif" ?>">GIF chart</a><br> |
160 | < | <a href="<? echo "$day/$machine_name/$report/i-maxmin.txt" ?>">PHP y-axis limits include</a> |
158 | > | <a href="<? echo "$day/$machine_name/$report/$reportChartDataFile" ?>">Raw plot data</a><br> |
159 | > | <a href="<? echo "$day/$machine_name/$report/$reportChartFile" ?>">GIF chart</a><br> |
160 | > | <a href="<? echo "$day/$machine_name/$report/$reportLimitsFile" ?>">PHP y-axis limits include</a> |
161 | ||
162 | <? } | |
163 | else { | |
# | Line 183 | Line 168 | function getdirArray($dir='./',$sort='asort') { | |
168 | ||
169 | ?> | |
170 | ||
171 | < | <? include("bottom.inc"); ?> |
171 | > | <? include($bottomHTML); ?> |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |