michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Never just crash if hardware time cannot be read http://virtualmin.com/node/31933

Browse Source
This commit is contained in:
Jamie Cameron
2013-12-29 20:48:28 -08:00
parent 17c1e32c48
commit 4d2e876a68
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
time/index.cgi
View File

@@ -69,16 +69,22 @@ else
# Get the hardware time
if (&support_hwtime()) {
local @tm = &get_hardware_time();
@tm || &error($get_hardware_time_error || $text{'index_eformat'});
$hw_date{ 'second' } = $tm[0];
$hw_date{ 'minute' } = $tm[1];
$hw_date{ 'hour' } = $tm[2];
$hw_date{ 'date' } = $tm[3];
$hw_date{ 'month' } = &number_to_month($tm[4]);
$hw_date{ 'year'} = $tm[5]+1900;
$hw_date{ 'day' } = &number_to_weekday($tm[6]);
if (@tm) {
$hw_date{'second'} = $tm[0];
$hw_date{'minute'} = $tm[1];
$hw_date{'hour'} = $tm[2];
$hw_date{'date'} = $tm[3];
$hw_date{'month'} = &number_to_month($tm[4]);
$hw_date{'year'} = $tm[5]+1900;
$hw_date{'day'} = &number_to_weekday($tm[6]);
}
if(!$access{'hwdate'}) {
if (!@tm) {
# Didn't actually work!
print $get_hardware_time_error || $text{'index_eformat'};
print "<p>\n";
}
elsif (!$access{'hwdate'}) {
# Allow editing of hardware time
if( !$access{ 'sysdate' } ) {
$hw_date{ 'second' } = $system_date{ 'second' } if( $hw_date{ 'second' } - $system_date{ 'second' } <= $config{ 'lease' } );