Captive Portal code review

Make the capitalisation of the various heading pages consistent.
Fix various field var name errors observed.

1 files changed, 21 insertions, 21 deletions

diff --git a/src/usr/local/www/services_captiveportal.php b/src/usr/local/www/services_captiveportal.php
index 27ff6fe..4b5cc64 100644
--- a/src/usr/local/www/services_captiveportal.php
+++ b/src/usr/local/www/services_captiveportal.php
@@ -96,7 +96,7 @@ if (!is_array($config['captiveportal'])) {
 }
 $a_cp =& $config['captiveportal'];
 
-$pgtitle = array(gettext("Services"), gettext("Captive portal"), $a_cp[$cpzone]['zone']);
+$pgtitle = array(gettext("Services"), gettext("Captive Portal"), $a_cp[$cpzone]['zone']);
 $shortcut_section = "captiveportal";
 
 if ($_GET['act'] == "viewhtml") {
@@ -301,7 +301,7 @@ if ($_POST) {
 				}
 
 				if ($_POST['timeout'] > $deftime) {
-					$input_errors[] = gettext("Hard timeout must be less or equal Default lease time set on DHCP Server");
+					$input_errors[] = gettext("Hard timeout must be less than or equal to the Default lease time set on DHCP Server");
 				}
 			}
 		}
@@ -558,9 +558,9 @@ if ($savemsg)
 	print_info_box($savemsg, 'success');
 
 $tab_array = array();
-$tab_array[] = array(gettext("Captive portal(s)"), true, "services_captiveportal.php?zone={$cpzone}");
+$tab_array[] = array(gettext("Captive Portal(s)"), true, "services_captiveportal.php?zone={$cpzone}");
 $tab_array[] = array(gettext("MAC"), false, "services_captiveportal_mac.php?zone={$cpzone}");
-$tab_array[] = array(gettext("Allowed IP addresses"), false, "services_captiveportal_ip.php?zone={$cpzone}");
+$tab_array[] = array(gettext("Allowed IP Addresses"), false, "services_captiveportal_ip.php?zone={$cpzone}");
 $tab_array[] = array(gettext("Allowed Hostnames"), false, "services_captiveportal_hostname.php?zone={$cpzone}");
 $tab_array[] = array(gettext("Vouchers"), false, "services_captiveportal_vouchers.php?zone={$cpzone}");
 $tab_array[] = array(gettext("File Manager"), false, "services_captiveportal_filemanager.php?zone={$cpzone}");
@@ -785,7 +785,7 @@ $group->add(new Form_Checkbox(
 	null,
 	'MSCHAPv2',
 	$pconfig['radius_protocol'] == 'MSCHAPv2',
-	'SCHAPv2'
+	'MSCHAPv2'
 ))->displayasRadio();
 
 $section->add($group);
@@ -835,10 +835,10 @@ $group->add(new Form_Input(
 ))->setHelp('RADIUS port. Leave blank for default (1812)');
 
 $group->add(new Form_Input(
-	'radiuskey3',
+	'radiuskey2',
 	null,
 	'text',
-	$pconfig['radiuskey3']
+	$pconfig['radiuskey2']
 ))->setHelp('RADIUS shared secret. Leave blank to not use a shared secret (not recommended)');
 
 $section->add($group);
@@ -851,23 +851,23 @@ $section->addClass('Secondary');
 $group = new Form_Group('Primary RADIUS server');
 
 $group->add(new Form_IpAddress(
-	'radiusip4',
+	'radiusip3',
 	null,
-	$pconfig['radiusip4']
+	$pconfig['radiusip3']
 ));
 
 $group->add(new Form_Input(
-	'radiusport4',
+	'radiusport3',
 	null,
 	'number',
-	$pconfig['radiusport4']
+	$pconfig['radiusport3']
 ));
 
 $group->add(new Form_Input(
-	'radiuskey4',
+	'radiuskey3',
 	null,
 	'text',
-	$pconfig['radiuskey4']
+	$pconfig['radiuskey3']
 ));
 
 $section->add($group);
@@ -875,23 +875,23 @@ $section->add($group);
 $group = new Form_Group('Secondary RADIUS server');
 
 $group->add(new Form_IpAddress(
-	'radiusip',
+	'radiusip4',
 	null,
-	$pconfig['radiusip']
+	$pconfig['radiusip4']
 ))->setHelp('IP address of the RADIUS server to authenticate against.');
 
 $group->add(new Form_Input(
-	'radiusport',
+	'radiusport4',
 	null,
 	'number',
-	$pconfig['radiusport']
+	$pconfig['radiusport4']
 ))->setHelp('RADIUS port. Leave blank for default (1812)');
 
 $group->add(new Form_Input(
-	'radiuskey',
+	'radiuskey4',
 	null,
 	'text',
-	$pconfig['radiuskey']
+	$pconfig['radiuskey4']
 ))->setHelp('RADIUS shared secret. Leave blank to not use a shared secret (not recommended)');
 
 $section->add($group);
@@ -926,7 +926,7 @@ $group->add(new Form_Checkbox(
 $group->add(new Form_Checkbox(
 	'reauthenticateacct',
 	null,
-	'Stop/stop Accounting',
+	'Stop/start Accounting',
 	$pconfig['reauthenticateacct'] == 'stopstart'
 ))->displayasRadio();
 
@@ -1042,7 +1042,7 @@ $section->addInput(new Form_Input(
 
 $section->addInput(new Form_Select(
 	'certref',
-	'SSL Certigicate',
+	'SSL Certificate',
 	$pconfig['certref'],
 	build_cert_list()
 ))->setHelp('If no certificates are defined, you may define one here: ' . '<a href="system_certmanager.php">System &gt; Cert Manager</a>');