Thread: [Ipcop-svn] SF.net SVN: ipcop:[1577] ipcop/trunk

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1577
          http://ipcop.svn.sourceforge.net/ipcop/?rev=1577&view=rev
Author:   owes
Date:     2008-07-18 11:55:53 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
Restyle the NTP configuration.

Modified Paths:
--------------
    ipcop/trunk/config/cfgroot/time-settings
    ipcop/trunk/doc/Configuration-Files
    ipcop/trunk/html/cgi-bin/time.cgi
    ipcop/trunk/src/misc-progs/restartntpd.c

Modified: ipcop/trunk/config/cfgroot/time-settings
===================================================================

--- ipcop/trunk/config/cfgroot/time-settings	2008-07-16 04:14:43 UTC (rev 1576)
+++ ipcop/trunk/config/cfgroot/time-settings	2008-07-18 11:55:53 UTC (rev 1577)
@@ -1,5 +1,5 @@
-ENABLENTP=off
+ENABLED_NTP=off
 NTP_ADDR_1=0.ipcop.pool.ntp.org
 NTP_ADDR_2=1.ipcop.pool.ntp.org
 NTP_ADDR_3=2.ipcop.pool.ntp.org
-VALID=yes
+NTP_VALID=yes

Modified: ipcop/trunk/doc/Configuration-Files
===================================================================
--- ipcop/trunk/doc/Configuration-Files	2008-07-16 04:14:43 UTC (rev 1576)
+++ ipcop/trunk/doc/Configuration-Files	2008-07-18 11:55:53 UTC (rev 1577)
@@ -110,8 +110,8 @@
         Contains some config settings for ntp server.
         Written by time.cgi.
 
-        ENABLENTP                   on/off
-        VALID                       yes/no
+        ENABLED_NTP                 on/off
+        NTP_VALID                   yes/no
         NTP_ADDR_1                  NTP server 1, default 0.ipcop.pool.ntp.org
         NTP_ADDR_2                  NTP server 2, default 1.ipcop.pool.ntp.org
         NTP_ADDR_3                  NTP server 3, default 2.ipcop.pool.ntp.org

Modified: ipcop/trunk/html/cgi-bin/time.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/time.cgi	2008-07-16 04:14:43 UTC (rev 1576)
+++ ipcop/trunk/html/cgi-bin/time.cgi	2008-07-18 11:55:53 UTC (rev 1577)
@@ -34,9 +34,9 @@
 &Header::showhttpheaders();
 
 $timesettings{'ACTION'} = '';
-$timesettings{'VALID'} = '';
+$timesettings{'NTP_VALID'} = '';
 
-$timesettings{'ENABLENTP'} = 'off';
+$timesettings{'ENABLED_NTP'} = 'off';
 $timesettings{'NTP_ADDR_1'} = '';
 $timesettings{'NTP_ADDR_2'} = '';
 $timesettings{'NTP_ADDR_3'} = '';
@@ -75,11 +75,11 @@
 
 UPDTERROR:
 	if ($errormessage) {
-		$timesettings{'VALID'} = 'no'; }
+		$timesettings{'NTP_VALID'} = 'no'; }
 	else {
-		$timesettings{'VALID'} = 'yes'; }
+		$timesettings{'NTP_VALID'} = 'yes'; }
 
