proxy.pac: Don't use proxy for direct domain access.

[people/teissler/ipfire-2.x.git] / html / cgi-bin / time.cgi

diff --git a/html/cgi-bin/time.cgi b/html/cgi-bin/time.cgi
index c68eb999fdef389170db1d10bde7927a575ec636..39d71f84257b9c353d9ee884c13d959f5c2ae148 100644 (file)
--- a/html/cgi-bin/time.cgi
+++ b/html/cgi-bin/time.cgi
@@ -174,8 +174,8 @@ if ($timesettings{'VALID'} eq '')
        $timesettings{'UPDATE_METHOD'} = 'manually';
        $timesettings{'UPDATE_VALUE'} = '1';
        $timesettings{'UPDATE_PERIOD'} = 'daily';
-       $timesettings{'NTP_ADDR_1'} = 'de.pool.ntp.org';
-       $timesettings{'NTP_ADDR_2'} = 'pool.ntp.org';
+       $timesettings{'NTP_ADDR_1'} = '0.ipfire.pool.ntp.org';
+       $timesettings{'NTP_ADDR_2'} = '1.ipfire.pool.ntp.org';
        $timesettings{'ENABLESETONBOOT'} = 'off';
 }
 
@@ -233,13 +233,9 @@ if ($errormessage) {
 
 print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
 
-&Header::openbox('100%', 'left', $Lang::tr{'network time'});
+&Header::openbox('100%', 'left', $Lang::tr{'ntp common settings'});
 print <<END
 <table width='100%'>
-<tr>
-       <td colspan='2'><strong>$Lang::tr{'ntp common settings'}</strong></td>
-</tr>
-
 <tr>
        <td><input type='checkbox' name='ENABLENTP' $checked{'ENABLENTP'}{'on'} /></td>
        <td width='100%' colspan='4' class='base'>$Lang::tr{'network time from'}</td>
@@ -281,10 +277,12 @@ print <<END
        <td class='base' colspan='4'><input type='checkbox' name='ENABLESETONBOOT' $checked{'ENABLESETONBOOT'}{'on'} /> $Lang::tr{'Set time on boot'}</td>
 </tr>
 </table>
+END
+;
+&Header::closebox();
+&Header::openbox('100%',1,$Lang::tr{'ntp sync'});
+print <<END
 <table width='100%'>
-<tr>
-       <td colspan='4'><hr /><strong>$Lang::tr{'ntp sync'}</strong></td>
-</tr>
 <tr>
        <td class='base'><input type='radio' name='UPDATE_METHOD' value='periodically' $checked{'UPDATE_METHOD'}{'periodically'} /></td>
        <td width='10%'>$Lang::tr{'every'}</td>
@@ -302,7 +300,7 @@ print <<END
        <td colspan='2'>$Lang::tr{'manually'}</td>
 </tr>
 <tr>
-       <td colspan='4'><hr /><strong>$Lang::tr{'update time'}</strong></td>
+       <td colspan='4'><br><br><strong>$Lang::tr{'update time'}</strong></td>
 </tr>
 <tr>
        <td>&nbsp;</td>
@@ -322,9 +320,8 @@ print <<END
 <table width='100%'>
 <tr>
        <td width='30%'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td>
-       <td width='40%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'set time now'}' /></td>
-       <td width='25%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
-       <td width='5%' align='right'>&nbsp;</td>
+       <td width='65%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'set time now'}' /></td>
+       <td width='5%' align='right'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
 </tr>
 </table>
 END