diff --git a/usr/local/www/index.php b/usr/local/www/index.php index 5340c3fa46..5eb4864fa5 100755 --- a/usr/local/www/index.php +++ b/usr/local/www/index.php @@ -92,63 +92,6 @@ if ($fd) { fclose($fd); } -function get_uptime() { - exec("/sbin/sysctl -n kern.boottime", $boottime); - preg_match("/sec = (\d+)/", $boottime[0], $matches); - $boottime = $matches[1]; - $uptime = time() - $boottime; - - if ($uptime > 60) - $uptime += 30; - $updays = (int)($uptime / 86400); - $uptime %= 86400; - $uphours = (int)($uptime / 3600); - $uptime %= 3600; - $upmins = (int)($uptime / 60); - - $uptimestr = ""; - if ($updays > 1) - $uptimestr .= "$updays days, "; - else if ($updays > 0) - $uptimestr .= "1 day, "; - $uptimestr .= sprintf("%02d:%02d", $uphours, $upmins); - return $uptimestr; -} - -function get_cputicks() { - $cputicks = explode(" ", `/sbin/sysctl -n kern.cp_time`); - return $cputicks; -} - -function get_cpuusage($cpuTicks, $cpuTicks2) { - -$diff = array(); -$diff['user'] = ($cpuTicks2[0] - $cpuTicks[0])+1; -$diff['nice'] = ($cpuTicks2[1] - $cpuTicks[1])+1; -$diff['sys'] = ($cpuTicks2[2] - $cpuTicks[2])+1; -$diff['intr'] = ($cpuTicks2[3] - $cpuTicks[3])+1; -$diff['idle'] = ($cpuTicks2[4] - $cpuTicks[4])+1; - -//echo ""; - -$totalDiff = $diff['user'] + $diff['nice'] + $diff['sys'] + $diff['intr'] + $diff['idle']; -$cpuUsage = round(100 * (1 - $diff['idle'] / $totalDiff), 0); - -return $cpuUsage; -} - -function get_pfstate() { - global $config; - if (isset($config['system']['maximumstates']) and $config['system']['maximumstates'] > 0) - $maxstates="/{$config['system']['maximumstates']}"; - else - $maxstates="/10000"; - $curentries = `/sbin/pfctl -si |grep current`; - if (preg_match("/([0-9]+)/", $curentries, $matches)) { - $curentries = $matches[1]; - } - return $curentries . $maxstates; -} $pgtitle = "pfSense webGUI"; /* include header and other code */ @@ -159,170 +102,19 @@ include("head.inc");
+

System Overview

+
"; ?> -

System Overview

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - "") { -echo " "; -echo " "; -echo " "; -echo " "; - } -?> - - - - - - -
System information
Name - -
Version - -
- built on - -
Platform - -
Hardware crypto - -
Uptime - "; - ?> -
Last config change - -
State table size - "; - ?> -
- Show states -
CPU usage - + + -echo ""; -echo ""; -echo ""; -echo " "; -echo ""; -//echo $cpuUsage . "%"; -?> -
Memory usage -"; -echo ""; -echo ""; -echo " "; -echo ""; -//echo $memUsage . "%"; -?> -
SWAP usage - -"; -echo ""; -echo ""; -echo " "; -echo ""; -//echo $swapUsage . "%"; - -?> -
Temperature "; -// Initialize hw monitor -exec("/usr/local/sbin/env4801 -i"); -$Temp = rtrim(`/usr/local/sbin/env4801 | grep Temp |cut -c24-25`); -echo ""; -echo ""; -echo ""; -echo " "; -echo ""; -echo "
Disk usage -"; -echo ""; -echo ""; -echo " "; -echo $diskusage . "%"; -?> -
-
- + \n"; - - if(are_notices_pending() == true and $found_notices == false) { - /* found a notice, lets redirect so they can see the notice */ - $counter = 500; - } - - /* - * prevent user from running out of ram. - * firefox and ie can be a bear on ram usage! - */ - $counter++; - if($counter > 120) { - echo "Redirecting to Main Status.

"; - echo ""; - exit; - } - -} - -?> + \ No newline at end of file diff --git a/usr/local/www/themes/metallic/all.css b/usr/local/www/themes/metallic/all.css index 4bddd936a2..59c328ec4f 100644 --- a/usr/local/www/themes/metallic/all.css +++ b/usr/local/www/themes/metallic/all.css @@ -22,7 +22,9 @@ form input { iframe { border: 0px; } - +.iframe { + background-color: #FFFFFF; +} /* ID Based CSS Definitions */ #wrapper {