Timectrl geschrieben.

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

diff --git a/html/cgi-bin/time.cgi b/html/cgi-bin/time.cgi
index aa96479da47ccf527253c001e7a36693a7b2f56c..689f988c81bead7ec087933eb35a934a8a047124 100644 (file)
--- a/html/cgi-bin/time.cgi
+++ b/html/cgi-bin/time.cgi
@@ -19,7 +19,7 @@ use strict;
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
 
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
 

-require 'CONFIG_ROOT/general-functions.pl';
+require '/var/ipfire/general-functions.pl';

 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 


@@ -46,49 +46,6 @@ $timesettings{'SETYEAR'} = '';
 
 &Header::getcgihash(\%timesettings);
 
 
 &Header::getcgihash(\%timesettings);
 

-if ($timesettings{'ACTION'} eq $Lang::tr{'instant update'})
-{
-       if ($timesettings{'SETHOUR'} eq '' || $timesettings{'SETHOUR'} < 0 || $timesettings{'SETHOUR'} > 23) {
-               $errormessage = $Lang::tr{'invalid time entered'};
-               goto UPDTERROR;
-       }
-       if ($timesettings{'SETMINUTES'} eq '' || $timesettings{'SETMINUTES'} < 0 || $timesettings{'SETMINUTES'} > 59) {
-               $errormessage = $Lang::tr{'invalid time entered'};
-               goto UPDTERROR;
-       }
-       if ($timesettings{'SETDAY'} eq '' || $timesettings{'SETDAY'} < 1 || $timesettings{'SETDAY'} > 31) {
-               $errormessage = $Lang::tr{'invalid date entered'};
-               goto UPDTERROR;
-       }
-       if ($timesettings{'SETMONTH'} eq '' || $timesettings{'SETMONTH'} < 1 || $timesettings{'SETMONTH'} > 12) {
-               $errormessage = $Lang::tr{'invalid date entered'};
-               goto UPDTERROR;
-       }
-       if ($timesettings{'SETYEAR'} eq '' || $timesettings{'SETYEAR'} < 2003 || $timesettings{'SETYEAR'} > 2030) {
-               $errormessage = $Lang::tr{'invalid date entered'};
-               goto UPDTERROR;
-       }
-
-UPDTERROR:
-       if ($errormessage) {
-               $timesettings{'VALID'} = 'no'; }
-       else {
-               $timesettings{'VALID'} = 'yes'; }
-
-       if ($timesettings{'VALID'} eq 'yes') {
-               # we want date in YYYY-MM-DD HH:MM format for date command
-               # EAO changed datestring to ISO 6801 format 2003-08-11
-               my $datestring = "$timesettings{'SETYEAR'}-$timesettings{'SETMONTH'}-$timesettings{'SETDAY'}";
-               my $timestring = "$timesettings{'SETHOUR'}:$timesettings{'SETMINUTES'}";
-               # EAO setdate.c also revised for ISO 6801 date format 2003-08-11
-               system ('/usr/local/bin/setdate', $datestring, $timestring);
-               &General::log("$Lang::tr{'time date manually reset'} $datestring $timestring");
-       }
-       unless ($errormessage) {
-               undef %timesettings;
-       }
-}
-

 if ($timesettings{'ACTION'} eq $Lang::tr{'save'})
 { 
        if ($timesettings{'ENABLENTP'} eq 'on')
 if ($timesettings{'ACTION'} eq $Lang::tr{'save'})
 { 
        if ($timesettings{'ENABLENTP'} eq 'on')


@@ -166,7 +123,8 @@ ERROR:
 
        if ($timesettings{'ENABLENTP'} eq 'on' && $timesettings{'VALID'} eq 'yes')
        {
 
        if ($timesettings{'ENABLENTP'} eq 'on' && $timesettings{'VALID'} eq 'yes')
        {

-               system ('/bin/touch', "${General::swroot}/time/enable");
+               system ('/usr/bin/touch', "${General::swroot}/time/enable");
+               system ('/usr/local/bin/timectrl enable >/dev/null 2>&1');

                &General::log($Lang::tr{'ntp syncro enabled'});
                unlink "${General::swroot}/time/counter";
                if ($timesettings{'UPDATE_METHOD'} eq 'periodically')
                &General::log($Lang::tr{'ntp syncro enabled'});
                unlink "${General::swroot}/time/counter";
                if ($timesettings{'UPDATE_METHOD'} eq 'periodically')


@@ -178,7 +136,7 @@ ERROR:
                }
                if ($timesettings{'ENABLECLNTP'} eq 'on') # DPC added to 1.3.1
                {
                }
                if ($timesettings{'ENABLECLNTP'} eq 'on') # DPC added to 1.3.1
                {

-                       system ('/bin/touch', "${General::swroot}/time/allowclients"); # DPC added to 1.3.1
+                       system ('/usr/bin/touch', "${General::swroot}/time/allowclients"); # DPC added to 1.3.1

                        &General::log($Lang::tr{'ntpd restarted'}); # DPC added to 1.3.1
                } else {
                        unlink "${General::swroot}/time/allowclients";
                        &General::log($Lang::tr{'ntpd restarted'}); # DPC added to 1.3.1
                } else {
                        unlink "${General::swroot}/time/allowclients";


@@ -190,10 +148,11 @@ ERROR:
                unlink "${General::swroot}/time/enable";
                unlink "${General::swroot}/time/settimenow";
                unlink "${General::swroot}/time/allowclients"; # DPC added to 1.3.1
                unlink "${General::swroot}/time/enable";
                unlink "${General::swroot}/time/settimenow";
                unlink "${General::swroot}/time/allowclients"; # DPC added to 1.3.1

+               system ('/usr/local/bin/timectrl disable >/dev/null 2>&1');

                &General::log($Lang::tr{'ntp syncro disabled'})
        }
        if (! $errormessage) {
                &General::log($Lang::tr{'ntp syncro disabled'})
        }
        if (! $errormessage) {

-               system ('/usr/local/bin/restartntpd'); # DPC added to 1.3.1
+               system ('/usr/local/bin/timectrl restart >/dev/null 2>&1'); # DPC added to 1.3.1

        }
 }
 
        }
 }
 


