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.30 by pjm2, Sat Mar 17 22:37:32 2001 UTC vs.
Revision 1.38 by tdb, Sun May 19 15:42:26 2002 UTC

# Line 1 | Line 1
1   <?php
2  
3 + #
4 + # i-scream central monitoring system
5 + # Copyright (C) 2000-2002 i-scream
6 + #
7 + # This program is free software; you can redistribute it and/or
8 + # modify it under the terms of the GNU General Public License
9 + # as published by the Free Software Foundation; either version 2
10 + # of the License, or (at your option) any later version.
11 + #
12 + # This program is distributed in the hope that it will be useful,
13 + # but WITHOUT ANY WARRANTY; without even the implied warranty of
14 + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15 + # GNU General Public License for more details.
16 + #
17 + # You should have received a copy of the GNU General Public License
18 + # along with this program; if not, write to the Free Software
19 + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
20 + #
21 +
22   # Navigation for the i-scream reports.
23   # pjm2@ukc.ac.uk
24   #
# Line 23 | Line 42 | function showStat($title, $value, $input) {
42      $report = $value;
43  
44      $value = getPregMatch($value, $input);
45 <    if (empty($value)) {
45 >    if (!isset($value)) {
46          $value = "<i><font color=\"#999999\">not sent</font></i>";
47      }
48      ?>
# Line 59 | Line 78 | function showDisks($diskRoot, $units, $input) {
78      $i = 0;
79      while(1) {
80          $name = getPregMatch("$diskRoot.p$i.attributes.name", $input);
81 <        if ($name) {
82 <            $mount = getPregMatch("$diskRoot.p$i.attributes.mount", $input);
83 <            $used = getPregMatch("$diskRoot.p$i.attributes.used", $input);
84 <            $kbytes = getPregMatch("$diskRoot.p$i.attributes.kbytes", $input);
85 <            showBar("$name ($mount)", $used, $kbytes, $units, $input);
81 >        $mount = getPregMatch("$diskRoot.p$i.attributes.mount", $input);
82 >        if ($name || $mount) {
83 >            $used = "$diskRoot.p$i.attributes.used";
84 >            $kbytes = "$diskRoot.p$i.attributes.kbytes";
85 >            showBar("$name<br>($mount)", $used, $kbytes, $units, $input);
86          }
87          else {
88              break;
# Line 90 | Line 109 | function showBar($title, $value, $max, $units, $input,
109      if (!is_int($max)) {
110          $max = getPregMatch($max, $input);
111      }
112 <    if (empty($value) || empty($max)) {
112 >    if (!isset($value) || !isset($max)) {
113          return;
114      }
115  
# Line 100 | Line 119 | function showBar($title, $value, $max, $units, $input,
119  
120      $width = intval($max_width * $value / $max);
121  
122 +    if ($width < 1) {
123 +        $width = 1;
124 +    }
125 +
126      ?>
127          <table border="0" cellpadding="0" cellspacing="0" align="center">
128            <tr>
# Line 155 | Line 178 | function showBar($title, $value, $max, $units, $input,
178         clearstatcache();
179         $data_age = time() - $last_modified;
180  
181 <       $last_modified = date("l jS F - g:ia", $last_modified);
181 >       $last_modified = date("l jS F Y - g:ia", $last_modified);
182  
183         if ($data_age > $warning_age) {
184             $warning = <<<EOT
# Line 190 | Line 213 | EOT;
213             $input = $input[0];
214         }
215  
216 <       if (empty($input)) {
216 >       if (!isset($input)) {
217             echo "<br><br>There are currently no latest details about <b>$machine</b>.  Please notify your i-scream server administrator if you believe this to be incorrect.";
218         }
219         else {

Diff Legend

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