diff options
author | Erik Kristensen <ekristen@pfsense.org> | 2005-09-18 04:58:40 +0000 |
---|---|---|
committer | Erik Kristensen <ekristen@pfsense.org> | 2005-09-18 04:58:40 +0000 |
commit | 477361c744252f8e67cf42b2600bf34a2df59afa (patch) | |
tree | 5ff72279b8980bdc196b4ffc2bdfaaf768b37e83 | |
parent | be88414ade55b6745c7866d1dc7eab763c12b573 (diff) | |
download | pfsense-477361c744252f8e67cf42b2600bf34a2df59afa.zip pfsense-477361c744252f8e67cf42b2600bf34a2df59afa.tar.gz |
Merged Function for Single HTTP Request
-rw-r--r-- | usr/local/www/includes/functions.inc.php | 14 | ||||
-rwxr-xr-x | usr/local/www/index.php | 2 | ||||
-rwxr-xr-x | usr/local/www/sajax/index.sajax.php | 2 |
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 |