Merged Function for Single HTTP Request

3 files changed, 16 insertions, 2 deletions

diff --git a/usr/local/www/includes/functions.inc.php b/usr/local/www/includes/functions.inc.php
index 0ffbb79..1f66d5e 100644
--- a/usr/local/www/includes/functions.inc.php
+++ b/usr/local/www/includes/functions.inc.php
@@ -4,6 +4,20 @@ if(Connection_Aborted()) {
 	exit;
 }
 
+
+	function get_stats() {
+		$stats['mem'] = mem_usage();
+		$stats['cpu'] = cpu_usage();
+		$stats['uptime'] = get_uptime();
+		$stats['states'] = get_pfstate();
+		$stats['temp'] = get_temp();
+
+		$stats = join("|", $stats);
+
+		return $stats;
+	}
+
+
 function get_uptime() {
 	exec("/sbin/sysctl -n kern.boottime", $boottime);
 	preg_match("/sec = (\d+)/", $boottime[0], $matches);
diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index 5098be6..6911cc1 100755
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -50,7 +50,7 @@
 	$oSajax = new sajax();
 	$oSajax->sajax_remote_uri = 'sajax/index.sajax.php';
 	$oSajax->sajax_request_type = 'POST';
-	$oSajax->sajax_export("mem_usage","cpu_usage","get_uptime","get_pfstate", "get_temp");
+	$oSajax->sajax_export("get_stats");
 	$oSajax->sajax_handle_client_request();
 	############################################################################
 
diff --git a/usr/local/www/sajax/index.sajax.php b/usr/local/www/sajax/index.sajax.php
index a9d1f9d..7652536 100755
--- a/usr/local/www/sajax/index.sajax.php
+++ b/usr/local/www/sajax/index.sajax.php
@@ -8,6 +8,6 @@
 	require("../includes/functions.inc.php");
 
 	$oSajax = new sajax();
-	$oSajax->sajax_export("mem_usage","cpu_usage","get_uptime","get_pfstate", "get_temp");
+	$oSajax->sajax_export("get_stats");
 	$oSajax->sajax_handle_client_request();
 ?>
\ No newline at end of file