@@ -202,7 +161,8 @@ ERROR:
 $timesettings{'ACTION'} = &Header::cleanhtml ($timesettings{'ACTION'});
 if ($timesettings{'ACTION'} eq $Lang::tr{'set time now'} && $timesettings{'ENABLENTP'} eq 'on')
 {
 $timesettings{'ACTION'} = &Header::cleanhtml ($timesettings{'ACTION'});
 if ($timesettings{'ACTION'} eq $Lang::tr{'set time now'} && $timesettings{'ENABLENTP'} eq 'on')
 {

-       system ('/bin/touch', "${General::swroot}/time/settimenow");
+       system ('/usr/bin/touch', "${General::swroot}/time/settimenow");
+       system ('/usr/local/bin/timecheck >& /dev/null');

 }
 
 &General::readhash("${General::swroot}/time/settings", \%timesettings);
 }
 
 &General::readhash("${General::swroot}/time/settings", \%timesettings);


@@ -213,7 +173,7 @@ if ($timesettings{'VALID'} eq '')
        $timesettings{'UPDATE_METHOD'} = 'manually';
        $timesettings{'UPDATE_VALUE'} = '1';
        $timesettings{'UPDATE_PERIOD'} = 'daily';
        $timesettings{'UPDATE_METHOD'} = 'manually';
        $timesettings{'UPDATE_VALUE'} = '1';
        $timesettings{'UPDATE_PERIOD'} = 'daily';

-       $timesettings{'NTP_ADDR_1'} = 'pool.ntp.org';
+       $timesettings{'NTP_ADDR_1'} = 'de.pool.ntp.org';

        $timesettings{'NTP_ADDR_2'} = 'pool.ntp.org';
 }
 
        $timesettings{'NTP_ADDR_2'} = 'pool.ntp.org';
 }
 


@@ -345,9 +305,7 @@ print <<END
        <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='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'>
-               <a href='${General::adminmanualurl}/services.html#services_time' target='_blank'><img src='/images/web-support.png' title='$Lang::tr{'online help en'}' /></a>
-       </td>
+       <td width='5%' align='right'>&nbsp;</td>

 </tr>
 </table>
 END
 </tr>
 </table>
 END


@@ -355,34 +313,6 @@ END
 
 &Header::closebox();
 
 
 &Header::closebox();
 

-&Header::openbox('100%', 'left', $Lang::tr{'update time'});
-
-print <<END
-<table width='100%'>
-<tr>
-       <td width='65%' class='base'>
-       <table> 
-       <tr>
-               <td>$Lang::tr{'year'}:&nbsp;</td>
-               <td><input type='text' name='SETYEAR' size='4' maxlength='4' value='$timesettings{'SETYEAR'}' /></td>
-               <td>&nbsp;$Lang::tr{'month'}:&nbsp;</td>
-               <td><input type='text' name='SETMONTH' size='2' maxlength='2' value='$timesettings{'SETMONTH'}' /></td>
-               <td>&nbsp;$Lang::tr{'day'}:&nbsp;</td>
-               <td><input type='text' name='SETDAY' size='2' maxlength='2' value='$timesettings{'SETDAY'}' /></td>
-               <td>&nbsp;&nbsp;&nbsp;&nbsp;$Lang::tr{'hours2'}:&nbsp;</td>
-               <td><input type='text' name='SETHOUR' size='2' maxlength='2' value='$timesettings{'SETHOUR'}' /></td>
-               <td>&nbsp;$Lang::tr{'minutes'}:&nbsp;</td>
-               <td><input type='text' name='SETMINUTES' size='2' maxlength='2' value='$timesettings{'SETMINUTES'}' /></td>
-       </tr>   
-       </table>
-       </td>
-       <td width='35%' align='center' class='base'><input type='submit' name='ACTION' value='$Lang::tr{'instant update'}' /></td>
-</tr>
-</table>
-END
-;
-&Header::closebox();
-

 print "</form>\n";
 
 &Header::closebigbox();
 print "</form>\n";
 
 &Header::closebigbox();