diff options
| author | Ermal <eri@pfsense.org> | 2013-12-23 14:57:16 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2013-12-23 14:57:16 +0000 |
| commit | 66cc4d430accd8cf970b55fb9eb513af9601b8b6 (patch) | |
| tree | 6dc1b1588840ea061ef381723a7aaae7aac920da | |
| parent | 0b5d55b7490e56013010cba0f1367996b5f07bb3 (diff) | |
| download | pfsense-66cc4d430accd8cf970b55fb9eb513af9601b8b6.zip pfsense-66cc4d430accd8cf970b55fb9eb513af9601b8b6.tar.gz | |
Correct displaying states status and avoid divison by zero due to wrong data collected
| -rw-r--r-- | etc/inc/util.inc | 9 | ||||
| -rw-r--r-- | usr/local/www/includes/functions.inc.php | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc index 249ea47..211610e 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -1617,8 +1617,13 @@ function set_sysctl($values) { */ function get_memory() { - $physmem = trim(`sysctl -n hw.physmem`, " \n"); - $realmem = trim(`sysctl -n hw.realmem`, " \n"); + $output = ""; + $_gb = exec("/sbin/sysctl -n hw.physmem", $output); + $physmem = trim($output[0], " \n"); + unset($output); + $_gb = exec("/sbin/sysctl -n hw.physmem", $output); + $realmem = trim($output[0], " \n"); + unset($output, $_gb); /* convert from bytes to megabytes */ return array(($physmem/1048576),($realmem/1048576)); } diff --git a/usr/local/www/includes/functions.inc.php b/usr/local/www/includes/functions.inc.php index 198da00..0c66f4a 100644 --- a/usr/local/www/includes/functions.inc.php +++ b/usr/local/www/includes/functions.inc.php @@ -145,8 +145,10 @@ function get_pfstate($percent=false) { if (preg_match("/([0-9]+)/", $curentries, $matches)) { $curentries = $matches[1]; } + if (!is_number($curentries)) + $curentries = 0; if ($percent) - if ($maxstates > 0) + if (intval($maxstates) > 0) return round(($curentries / $maxstates) * 100, 0); else return "NA"; |
