diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-07-01 08:30:21 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-07-01 08:30:21 -0300 |
| commit | 0e919325c010eeaa37d70f6ebe0f83169f20ac58 (patch) | |
| tree | 7e72637f9a058534d3298ec45ca6827d42d15da4 /usr | |
| parent | d6f0fb09a7274e3c7b09a47fba4025509c92e9a4 (diff) | |
| parent | 05816b87060b32d8bc3a5fd09803d5da97956706 (diff) | |
| download | pfsense-0e919325c010eeaa37d70f6ebe0f83169f20ac58.zip pfsense-0e919325c010eeaa37d70f6ebe0f83169f20ac58.tar.gz | |
Merge remote branch 'mainline/master' into 1_diag
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/www/vpn_openvpn_server.php | 6 | ||||
| -rw-r--r-- | usr/local/www/widgets/widgets/system_information.widget.php | 14 |
2 files changed, 18 insertions, 2 deletions
diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php index b213c6f..e39e93a 100644 --- a/usr/local/www/vpn_openvpn_server.php +++ b/usr/local/www/vpn_openvpn_server.php @@ -389,12 +389,14 @@ function mode_change() { document.getElementById("remote_opts").style.display=""; document.getElementById("local_opts").style.display="none"; document.getElementById("authmodetr").style.display="none"; + document.getElementById("inter_client_communication").style.display="none"; break; case "p2p_tls": document.getElementById("client_opts").style.display="none"; document.getElementById("remote_opts").style.display=""; document.getElementById("local_opts").style.display=""; document.getElementById("authmodetr").style.display="none"; + document.getElementById("inter_client_communication").style.display="none"; break; case "server_user": case "server_tls_user": @@ -402,6 +404,7 @@ function mode_change() { document.getElementById("client_opts").style.display=""; document.getElementById("remote_opts").style.display="none"; document.getElementById("local_opts").style.display=""; + document.getElementById("inter_client_communication").style.display=""; break; case "server_tls": document.getElementById("authmodetr").style.display="none"; @@ -409,6 +412,7 @@ function mode_change() { document.getElementById("client_opts").style.display=""; document.getElementById("remote_opts").style.display="none"; document.getElementById("local_opts").style.display=""; + document.getElementById("inter_client_communication").style.display=""; break; } } @@ -892,7 +896,7 @@ function netbios_change() { </table> </td> </tr> - <tr> + <tr id="inter_client_communication"> <td width="22%" valign="top" class="vncell">Inter-client communication</td> <td width="78%" class="vtable"> <table border="0" cellpadding="2" cellspacing="0"> diff --git a/usr/local/www/widgets/widgets/system_information.widget.php b/usr/local/www/widgets/widgets/system_information.widget.php index 066133f..bbdd6b5 100644 --- a/usr/local/www/widgets/widgets/system_information.widget.php +++ b/usr/local/www/widgets/widgets/system_information.widget.php @@ -130,7 +130,19 @@ $curcfg = $config['system']['firmware']; $cpumodel = ""; exec("/sbin/sysctl -n hw.model", $cpumodel); $cpumodel = implode(" ", $cpumodel); - echo (htmlspecialchars($cpumodel)); ?> + echo (htmlspecialchars($cpumodel)); + + $cpufreqs = ""; + exec("/sbin/sysctl -n dev.cpu.0.freq_levels", $cpufreqs); + $cpufreqs = explode(" ", trim($cpufreqs[0])); + $maxfreq = explode("/", $cpufreqs[0]); + $maxfreq = $maxfreq[0]; + $curfreq = ""; + exec("/sbin/sysctl -n dev.cpu.0.freq", $curfreq); + $curfreq = trim($curfreq[0]); + if ($curfreq != $maxfreq) + echo "<br/>Current: {$curfreq} MHz, Max: {$maxfreq} MHz"; + ?> </td> </tr> <?php if ($hwcrypto): ?> |
