# | Line 36 | Line 36 | $minFileSize = 33; | |
---|---|---|
36 | # END CONFIGURATION | |
37 | ||
38 | ||
39 | + | |
40 | + | |
41 | + | |
42 | + | # Used to return whether or not a report data file is empty. |
43 | function isReportEmpty($filename) { | |
44 | if (filesize($filename) < minFileSize) { | |
45 | return TRUE; | |
# | Line 43 | Line 47 | function isReportEmpty($filename) { | |
47 | return FALSE; | |
48 | } | |
49 | ||
50 | + | |
51 | + | # 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) ) { | |
# | Line 50 | Line 56 | function getdirArray($dir='./',$sort='asort') { | |
56 | while ( ($part = @readdir($fd)) == TRUE ) { | |
57 | clearstatcache(); | |
58 | if ($part != "." && $part != "..") { | |
59 | < | $dir_array[] = $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) { | |
# | Line 75 | Line 83 | function getdirArray($dir='./',$sort='asort') { | |
83 | <hr weight="1" color="<? echo $lineColor ?>"> | |
84 | ||
85 | <b>Most recent reports available</b> | |
86 | < | <form method="GET" action="browser.php"> |
86 | > | <form method="<? echo $formMethod ?>" action="<? echo $thisPage ?>"> |
87 | <? | |
88 | ||
89 | $file_array = getdirArray($reportDirectory,'rsort'); | |
# | Line 101 | Line 109 | function getdirArray($dir='./',$sort='asort') { | |
109 | ||
110 | <b>Available reports for <? echo $day ?></b> | |
111 | ||
112 | < | <form method="GET" action="browser.php"> |
112 | > | <form method="<? echo $formMethod ?>" action="<? echo $thisPage ?>"> |
113 | <select size="1" name="machine_name"> | |
114 | <? if ($machine_name) { ?> | |
115 | <option selected value="<? echo $machine_name ?>"><? echo $machine_name ?></option> | |
# | Line 136 | Line 144 | function getdirArray($dir='./',$sort='asort') { | |
144 | <? | |
145 | if ($submit == "Show" && $machine_name && $report) { | |
146 | ||
147 | < | include("$day/$machine_name/$report/i-maxmin.txt"); |
147 | > | include("$day/$machine_name/$report/$reportLimitsFile"); |
148 | ||
149 | < | $url = escapeshellcmd("$day/$machine_name/$report/i-chart.gif"); |
150 | < | if (isReportEmpty("$day/$machine_name/$report/i-data.txt")) { |
149 | > | $url = escapeshellcmd("$day/$machine_name/$report/$reportChartFile"); |
150 | > | if (isReportEmpty("$day/$machine_name/$report/$reportChartDataFile")) { |
151 | echo "Host <b>$machine_name</b> did not send any information about <b>$report</b> on <b>$day</b>. Please select another report."; | |
152 | } | |
153 | else if (file_exists($url)) { ?> | |
# | Line 170 | Line 178 | function getdirArray($dir='./',$sort='asort') { | |
178 | ||
179 | <b>Extra data</b> | |
180 | <p> | |
181 | < | <a href="<? echo "$day/$machine_name/$report/i-data.txt" ?>">Raw plot data</a><br> |
182 | < | <a href="<? echo "$day/$machine_name/$report/i-chart.gif" ?>">GIF chart</a><br> |
183 | < | <a href="<? echo "$day/$machine_name/$report/i-maxmin.txt" ?>">PHP y-axis limits include</a> |
181 | > | <a href="<? echo "$day/$machine_name/$report/$reportChartDataFile" ?>">Raw plot data</a><br> |
182 | > | <a href="<? echo "$day/$machine_name/$report/$reportChartFile" ?>">GIF chart</a><br> |
183 | > | <a href="<? echo "$day/$machine_name/$report/$reportLimitsFile" ?>">PHP y-axis limits include</a> |
184 | ||
185 | <? } | |
186 | else { |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |