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.28 by pjm2, Sat Mar 17 22:27:22 2001 UTC vs.
Revision 1.32 by pjm2, Sat Mar 17 22:51:40 2001 UTC

# Line 59 | Line 59 | function showDisks($diskRoot, $units, $input) {
59      $i = 0;
60      while(1) {
61          $name = getPregMatch("$diskRoot.p$i.attributes.name", $input);
62 <        if ($name) {
63 <            $mount = getPregMatch("$diskRoot.p$i.attributes.mount", $input);
64 <            $used = getPregMatch("$diskRoot.p$i.attributes.used", $input);
65 <            $kbytes = getPregMatch("$diskRoot.p$i.attributes.kbytes", $input);
62 >        $mount = getPregMatch("$diskRoot.p$i.attributes.mount", $input);
63 >        if ($name || $mount) {
64 >            $used = "$diskRoot.p$i.attributes.used";
65 >            $kbytes = "$diskRoot.p$i.attributes.kbytes";
66              showBar("$name ($mount)", $used, $kbytes, $units, $input);
67          }
68 +        else {
69 +            break;
70 +        }
71          $i++;
72      }
73 +    echo "$i";
74   }
75  
76   # Return a preg_match result.
77   function getPregMatch($value, $input) {
78 <    preg_match("/$value=([^\,\}]*)\,\}/", $input, $matches);
78 >    preg_match("/$value=([^\,\}]*)[\,\}]/", $input, $matches);
79      return $matches[1];
80   }
81  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines