mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2813 from NOYB/Services_/_Captive_Portal_-_Remove_Personalizations

Browse Source 
(cherry picked from commit cbe2d30f3b)
This commit is contained in:
Stephen Beaver 2016-04-04 09:17:58 -04:00
parent 075c6dfa86
commit fcefc85639
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/usr/local/www/services_captiveportal.php
View File

@ -640,7 +640,7 @@ $section->addInput(new Form_Input(
'Pre-authentication redirect URL',
'text',
$pconfig['preauthurl']
))->setHelp('Use this field to set $PORTAL_REDIRURL$ variable which can be accessed using your custom captive portal index.php page or error pages.');
))->setHelp('Use this field to set $PORTAL_REDIRURL$ variable which can be accessed using the custom captive portal index.php page or error pages.');
$section->addInput(new Form_Input(
'redirurl',
@ -679,7 +679,7 @@ $section->addInput(new Form_Checkbox(
'Enable Pass-through MAC automatic additions',
$pconfig['passthrumacadd']
))->setHelp(sprintf('When enabled, a MAC passthrough entry is automatically added after the user has successfully authenticated. Users of that MAC address will ' .
'never have to authenticate again. To remove the passthrough MAC entry you either have to log in and remove it manually from the ' .
'never have to authenticate again. To remove the passthrough MAC entry either log in and remove it manually from the ' .
'%s or send a POST from another system.' .
'If this is enabled, RADIUS MAC authentication cannot be used. Also, the logout window will not be shown.', '<a href="services_captiveportal_mac.php">MAC tab</a>'));
@ -689,7 +689,7 @@ $section->addInput(new Form_Checkbox(
'Enable Pass-through MAC automatic addition with username',
$pconfig['passthrumacaddusername']
))->setHelp(sprintf('If enabled with the automatically MAC passthrough entry created, the username used during authentication will be saved. ' .
'To remove the passthrough MAC entry you either have to log in and remove it manually from the %s or send a POST from another system.',
'To remove the passthrough MAC entry either log in and remove it manually from the %s or send a POST from another system.',
'<a href="services_captiveportal_mac.php">MAC tab</a>'));
$section->addInput(new Form_Checkbox(
@ -1022,7 +1022,7 @@ $section->addInput(new Form_Select(
'MAC address format',
$pconfig['radmac_format'],
['default' => 'Default', 'singledash' => gettext('Single dash'), 'ietf' => 'IETF', 'cisco' => 'Cisco', 'unformatted' => gettext('Unformatted')]
))->setHelp('This option changes the MAC address format used in the whole RADIUS system. Change this if you also need to change the username format for ' .
))->setHelp('This option changes the MAC address format used in the whole RADIUS system. Change this if the username format also needs to be changed for ' .
'RADIUS MAC authentication.' . '<br />' .
'Default: 00:11:22:33:44:55' . '<br />' .
'Single dash: 001122-334455' . '<br />' .
@ -1048,7 +1048,7 @@ $section->addInput(new Form_Input(
'HTTPS server name',
'text',
$pconfig['httpsname']
))->setHelp('This name will be used in the form action for the HTTPS POST and should match the Common Name (CN) in your certificate ' .
))->setHelp('This name will be used in the form action for the HTTPS POST and should match the Common Name (CN) in the certificate ' .
'(otherwise, the client browser will most likely display a security warning). ' .
'Make sure captive portal clients can resolve this name in DNS and verify on the client that the IP resolves to the correct interface IP on pfSense.');
@ -1057,7 +1057,7 @@ $section->addInput(new Form_Select(
'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>');
))->setHelp('If no certificates are defined, one may be defined here: ' . '<a href="system_certmanager.php">System &gt; Cert. Manager</a>');
$section->addInput(new Form_Checkbox(
'nohttpsforwards',
@ -1132,8 +1132,8 @@ $section->addInput(new Form_Input(
'Auth error page contents',
'file',
$pconfig['errfile']
))->setHelp('The contents of the HTML/PHP file that you upload here are displayed when an authentication error occurs. ' .
'You may include "$PORTAL_MESSAGE$", which will be replaced by the error or reply messages from the RADIUS ' .
))->setHelp('The contents of the HTML/PHP file that is uploaded here are displayed when an authentication error occurs. ' .
'It may include "$PORTAL_MESSAGE$", which will be replaced by the error or reply messages from the RADIUS ' .
'server, if any.')->addClass('btn btn-info btn-sm');
if ($pconfig['page']['errtext']) {
@ -1166,7 +1166,7 @@ $section->addInput(new Form_Input(
'Logout page contents',
'file',
$pconfig['logoutfile']
))->setHelp('The contents of the HTML/PHP file that you upload here are displayed on authentication success when the logout popup is enabled.')->addClass('btn btn-info btn-sm');
))->setHelp('The contents of the HTML/PHP file that is uploaded here are displayed on authentication success when the logout popup is enabled.')->addClass('btn btn-info btn-sm');
if ($pconfig['page']['logouttext']) {
$group = new Form_Group('Current Logout Page');
@ -1202,7 +1202,7 @@ $section->addInput(new Form_Input(
$form->add($section);
print($form);
print_info_box(gettext('Don\'t forget to enable the DHCP server on your captive portal interface! ' .
print_info_box(gettext('Don\'t forget to enable the DHCP server on the captive portal interface! ' .
'Make sure that the default/maximum DHCP lease time is higher than the hard timeout entered on this page. ' .
'Also, the DNS Forwarder or Resolver must be enabled for DNS lookups by unauthenticated clients to work.'));

12
src/usr/local/www/services_captiveportal_filemanager.php
View File

@ -276,14 +276,14 @@ endif;
<div class="infoblock panel panel-default">
<div class="panel-heading"><h2 class="panel-title"><?=gettext("Notes");?></h2></div>
<div class="panel-body">
<?=gettext("Any files that you upload here with the filename prefix of captiveportal- will " .
<?=gettext("Any files that are uploaded here with the filename prefix of captiveportal- will " .
"be made available in the root directory of the captive portal HTTP(S) server. " .
"You may reference them directly from your portal page HTML code using relative paths. " .
"Example: you've uploaded an image with the name 'captiveportal-test.jpg' using the " .
"file manager. Then you can include it in your portal page like this:")?><br /><br />
"They may be referenced directly from the portal page HTML code using relative paths. " .
"Example: An image uploaded with the name 'captiveportal-test.jpg' using the " .
"file manager can then be included in the portal page like this:")?><br /><br />
<pre>&lt;img src=&quot;captiveportal-test.jpg&quot; width=... height=...&gt;</pre><br />
<?=gettext("In addition, you can also upload .php files for execution. You can pass the filename " .
"to your custom page from the initial page by using text similar to:")?><br /><br />
<?=gettext("In addition, .php files can also be uploaded for execution. The filename can be passed " .
"to the custom page from the initial page by using text similar to:")?><br /><br />
<pre>&lt;a href="/captiveportal-aup.php?zone=$PORTAL_ZONE$&amp;redirurl=$PORTAL_REDIRURL$"&gt;<?=gettext("Acceptable usage policy"); ?>&lt;/a&gt;</pre><br />
<?=sprintf(gettext("The total size limit for all files is %s."), format_bytes($g['captiveportal_element_sizelimit']))?>
</div>

2
src/usr/local/www/services_captiveportal_hostname_edit.php
View File

@ -223,7 +223,7 @@ $section->addInput(new Form_Input(
'Description',
'text',
$pconfig['descr']
))->setHelp('You may enter a description here for your reference (not parsed).');
))->setHelp('A description may be entered here for administrative reference (not parsed).');
$section->addInput(new Form_Input(
'bw_up',

2
src/usr/local/www/services_captiveportal_mac.php
View File

@ -189,7 +189,7 @@ if ($savemsg) {
}
if (is_subsystem_dirty('passthrumac')) {
print_apply_box(gettext("The Captive Portal MAC address configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
print_apply_box(gettext("The Captive Portal MAC address configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect."));
}
$tab_array = array();

4
src/usr/local/www/services_captiveportal_mac_edit.php
View File

@ -139,7 +139,7 @@ if ($_POST) {
$iflist = get_interface_list();
foreach ($iflist as $if) {
if ($_POST['mac'] == strtolower($if['mac'])) {
$input_errors[] = sprintf(gettext("The MAC address %s belongs to a local interface, you cannot use it here."), $_POST['mac']);
$input_errors[] = sprintf(gettext("The MAC address %s belongs to a local interface. It cannot be used here."), $_POST['mac']);
break;
}
}
@ -264,7 +264,7 @@ $section->addInput(new Form_Input(
'Description',
'text',
$pconfig['descr']
))->setHelp('You may enter a description here for your reference (not parsed)');
))->setHelp('A description may be entered here for administrative reference (not parsed)');
$section->addInput(new Form_Input(
'bw_up',

2
src/usr/local/www/services_captiveportal_vouchers.php
View File

@ -276,7 +276,7 @@ if ($_POST) {
$input_errors[] = gettext("This doesn't look like an RSA Private key.");
}
if ($_POST['vouchersyncdbip'] && (is_ipaddr_configured($_POST['vouchersyncdbip']))) {
$input_errors[] = gettext("You cannot sync the voucher database to this host (itself).");
$input_errors[] = gettext("The voucher database cannot be sync'd to this host (itself).");
}
if ($_POST['vouchersyncpass'] != $_POST['vouchersyncpass_confirm']) {
$input_errors[] = gettext("Password and confirmed password must match.");

2
src/usr/local/www/services_captiveportal_zones.php
View File

@ -99,7 +99,7 @@ if ($savemsg) {
}
if (is_subsystem_dirty('captiveportal')) {
print_apply_box(gettext("The Captive Portal entry list has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
print_apply_box(gettext("The Captive Portal entry list has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect."));
}
?>
<form action="services_captiveportal_zones.php" method="post">

2
src/usr/local/www/services_captiveportal_zones_edit.php
View File

@ -126,7 +126,7 @@ $section->addInput(new Form_Input(
$section->addInput(new Form_Input(
'descr',
'Zone description'
))->setHelp('You may enter a description here for your reference (not parsed).');
))->setHelp('A description may be entered here for administrative reference (not parsed).');
$form->add($section);