-	if ($timesettings{'VALID'} eq 'yes') {
+	if ($timesettings{'NTP_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'}";
@@ -101,7 +101,7 @@
 
 if ($timesettings{'ACTION'} eq $Lang::tr{'save'})
 {
-	if ($timesettings{'ENABLENTP'} eq "on" && !($timesettings{'NTP_ADDR_1'}) && !($timesettings{'NTP_ADDR_2'}))
+	if ($timesettings{'ENABLED_NTP'} eq "on" && !($timesettings{'NTP_ADDR_1'}) && !($timesettings{'NTP_ADDR_2'}))
 	{
 		$errormessage = $Lang::tr{'cannot enable ntp without specifying primary'};
 		goto ERROR;
@@ -119,7 +119,7 @@
 		goto ERROR;
 	}
 
-	if ($timesettings{'ENABLENTP'} eq 'on')
+	if ($timesettings{'ENABLED_NTP'} eq 'on')
 	{
 		if ( ! ( &General::validfqdn($timesettings{'NTP_ADDR_1'}) ||
 			 &General::validip  ($timesettings{'NTP_ADDR_1'})))
@@ -151,13 +151,13 @@
 
 ERROR:
 	if ($errormessage) {
-		$timesettings{'VALID'} = 'no'; }
+		$timesettings{'NTP_VALID'} = 'no'; }
 	else {
-		$timesettings{'VALID'} = 'yes'; }
+		$timesettings{'NTP_VALID'} = 'yes'; }
 
 	&General::writehash("${General::swroot}/time/settings", \%timesettings);
 
-	if ($timesettings{'ENABLENTP'} eq 'on' && $timesettings{'VALID'} eq 'yes') {
+	if ($timesettings{'ENABLED_NTP'} eq 'on' && $timesettings{'NTP_VALID'} eq 'yes') {
 		&General::log($Lang::tr{'ntp syncro enabled'});
 	}
 	else
@@ -178,16 +178,16 @@
 # To enter an ' into a pushbutton solution is to use &#039; in it's definition
 # but returned value when pressed is ' not the code. Cleanhtml recode the ' to enable comparison.
 $timesettings{'ACTION'} = &Header::cleanhtml ($timesettings{'ACTION'});
-if ($timesettings{'ACTION'} eq $Lang::tr{'set time now'} && $timesettings{'ENABLENTP'} eq 'on')
+if ($timesettings{'ACTION'} eq $Lang::tr{'set time now'} && $timesettings{'ENABLED_NTP'} eq 'on')
 {
 	system ('/usr/local/bin/restartntpd syncnow');
 }
 
 &General::readhash("${General::swroot}/time/settings", \%timesettings);
 
-if ($timesettings{'VALID'} eq '')
+if ($timesettings{'NTP_VALID'} eq '')
 {
-	$timesettings{'ENABLENTP'} = 'off';
+	$timesettings{'ENABLED_NTP'} = 'off';
 	$timesettings{'NTP_ADDR_1'} = '0.ipcop.pool.ntp.org';
 	$timesettings{'NTP_ADDR_2'} = '1.ipcop.pool.ntp.org';
 	$timesettings{'NTP_ADDR_3'} = '2.ipcop.pool.ntp.org';
@@ -202,9 +202,9 @@
 my %selected=();
 my %checked=();
 
-$checked{'ENABLENTP'}{'off'} = '';
-$checked{'ENABLENTP'}{'on'} = '';
-$checked{'ENABLENTP'}{$timesettings{'ENABLENTP'}} = "checked='checked'";
+$checked{'ENABLED_NTP'}{'off'} = '';
+$checked{'ENABLED_NTP'}{'on'} = '';
+$checked{'ENABLED_NTP'}{$timesettings{'ENABLED_NTP'}} = "checked='checked'";
 
 &Header::openpage($Lang::tr{'ntp configuration'}, 1, '');
 
@@ -230,7 +230,7 @@
 	<th>&nbsp;</th>
 </tr>
 <tr>
-	<td><input type='checkbox' name='ENABLENTP' $checked{'ENABLENTP'}{'on'} /></td>
+	<td><input type='checkbox' name='ENABLED_NTP' $checked{'ENABLED_NTP'}{'on'} /></td>
 	<td width='50%' colspan='2' class='base'>$Lang::tr{'network time from'}</td>
 	<td>&nbsp;</td>
 	<td>&nbsp;</td>

Modified: ipcop/trunk/src/misc-progs/restartntpd.c
===================================================================
--- ipcop/trunk/src/misc-progs/restartntpd.c	2008-07-16 04:14:43 UTC (rev 1576)
+++ ipcop/trunk/src/misc-progs/restartntpd.c	2008-07-18 11:55:53 UTC (rev 1577)
@@ -82,7 +82,7 @@
 		fprintf(stderr, "Cannot read time settings\n");
 		return 1;
 	}
-	if ( find_kv_default(kv, "ENABLENTP", buffer) && !strcmp(buffer,"on") )
+	if ( find_kv_default(kv, "ENABLED_NTP", buffer) && !strcmp(buffer,"on") )
 	{
 		enable = 1;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Ipcop-svn] SF.net SVN: ipcop:[1577] ipcop/trunk

Linux firewall distribution geared towards home and SOHO users.

ipcop-svn