diff --git a/src/etc/rc.initial.restore b/src/etc/rc.initial.restore index c0292b821..06620f91a 100755 --- a/src/etc/rc.initial.restore +++ b/src/etc/rc.initial.restore @@ -44,8 +44,8 @@ DATED= for BACKUP in ${BACKUPS}; do DATETIME=${BACKUP#*config-} DATETIME=${DATETIME%.xml} - SUBSEC=${DATETIME#*[.,]} - DATETIME=${DATETIME%[.,]*} + SUBSEC=${DATETIME#*.} + DATETIME=${DATETIME%.*} # write a line with all required info that is prefixed # with a sortable time stamp for our next step... DATED="${DATED}$(date -r ${DATETIME} '+%Y-%m-%dT%H:%M:%S').${SUBSEC} ${DATETIME} ${BACKUP} diff --git a/src/www/guiconfig.inc b/src/www/guiconfig.inc index 167a90b65..b7bd57783 100644 --- a/src/www/guiconfig.inc +++ b/src/www/guiconfig.inc @@ -67,7 +67,6 @@ $lang_encoding = $lang . '.UTF-8'; $textdomain = 'OPNsense'; putenv('LANG=' . $lang_encoding); -setlocale(LC_ALL, $lang_encoding); textdomain($textdomain); bindtextdomain($textdomain, '/usr/local/share/locale'); bind_textdomain_codeset($textdomain, $lang_encoding); diff --git a/src/www/widgets/api/plugins/traffic.inc b/src/www/widgets/api/plugins/traffic.inc index 4003d23d7..e4632ebdc 100644 --- a/src/www/widgets/api/plugins/traffic.inc +++ b/src/www/widgets/api/plugins/traffic.inc @@ -30,7 +30,8 @@ function traffic_api() global $config; $result = array(); $result['interfaces'] = legacy_interface_stats(); - $result['time'] = time(); + $temp = gettimeofday(); + $result['time'] = (double)$temp["sec"] + (double)$temp["usec"] / 1000000.0; // collect user friendly interface names foreach (legacy_config_get_interfaces(array("virtual" => false)) as $interfaceKey => $interfaceData) { if (array_key_exists($interfaceData['if'], $result['interfaces'])) {