Fix and improve swap_usage()

- Fix a typo on awk syntax
- Use php functions to extract desired value from swapinfo output

1 files changed, 8 insertions, 4 deletions

diff --git a/usr/local/www/includes/functions.inc.php b/usr/local/www/includes/functions.inc.php
index 12cad74..2a98883 100644
--- a/usr/local/www/includes/functions.inc.php
+++ b/usr/local/www/includes/functions.inc.php
@@ -183,11 +183,15 @@ function disk_usage() {
 }
 
 function swap_usage() {
-	$swapUsage = `/usr/sbin/swapinfo | /usr/bin/awk '{print $5;'}|/usr/bin/grep '%'`;
-	$swapUsage = ereg_replace('%', "", $swapUsage);
-	$swapUsage = rtrim($swapUsage);
+	$swap_info = exec_command("/usr/sbin/swapinfo");
+	$swap_used = "";
+	foreach (explode("\n", $swap_info) as $line)
+		if (preg_match('/(\d+)%$/', $line, $matches)) {
+			$swap_used = $matches[1];
+			break;
+		}
 
-	return $swapUsage;
+	return $swap_used;
 }
 
 function mem_usage() {