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

Comparing projects/cms/source/reports/php/latest/latest.php (file contents):
Revision 1.47 by tdb, Fri Mar 11 12:23:33 2005 UTC vs.
Revision 1.53 by tdb, Sat Jun 30 12:12:49 2007 UTC

# Line 51 | Line 51 | function showUptime($title, $value, $input, $graph="")
51          <table border="0" width="100%">
52            <tr>
53              <td width="50%" align="right" valign="top">
54 <             <b><?=$title?></b>
54 >             <b><?php echo $title?></b>
55              </td>
56              <td width="50%" align="left" valign="top">
57 <             <? if (preg_match("/^[0-9]+\.?[0-9]*$/", $value)) {
57 >             <?php if (preg_match("/^[0-9]+\.?[0-9]*$/", $value)) {
58                      linkToHistory($graph);
59                  } ?>
60 <              <?=uptime($value)?> (<?=$value?> seconds)</td>
60 >              <?php echo uptime($value)?> (<?php echo $value?> seconds)</td>
61            </tr>
62          </table>
63 <    <?
63 >    <?php
64   }
65  
66  
# Line 76 | Line 76 | function showStat($title, $value, $input, $graph="") {
76          <table border="0" width="100%">
77            <tr>
78              <td width="50%" align="right" valign="top">
79 <             <b><?=$title?></b>
79 >             <b><?php echo $title?></b>
80              </td>
81              <td width="50%" align="left" valign="top">
82 <             <? if (preg_match("/^[0-9]+\.?[0-9]*$/", $value)) {
82 >             <?php if (preg_match("/^[0-9]+\.?[0-9]*$/", $value)) {
83                      linkToHistory($graph);
84                  } ?>
85 <              <?=$value?></td>
85 >              <?php echo $value?></td>
86            </tr>
87          </table>
88 <    <?
88 >    <?php
89   }
90  
91  
# Line 110 | Line 110 | function b2Mb($bytes) {
110   function uptime($until) {
111      $day = date('z', $until);
112      $hour = date('G', $until);
113 <    $hour = $hour - 1; # one too many
113 >    if ($hour == 0) { # everything's an hour ahead, so roll back
114 >        $hour = 23;
115 >        $day = $day - 1;
116 >    } else {
117 >        $hour = $hour - 1;
118 >    }
119      $minute = date('i', $until);
120      $return = "";
121      if ($day) {
122 <        $return = "$return$day Days ";
122 >        $return = "$return$day";
123 >        if ($day == 1) {
124 >            $return = "$return Day ";
125 >        } else {
126 >            $return = "$return Days ";
127 >        }
128      }
129      if ($hour) {
130 <        $return = "$return$hour Hours ";
130 >        $return = "$return$hour";
131 >        if ($hour == 1) {
132 >            $return = "$return Hour ";
133 >        } else {
134 >            $return = "$return Hours ";
135 >        }
136      }
137 <    return "$return$minute Mins";
137 >    $return = "$return$minute";
138 >    if ($minute == 1) {
139 >        $return = "$return Min";
140 >    } else {
141 >        $return = "$return Mins";
142 >    }
143 >    return $return;
144   }
145  
146  
# Line 136 | Line 157 | function showDisks($diskRoot, $units, $input) {
157              $total = "$diskRoot.p$i.attributes.total";
158              $graph = preg_replace("/_/", "$hex_underscore", $mount);
159              $graph = preg_replace("/\//", "$hex_slash", $graph);
160 +            $graph = preg_replace("/\\\\/", "$hex_bslash", $graph);
161 +            $graph = preg_replace("/ /", "$hex_space", $graph);
162 +            $graph = preg_replace("/:/", "$hex_colon", $graph);
163              $totalinodes = getPregMatch("$diskRoot.p$i.attributes.totalinodes", $input);
164              $freeinodes = getPregMatch("$diskRoot.p$i.attributes.freeinodes", $input);
165              showBar("$name ($mount)<br>space used", $used, $total, $units, $input, "disk-$graph");
# Line 159 | Line 183 | function showDiskIO($diskRoot, $input) {
183      while(1) {
184          $name = getPregMatch("$diskRoot.p$i.attributes.name", $input);
185          if ($name) {
186 +            $graph = preg_replace("/_/", "$hex_underscore", $name);
187 +            $graph = preg_replace("/\//", "$hex_slash", $graph);
188 +            $graph = preg_replace("/\\\\/", "$hex_bslash", $graph);
189 +            $graph = preg_replace("/ /", "$hex_space", $graph);
190 +            $graph = preg_replace("/:/", "$hex_colon", $graph);
191              print "<br><center><b>(Disk $name)</b></center>";
192 <            showStat("Read bytes (per sec)", "$diskRoot.p$i.attributes.rbytes", $input, "diskio-$name");
193 <            showStat("Write bytes (per sec)", "$diskRoot.p$i.attributes.wbytes", $input, "diskio-$name");
192 >            showStat("Read bytes (per sec)", "$diskRoot.p$i.attributes.rbytes", $input, "diskio-$graph");
193 >            showStat("Write bytes (per sec)", "$diskRoot.p$i.attributes.wbytes", $input, "diskio-$graph");
194              print "          <br>\n";
195          }
196          else {
# Line 180 | Line 209 | function showNet($netRoot, $input) {
209      while(1) {
210          $name = getPregMatch("$netRoot.p$i.attributes.name", $input);
211          if ($name) {
212 +            $graph = preg_replace("/_/", "$hex_underscore", $name);
213 +            $graph = preg_replace("/\//", "$hex_slash", $graph);
214 +            $graph = preg_replace("/\\\\/", "$hex_bslash", $graph);
215 +            $graph = preg_replace("/ /", "$hex_space", $graph);
216 +            $graph = preg_replace("/:/", "$hex_colon", $graph);
217 +            $graph = preg_replace("/\(/", "$hex_lbracket", $graph);
218 +            $graph = preg_replace("/\)/", "$hex_rbracket", $graph);
219 +            $graph = preg_replace("/\+/", "$hex_plus", $graph);
220 +            $graph = preg_replace("/#/", "$hex_hash", $graph);
221              print "<br><center><b>(Network Interface $name)</b></center>";
222 <            showStat("Received bytes (per sec)", "$netRoot.p$i.attributes.rx", $input, "net-$name");
223 <            showStat("Transfered bytes (per sec)", "$netRoot.p$i.attributes.tx", $input, "net-$name");
222 >            showStat("Received bytes (per sec)", "$netRoot.p$i.attributes.rx", $input, "net-$graph");
223 >            showStat("Transfered bytes (per sec)", "$netRoot.p$i.attributes.tx", $input, "net-$graph");
224              print "          <br>\n";
225          }
226          else {
# Line 217 | Line 255 | function showMailQ($mailqRoot, $input) {
255   # Return a preg_match result.
256   function getPregMatch($value, $input) {
257      preg_match("/$value=([^\,\}]*)[\,\}]/", $input, $matches);
258 +    if(!isset($matches[1])) {
259 +        return;
260 +    }
261      return $matches[1];
262   }
263  
# Line 259 | Line 300 | function showBar($title, $value, $max, $units, $input,
300      ?>
301          <table border="0" cellpadding="0" cellspacing="0" align="center">
302            <tr>
303 <            <td colspan="2"><? linkToHistory($graph); ?> <b><?=$title?></b> <font size="2">(<?=$value?><?=$units?>)</font></td>
303 >            <td colspan="2"><?php linkToHistory($graph); ?> <b><?php echo $title?></b> <font size="2">(<?php echo $value?><?php echo $units?>)</font></td>
304            </tr>
305            <tr>
306 <            <td colspan="2" bgcolor="#eeeeff"><img src="<?=$barImage?>" border="0" height="20" width="<?=$width?>"></td>
306 >            <td colspan="2" bgcolor="#eeeeff"><img src="<?php echo $barImage?>" border="0" height="20" width="<?php echo $width?>"></td>
307            </tr>
308            <tr>
309 <            <td colspan="2"><img src="<?=$scaleImage?>" border="0" height="11" width="<?=$max_width?>"></td>
309 >            <td colspan="2"><img src="<?php echo $scaleImage?>" border="0" height="11" width="<?php echo $max_width?>"></td>
310            </tr>
311            <tr>
312 <            <td align="left">0<?=$units?></td>
313 <            <td align="right"><?=$max?><?=$units?></td>
312 >            <td align="left">0<?php echo $units?></td>
313 >            <td align="right"><?php echo $max?><?php echo $units?></td>
314            </tr>
315          </table>
316 <    <?
316 >    <?php
317   }
318  
319  
320   ?>
321  
322 < <? include($titleHTML); ?>
322 > <?php include($titleHTML); ?>
323  
324 < <? printLine("Display the latest information received from a host"); ?>
324 > <?php printLine("Display the latest information received from a host"); ?>
325  
326 < <form method="<? echo $formMethod ?>" action="<? echo $thisPage ?>">
327 < <?
326 > <form method="<?php echo $formMethod ?>" action="<?php echo $thisPage ?>">
327 > <?php
328  
329      $file_array = getdirArray($latestDirectory,'asort');
330      print "<select size=\"1\" name=\"machine\">";
331      if ($machine) { ?>
332 <        <option selected value="<? echo $machine ?>"><? echo $machine ?></option>
332 >        <option selected value="<?php echo $machine ?>"><?php echo $machine ?></option>
333          <option value="">----------------</option>
334 <    <? }
334 >    <?php }
335      foreach($file_array as $file_name) {
336          #if (is_dir($file_name)) {
337              print "<option value=\"$file_name\">$file_name</option>";
# Line 302 | Line 343 | function showBar($title, $value, $max, $units, $input,
343   <input type="submit" name="submit" value="Display">
344   </form>
345  
346 < <? if ($machine) {
346 > <?php if ($machine) {
347  
348         $last_modified = filemtime("$latestDirectory/$machine/$latestData");
349         clearstatcache();
# Line 357 | Line 398 | EOT;
398  
399   ?>
400  
401 < <? printLine(""); ?>
401 > <?php printLine(""); ?>
402  
403 < <? include($bottomHTML); ?>
403 > <?php include($bottomHTML); ?>

Diff Legend

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