# | 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 | ||
49 | + | |
50 | + | # return an array of subdirectories in the current directory. |
51 | function getdirArray($dir='./',$sort='asort') { | |
52 | global $dir_file_count; | |
53 | if ( is_dir($dir) ) { | |
# | Line 50 | Line 55 | function getdirArray($dir='./',$sort='asort') { | |
55 | while ( ($part = @readdir($fd)) == TRUE ) { | |
56 | clearstatcache(); | |
57 | if ($part != "." && $part != "..") { | |
58 | < | $dir_array[] = $part; |
58 | > | if (preg_match("/^[0-9]{4}\-[0-9]{2}\-[0-9]{2}$/", $part)) { |
59 | > | $dir_array[] = $part; |
60 | > | } |
61 | } | |
62 | } | |
63 | if($fd == TRUE) { | |
# | Line 75 | Line 82 | function getdirArray($dir='./',$sort='asort') { | |
82 | <hr weight="1" color="<? echo $lineColor ?>"> | |
83 | ||
84 | <b>Most recent reports available</b> | |
85 | < | <form method="GET" action="browser.php"> |
85 | > | <form method="<? echo $formMethod ?>" action="<? echo $thisPage ?>"> |
86 | <? | |
87 | ||
88 | $file_array = getdirArray($reportDirectory,'rsort'); | |
89 | print "<select size=\"1\" name=\"day\">"; | |
90 | + | if ($day) { ?> |
91 | + | <option selected value="<? echo $day ?>"><? echo $day ?></option> |
92 | + | <option value="">----------------</option> |
93 | + | <? } |
94 | foreach($file_array as $file_name) { | |
95 | if (is_dir($file_name)) { | |
96 | $i++; | |
# | Line 101 | Line 112 | function getdirArray($dir='./',$sort='asort') { | |
112 | ||
113 | <b>Available reports for <? echo $day ?></b> | |
114 | ||
115 | < | <form method="GET" action="browser.php"> |
115 | > | <form method="<? echo $formMethod ?>" action="<? echo $thisPage ?>"> |
116 | <select size="1" name="machine_name"> | |
117 | <? if ($machine_name) { ?> | |
118 | <option selected value="<? echo $machine_name ?>"><? echo $machine_name ?></option> | |
# | Line 138 | Line 149 | function getdirArray($dir='./',$sort='asort') { | |
149 | ||
150 | include("$day/$machine_name/$report/$reportLimitsFile"); | |
151 | ||
152 | < | $url = escapeshellcmd("$day/$machine_name/$report/i-chart.gif"); |
153 | < | if (isReportEmpty("$day/$machine_name/$report/i-data.txt")) { |
152 | > | $url = escapeshellcmd("$day/$machine_name/$report/$reportChartFile"); |
153 | > | if (isReportEmpty("$day/$machine_name/$report/$reportChartDataFile", $minFileSize)) { |
154 | echo "Host <b>$machine_name</b> did not send any information about <b>$report</b> on <b>$day</b>. Please select another report."; | |
155 | } | |
156 | else if (file_exists($url)) { ?> | |
# | Line 170 | Line 181 | function getdirArray($dir='./',$sort='asort') { | |
181 | ||
182 | <b>Extra data</b> | |
183 | <p> | |
184 | < | <a href="<? echo "$day/$machine_name/$report/i-data.txt" ?>">Raw plot data</a><br> |
185 | < | <a href="<? echo "$day/$machine_name/$report/i-chart.gif" ?>">GIF chart</a><br> |
184 | > | <a href="<? echo "$day/$machine_name/$report/$reportChartDataFile" ?>">Raw plot data</a><br> |
185 | > | <a href="<? echo "$day/$machine_name/$report/$reportChartFile" ?>">GIF chart</a><br> |
186 | <a href="<? echo "$day/$machine_name/$report/$reportLimitsFile" ?>">PHP y-axis limits include</a> | |
187 | ||
188 | <? } |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |