From 806e59790949110bfc7c5ca0588c1793d5e84ea7 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 29 Aug 2013 00:12:54 -0700 Subject: Call get_uptime_sec from functions.inc.php to avoid code duplication --- usr/local/www/includes/functions.inc.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'usr/local/www/includes/functions.inc.php') diff --git a/usr/local/www/includes/functions.inc.php b/usr/local/www/includes/functions.inc.php index 2d3295a..90efcc5 100644 --- a/usr/local/www/includes/functions.inc.php +++ b/usr/local/www/includes/functions.inc.php @@ -8,6 +8,7 @@ if(Connection_Aborted()) { } require_once("config.inc"); +require_once("pfsense-utils.inc"); function get_stats() { $stats['cpu'] = cpu_usage(); @@ -77,15 +78,8 @@ function get_gatewaystats() { } function get_uptime() { - $boottime = ""; - $matches = ""; - exec("/sbin/sysctl -n kern.boottime", $boottime); - preg_match("/sec = (\d+)/", $boottime[0], $matches); - $boottime = $matches[1]; - $uptime = time() - $boottime; + $uptime = get_uptime_sec(); - if(intval($boottime) == 0) - return; if(intval($uptime) == 0) return; -- cgit v1.1