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.25 by pjm2, Fri Mar 2 09:51:34 2001 UTC vs.
Revision 1.30 by pjm2, Fri Mar 2 10:49:54 2001 UTC

# Line 36 | Line 36 | $minFileSize = 33;
36   # END CONFIGURATION
37  
38  
39 < function isReportEmpty($filename) {
40 <    if (filesize($filename) < minFileSize) {
39 >
40 >
41 >
42 > # Used to return whether or not a report data file is empty.
43 > function isReportEmpty($filename, $minFileSize) {
44 >    if (filesize($filename) < $minFileSize) {
45          return TRUE;
46      }
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="<? echo $formMethod ?>" action="browser.php">
86 > <form method="<? echo $formMethod ?>" action="<? echo $thisPage ?>">
87   <?
88  
89      $file_array = getdirArray($reportDirectory,'rsort');
90      print "<select size=\"1\" name=\"day\">";
91 +    if ($day) { ?>
92 +        <option selected value="<? echo $day ?>"><? echo $day ?></option>
93 +        <option value="">----------------</option>
94 +    <? }
95      foreach($file_array as $file_name) {
96          if (is_dir($file_name)) {
97              $i++;
# Line 101 | Line 113 | function getdirArray($dir='./',$sort='asort') {
113  
114      <b>Available reports for <? echo $day ?></b>
115  
116 <    <form method="<? echo $formMethod ?>" action="browser.php">
116 >    <form method="<? echo $formMethod ?>" action="<? echo $thisPage ?>">
117       <select size="1" name="machine_name">
118        <? if ($machine_name) { ?>
119          <option selected value="<? echo $machine_name ?>"><? echo $machine_name ?></option>
# Line 139 | Line 151 | function getdirArray($dir='./',$sort='asort') {
151          include("$day/$machine_name/$report/$reportLimitsFile");
152          
153          $url = escapeshellcmd("$day/$machine_name/$report/$reportChartFile");
154 <        if (isReportEmpty("$day/$machine_name/$report/$reportChartDataFile")) {
154 >        if (isReportEmpty("$day/$machine_name/$report/$reportChartDataFile", $minFileSize)) {
155              echo "Host <b>$machine_name</b> did not send any information about <b>$report</b> on <b>$day</b>.  Please select another report.";
156          }
157          else if (file_exists($url)) {  ?>

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines