mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure NTP values are treated as numbers before use. Fixes #9558

Browse Source
This commit is contained in:
jim-p 2019-05-28 14:00:25 -04:00
parent ad1d975acc
commit c92dbfc189
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/usr/local/www/status_ntpd.php
View File

@ -115,9 +115,9 @@ if ($allow_query) {
$gps_lat_min = substr($gps_vars[3], 2);
$gps_lon_deg = substr($gps_vars[5], 0, 3);
$gps_lon_min = substr($gps_vars[5], 3);
$gps_lat = $gps_lat_deg + $gps_lat_min / 60.0;
$gps_lat = (float) $gps_lat_deg + $gps_lat_min / 60.0;
$gps_lat = $gps_lat * (($gps_vars[4] == "N") ? 1 : -1);
$gps_lon = $gps_lon_deg + $gps_lon_min / 60.0;
$gps_lon = (float) $gps_lon_deg + $gps_lon_min / 60.0;
$gps_lon = $gps_lon * (($gps_vars[6] == "E") ? 1 : -1);
$gps_lat_dir = $gps_vars[4];
$gps_lon_dir = $gps_vars[6];
@ -128,9 +128,9 @@ if ($allow_query) {
$gps_lat_min = substr($gps_vars[2], 2);
$gps_lon_deg = substr($gps_vars[4], 0, 3);
$gps_lon_min = substr($gps_vars[4], 3);
$gps_lat = $gps_lat_deg + $gps_lat_min / 60.0;
$gps_lat = (float) $gps_lat_deg + $gps_lat_min / 60.0;
$gps_lat = $gps_lat * (($gps_vars[3] == "N") ? 1 : -1);
$gps_lon = $gps_lon_deg + $gps_lon_min / 60.0;
$gps_lon = (float) $gps_lon_deg + $gps_lon_min / 60.0;
$gps_lon = $gps_lon * (($gps_vars[5] == "E") ? 1 : -1);
$gps_alt = $gps_vars[9];
$gps_alt_unit = $gps_vars[10];
@ -144,9 +144,9 @@ if ($allow_query) {
$gps_lat_min = substr($gps_vars[1], 2);
$gps_lon_deg = substr($gps_vars[3], 0, 3);
$gps_lon_min = substr($gps_vars[3], 3);
$gps_lat = $gps_lat_deg + $gps_lat_min / 60.0;
$gps_lat = (float) $gps_lat_deg + $gps_lat_min / 60.0;
$gps_lat = $gps_lat * (($gps_vars[2] == "N") ? 1 : -1);
$gps_lon = $gps_lon_deg + $gps_lon_min / 60.0;
$gps_lon = (float) $gps_lon_deg + $gps_lon_min / 60.0;
$gps_lon = $gps_lon * (($gps_vars[4] == "E") ? 1 : -1);
$gps_lat_dir = $gps_vars[2];
$gps_lon_dir = $gps_vars[4];
@ -157,9 +157,9 @@ if ($allow_query) {
$gps_lat_min = substr($gps_vars[6], 2);
$gps_lon_deg = substr($gps_vars[8], 0, 3);
$gps_lon_min = substr($gps_vars[8], 3);
$gps_lat = $gps_lat_deg + $gps_lat_min / 60.0;
$gps_lat = (float) $gps_lat_deg + $gps_lat_min / 60.0;
$gps_lat = $gps_lat * (($gps_vars[7] == "N") ? 1 : -1);
$gps_lon = $gps_lon_deg + $gps_lon_min / 60.0;
$gps_lon = (float) $gps_lon_deg + $gps_lon_min / 60.0;
$gps_lon = $gps_lon * (($gps_vars[9] == "E") ? 1 : -1);
$gps_lat_dir = $gps_vars[7];
$gps_lon_dir = $gps_vars[9];

16
src/usr/local/www/widgets/widgets/ntp_status.widget.php
View File

@ -71,9 +71,9 @@ if ($_REQUEST['updateme']) {
$gps_lat_min = substr($gps_vars[3], 2);
$gps_lon_deg = substr($gps_vars[5], 0, 3);
$gps_lon_min = substr($gps_vars[5], 3);
$gps_lat = $gps_lat_deg + $gps_lat_min / 60.0;
$gps_lat = (float) $gps_lat_deg + $gps_lat_min / 60.0;
$gps_lat = $gps_lat * (($gps_vars[4] == "N") ? 1 : -1);
$gps_lon = $gps_lon_deg + $gps_lon_min / 60.0;
$gps_lon = (float) $gps_lon_deg + $gps_lon_min / 60.0;
$gps_lon = $gps_lon * (($gps_vars[6] == "E") ? 1 : -1);
$gps_lat_dir = $gps_vars[4];
$gps_lon_dir = $gps_vars[6];
@ -84,9 +84,9 @@ if ($_REQUEST['updateme']) {
$gps_lat_min = substr($gps_vars[2], 2);
$gps_lon_deg = substr($gps_vars[4], 0, 3);
$gps_lon_min = substr($gps_vars[4], 3);
$gps_lat = $gps_lat_deg + $gps_lat_min / 60.0;
$gps_lat = (float) $gps_lat_deg + $gps_lat_min / 60.0;
$gps_lat = $gps_lat * (($gps_vars[3] == "N") ? 1 : -1);
$gps_lon = $gps_lon_deg + $gps_lon_min / 60.0;
$gps_lon = (float) $gps_lon_deg + $gps_lon_min / 60.0;
$gps_lon = $gps_lon * (($gps_vars[5] == "E") ? 1 : -1);
$gps_alt = $gps_vars[9];
$gps_alt_unit = $gps_vars[10];
@ -100,9 +100,9 @@ if ($_REQUEST['updateme']) {
$gps_lat_min = substr($gps_vars[1], 2);
$gps_lon_deg = substr($gps_vars[3], 0, 3);
$gps_lon_min = substr($gps_vars[3], 3);
$gps_lat = $gps_lat_deg + $gps_lat_min / 60.0;
$gps_lat = (float) $gps_lat_deg + $gps_lat_min / 60.0;
$gps_lat = $gps_lat * (($gps_vars[2] == "N") ? 1 : -1);
$gps_lon = $gps_lon_deg + $gps_lon_min / 60.0;
$gps_lon = (float) $gps_lon_deg + $gps_lon_min / 60.0;
$gps_lon = $gps_lon * (($gps_vars[4] == "E") ? 1 : -1);
$gps_lat_dir = $gps_vars[2];
$gps_lon_dir = $gps_vars[4];
@ -113,9 +113,9 @@ if ($_REQUEST['updateme']) {
$gps_lat_min = substr($gps_vars[6], 2);
$gps_lon_deg = substr($gps_vars[8], 0, 3);
$gps_lon_min = substr($gps_vars[8], 3);
$gps_lat = $gps_lat_deg + $gps_lat_min / 60.0;
$gps_lat = (float) $gps_lat_deg + $gps_lat_min / 60.0;
$gps_lat = $gps_lat * (($gps_vars[7] == "N") ? 1 : -1);
$gps_lon = $gps_lon_deg + $gps_lon_min / 60.0;
$gps_lon = (float) $gps_lon_deg + $gps_lon_min / 60.0;
$gps_lon = $gps_lon * (($gps_vars[9] == "E") ? 1 : -1);
$gps_lat_dir = $gps_vars[7];
$gps_lon_dir = $gps_vars[9];