Cleanup some text and fix default behavior of some NTP options to match 2.2.6 and what the text described.

3 files changed, 48 insertions, 47 deletions

diff --git a/src/usr/local/www/services_ntpd.php b/src/usr/local/www/services_ntpd.php
index 0600045..adde884 100644
--- a/src/usr/local/www/services_ntpd.php
+++ b/src/usr/local/www/services_ntpd.php
@@ -300,7 +300,7 @@ $section->addInput(new Form_Select(
 $timeservers = explode(' ', $config['system']['timeservers']);
 $maxrows = max(count($timeservers), 1);
 for ($counter=0; $counter < $maxrows; $counter++) {
-	$group = new Form_Group($counter == 0 ? 'Time servers':'');
+	$group = new Form_Group($counter == 0 ? 'Time Servers':'');
 	$group->addClass('repeatable');
 
 	$group->add(new Form_Input(
@@ -347,7 +347,7 @@ $section->addInput(new Form_StaticText(
 
 $section->addInput(new Form_Input(
 	'ntporphan',
-	'Orphan mode',
+	'Orphan Mode',
 	'text',
 	$pconfig['ntporphan']
 ))->setHelp('Orphan mode allows the system clock to be used when no other clocks are available. ' .
@@ -363,15 +363,15 @@ $section->addInput(new Form_Checkbox(
 
 $section->addInput(new Form_Checkbox(
 	'logpeer',
-	'Syslog logging',
-	'Enable logging of peer messages (default: disabled).',
+	'Logging',
+	'Log peer messages (default: disabled).',
 	$pconfig['logpeer']
 ));
 
 $section->addInput(new Form_Checkbox(
 	'logsys',
 	null,
-	'Enable logging of system messages (default: disabled).',
+	'Log system messages (default: disabled).',
 	$pconfig['logsys']
 ))->setHelp('These options enable additional messages from NTP to be written to the System Log ' .
 			'<a href="diag_logs_ntpd.php">' . 'Status > System Logs > NTP' . '</a>');
@@ -385,28 +385,28 @@ $btnadvstats = new Form_Button(
 $btnadvstats->removeClass('btn-primary')->addClass('btn-default btn-sm');
 
 $section->addInput(new Form_StaticText(
-	'Statistics logging',
+	'Statistics Logging',
 	$btnadvstats
 ))->setHelp('Warning: These options will create persistent daily log files in /var/log/ntp.');
 
 $section->addInput(new Form_Checkbox(
 	'clockstats',
 	null,
-	'Enable logging of reference clock statistics (default: disabled).',
+	'Log reference clock statistics (default: disabled).',
 	$pconfig['clockstats']
 ));
 
 $section->addInput(new Form_Checkbox(
 	'loopstats',
 	null,
-	'Enable logging of clock discipline statistics (default: disabled).',
+	'Log clock discipline statistics (default: disabled).',
 	$pconfig['loopstats']
 ));
 
 $section->addInput(new Form_Checkbox(
 	'peerstats',
 	null,
-	'Enable logging of NTP peer statistics (default: disabled).',
+	'Log NTP peer statistics (default: disabled).',
 	$pconfig['peerstats']
 ));
 
@@ -426,43 +426,43 @@ $section->addInput(new Form_StaticText(
 $section->addInput(new Form_Checkbox(
 	'kod',
 	null,
-	'Enable Kiss-o\'-death packets (default: enabled).',
-	$pconfig['kod']
+	'Enable Kiss-o\'-death packets (default: checked).',
+	!$pconfig['kod']
 ));
 
 $section->addInput(new Form_Checkbox(
 	'nomodify',
 	null,
-	'Deny state modifications (i.e. run time configuration) by ntpq and ntpdc (default: enabled).',
-	$pconfig['nomodify']
+	'Deny state modifications (i.e. run time configuration) by ntpq and ntpdc (default: checked).',
+	!$pconfig['nomodify']
 ));
 
 $section->addInput(new Form_Checkbox(
 	'noquery',
 	null,
-	'Disable ntpq and ntpdc queries (default: disabled).',
+	'Disable ntpq and ntpdc queries (default: unchecked).',
 	$pconfig['noquery']
 ));
 
 $section->addInput(new Form_Checkbox(
 	'noserve',
 	null,
-	'Disable all except ntpq and ntpdc queries (default: disabled).',
+	'Disable all except ntpq and ntpdc queries (default: unchecked).',
 	$pconfig['noserve']
 ));
 
 $section->addInput(new Form_Checkbox(
 	'nopeer',
 	null,
-	'Deny packets that attempt a peer association (default: enabled).',
-	$pconfig['nopeer']
+	'Deny packets that attempt a peer association (default: checked).',
+	!$pconfig['nopeer']
 ));
 
 $section->addInput(new Form_Checkbox(
 	'notrap',
 	null,
-	'Deny mode 6 control message trap service (default: enabled).',
-	$pconfig['notrap']
+	'Deny mode 6 control message trap service (default: checked).',
+	!$pconfig['notrap']
 ))->addClass('advrestrictions');
 
 // Leap seconds section
@@ -522,6 +522,7 @@ events.push(function() {
 
 	// On click, show the controls in the restrictions section
 	$("#btnadvrestr").click(function() {
+		hideCheckbox('kod', false);
 		hideCheckbox('nomodify', false);
 		hideCheckbox('noquery', false);
 		hideCheckbox('noserve', false);
diff --git a/src/usr/local/www/services_ntpd_gps.php b/src/usr/local/www/services_ntpd_gps.php
index fc60424..5b68470 100644
--- a/src/usr/local/www/services_ntpd_gps.php
+++ b/src/usr/local/www/services_ntpd_gps.php
@@ -249,7 +249,7 @@ $gpstypes = array('Custom', 'Default', 'Generic', 'Garmin', 'MediaTek', 'SiRF',
 
 $section->addInput(new Form_Select(
 	'gpstype',
-	'GPS',
+	'GPS Type',
 	$pconfig['type'],
 	array_combine($gpstypes, $gpstypes)
 ))->setHelp('This option allows you to select a predefined configuration. ' .
@@ -268,7 +268,7 @@ if (!empty($serialports)) {
 
 	$section->addInput(new Form_Select(
 		'gpsport',
-		'Serial port',
+		'Serial Port',
 		$pconfig['port'],
 		$splist
 	))->setHelp('All serial ports are listed, be sure to pick the port with the GPS attached. ');
@@ -294,14 +294,14 @@ $section->addInput(new Form_Select(
 
 $section->addInput(new Form_Input(
 	'gpsfudge1',
-	'Fudge time 1',
+	'Fudge Time 1',
 	'text',
 	$pconfig['fudge1']
 ))->setHelp('Fudge time 1 is used to specify the GPS PPS signal offset (default: 0.0).');
 
 $section->addInput(new Form_Input(
 	'gpsfudge2',
-	'Fudge time 2',
+	'Fudge Time 2',
 	'text',
 	$pconfig['fudge2']
 ))->setHelp('Fudge time 2 is used to specify the GPS time offset (default: 0.0).');
@@ -316,49 +316,49 @@ $section->addInput(new Form_Input(
 $section->addInput(new Form_Checkbox(
 	'gpsprefer',
 	'Flags',
-	'NTP should prefer this clock (default: enabled).',
+	'Prefer this clock (default: checked).',
 	!$pconfig['prefer']
 ));
 
 $section->addInput(new Form_Checkbox(
 	'gpsselect',
 	null,
-	'NTP should not use this clock, it will be displayed for reference only (default: disabled).',
+	'Do not use this clock, display for reference only (default: unchecked).',
 	$pconfig['noselect']
 ));
 
 $section->addInput(new Form_Checkbox(
 	'gpsflag1',
 	null,
-	'Enable PPS signal processing (default: enabled).',
+	'Enable PPS signal processing (default: checked).',
 	$pconfig['flag1']
 ));
 
 $section->addInput(new Form_Checkbox(
 	'gpsflag2',
 	null,
-	'Enable falling edge PPS signal processing (default: rising edge).',
+	'Enable falling edge PPS signal processing (default: unchecked, rising edge).',
 	$pconfig['flag2']
 ));
 
 $section->addInput(new Form_Checkbox(
 	'gpsflag3',
 	null,
-	'Enable kernel PPS clock discipline (default: enabled).',
+	'Enable kernel PPS clock discipline (default: checked).',
 	$pconfig['flag3']
 ));
 
 $section->addInput(new Form_Checkbox(
 	'gpsflag4',
 	null,
-	'Obscure location in timestamp (default: unobscured).',
+	'Obscure location in timestamp (default: unchecked, unobscured).',
 	$pconfig['flag4']
 ));
 
 $section->addInput(new Form_Checkbox(
 	'gpssubsec',
 	null,
-	'Log the sub-second fraction of the received time stamp (default: Not logged).',
+	'Log the sub-second fraction of the received time stamp (default: unchecked, not logged).',
 	$pconfig['subsec']
 ))->setHelp('Enabling this will rapidly fill the log, but is useful for tuning Fudge time 2.');
 
diff --git a/src/usr/local/www/services_ntpd_pps.php b/src/usr/local/www/services_ntpd_pps.php
index 98c1b37..b050168 100644
--- a/src/usr/local/www/services_ntpd_pps.php
+++ b/src/usr/local/www/services_ntpd_pps.php
@@ -167,24 +167,24 @@ $section->addInput(new Form_StaticText(
 $serialports = glob("/dev/cua?[0-9]{,.[0-9]}", GLOB_BRACE);
 
 if (!empty($serialports)) {
-    $splist = array();
-
-    foreach ($serialports as $port) {
-    	$shortport = substr($port, 5);
-    	$splist[$shortport] = $shortport;
-    }
-
-    $section->addInput(new Form_Select(
-    	'ppsport',
-    	'Serial port',
-    	$pconfig['port'],
-    		$splist
-    ))->setHelp('All serial ports are listed, be sure to pick the port with the PPS source attached. ');
+	$splist = array();
+
+	foreach ($serialports as $port) {
+		$shortport = substr($port, 5);
+		$splist[$shortport] = $shortport;
+	}
+
+	$section->addInput(new Form_Select(
+		'ppsport',
+		'Serial Port',
+		$pconfig['port'],
+			$splist
+	))->setHelp('All serial ports are listed, be sure to pick the port with the PPS source attached. ');
 }
 
 $section->addInput(new Form_Input(
 	'ppsfudge1',
-	'Fudge time',
+	'Fudge Time',
 	'text',
 	$pconfig['fudge1']
 ))->setHelp('Fudge time is used to specify the PPS signal offset from the actual second such as the transmission delay between the transmitter and the receiver. (default: 0.0).');
@@ -199,21 +199,21 @@ $section->addInput(new Form_Input(
 $section->addInput(new Form_Checkbox(
 	'ppsflag2',
 	'Flags',
-	'Enable falling edge PPS signal processing (default: rising edge).',
+	'Enable falling edge PPS signal processing (default: unchecked, rising edge).',
 	$pconfig['flag2']
 ));
 
 $section->addInput(new Form_Checkbox(
 	'ppsflag3',
 	null,
-	'Enable kernel PPS clock discipline (default: disabled).',
+	'Enable kernel PPS clock discipline (default: unchecked).',
 	$pconfig['flag3']
 ));
 
 $section->addInput(new Form_Checkbox(
 	'ppsflag4',
 	null,
-	'Record a timestamp once for each second, useful for constructing Allan deviation plots (default: disabled).',
+	'Record a timestamp once for each second, useful for constructing Allan deviation plots (default: unchecked).',
 	$pconfig['flag4']
 ));