diff options
| author | Phil Davis <phil.davis@inf.org> | 2017-02-08 15:34:44 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2017-02-08 15:34:44 +0545 |
| commit | 5dd8682c7f35a0449cdbbe6fdbb2069d94aa706e (patch) | |
| tree | 21779a21b15d6090be0df5c7b5c11eec8c245e9c /src/usr | |
| parent | b0eb674f8f9c474cbb52a468892cacf5df9e9028 (diff) | |
| download | pfsense-5dd8682c7f35a0449cdbbe6fdbb2069d94aa706e.zip pfsense-5dd8682c7f35a0449cdbbe6fdbb2069d94aa706e.tar.gz | |
setHelp format for services_captiveportal
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/local/www/services_captiveportal.php | 42 | ||||
| -rw-r--r-- | src/usr/local/www/services_captiveportal_hostname.php | 5 | ||||
| -rw-r--r-- | src/usr/local/www/services_captiveportal_vouchers.php | 4 |
3 files changed, 26 insertions, 25 deletions
diff --git a/src/usr/local/www/services_captiveportal.php b/src/usr/local/www/services_captiveportal.php index ffd46e8..0a08480 100644 --- a/src/usr/local/www/services_captiveportal.php +++ b/src/usr/local/www/services_captiveportal.php @@ -647,8 +647,8 @@ $section->addInput(new Form_Checkbox( $pconfig['passthrumacadd'] ))->setHelp('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 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>'); + '%1$sMAC tab%2$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">', '</a>'); $section->addInput(new Form_Checkbox( 'passthrumacaddusername', @@ -656,8 +656,8 @@ $section->addInput(new Form_Checkbox( 'Enable Pass-through MAC automatic addition with username', $pconfig['passthrumacaddusername'] ))->setHelp('If enabled with the automatically MAC passthrough entry created, the username used during authentication will be saved. ' . - '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>'); + 'To remove the passthrough MAC entry either log in and remove it manually from the %1$sMAC tab%2$s or send a POST from another system.', + '<a href="services_captiveportal_mac.php">', '</a>'); $section->addInput(new Form_Checkbox( 'peruserbw', @@ -999,12 +999,12 @@ $section->addInput(new Form_Select( $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 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 />' . - 'IETF: 00-11-22-33-44-55' . '<br />' . - 'Cisco: 0011.2233.4455' . '<br />' . - 'Unformatted: 001122334455'); + 'RADIUS MAC authentication. %1$s' . + 'Default: 00:11:22:33:44:55 %1$s' . + 'Single dash: 001122-334455 %1$s' . + 'IETF: 00-11-22-33-44-55 %1$s' . + 'Cisco: 0011.2233.4455 %1$s' . + 'Unformatted: 001122334455', '<br />'); $form->add($section); @@ -1033,7 +1033,7 @@ $section->addInput(new Form_Select( '*SSL Certificate', $pconfig['certref'], build_cert_list() -))->setHelp('If no certificates are defined, one may be defined here: ' . '<a href="system_certmanager.php">System > Cert. Manager</a>'); +))->setHelp('If no certificates are defined, one may be defined here: %1$sSystem > Cert. Manager%2$s', '<a href="system_certmanager.php">', '</a>'); $section->addInput(new Form_Checkbox( 'nohttpsforwards', @@ -1057,16 +1057,16 @@ $section->addInput(new Form_Input( $pconfig['htmlfile'] ))->setHelp('Upload an HTML/PHP file for the portal page here (leave blank to keep the current one). Make sure to include a form (POST to "$PORTAL_ACTION$") ' . 'with a submit button (name="accept") and a hidden field with name="redirurl" and value="$PORTAL_REDIRURL$". ' . - 'Include the "auth_user" and "auth_pass" and/or "auth_voucher" input fields if authentication is enabled, otherwise it will always fail.' . '<br />' . - 'Example code for the form:' . '<br />' . - '<form method="post" action="$PORTAL_ACTION$"><br />' . - ' <input name="auth_user" type="text"><br />' . - ' <input name="auth_pass" type="password"><br />' . - ' <input name="auth_voucher" type="text"><br />' . - ' <input name="redirurl" type="hidden" value="$PORTAL_REDIRURL$"><br />' . - ' <input name="zone" type="hidden" value="$PORTAL_ZONE$"><br />' . - ' <input name="accept" type="submit" value="Continue"><br />' . - '</form>')->addClass('btn btn-info btn-sm'); + 'Include the "auth_user" and "auth_pass" and/or "auth_voucher" input fields if authentication is enabled, otherwise it will always fail.%1$s' . + 'Example code for the form: %1$s' . + '<form method="post" action="$PORTAL_ACTION$">%1$s' . + ' <input name="auth_user" type="text">%1$s' . + ' <input name="auth_pass" type="password">%1$s' . + ' <input name="auth_voucher" type="text">%1$s' . + ' <input name="redirurl" type="hidden" value="$PORTAL_REDIRURL$">%1$s' . + ' <input name="zone" type="hidden" value="$PORTAL_ZONE$">%1$s' . + ' <input name="accept" type="submit" value="Continue">%1$s' . + '</form>', '<br />')->addClass('btn btn-info btn-sm'); list($host) = explode(":", $_SERVER['HTTP_HOST']); $zoneid = $pconfig['zoneid'] ? $pconfig['zoneid'] : 8000; diff --git a/src/usr/local/www/services_captiveportal_hostname.php b/src/usr/local/www/services_captiveportal_hostname.php index 4388484..aee4a71 100644 --- a/src/usr/local/www/services_captiveportal_hostname.php +++ b/src/usr/local/www/services_captiveportal_hostname.php @@ -29,9 +29,10 @@ $directionicons = array('to' => '→', 'from' => '←', 'both' => '⇄'); $notestr = - gettext('Adding new hostnames will allow a DNS hostname access to/from the captive portal without being taken to the portal page. ' . + sprintf(gettext('Adding new hostnames will allow a DNS hostname access to/from the captive portal without being taken to the portal page. ' . 'This can be used for a web server serving images for the portal page, or a DNS server on another network, for example. ' . - 'By specifying <em>from</em> addresses, it may be used to always allow pass-through access from a client behind the captive portal.'); + 'By specifying %1$sfrom%2$s addresses, it may be used to always allow pass-through access from a client behind the captive portal.'), + '<em>', '</em>'); require_once("guiconfig.inc"); require_once("functions.inc"); diff --git a/src/usr/local/www/services_captiveportal_vouchers.php b/src/usr/local/www/services_captiveportal_vouchers.php index 4df0253..c2506e7 100644 --- a/src/usr/local/www/services_captiveportal_vouchers.php +++ b/src/usr/local/www/services_captiveportal_vouchers.php @@ -524,8 +524,8 @@ $section->addInput(new Form_IpAddress( 'vouchersyncdbip', 'Synchronize Voucher Database IP', $pconfig['vouchersyncdbip'] -))->setHelp('IP address of master nodes webConfigurator to synchronize voucher database and used vouchers from.' . '<br />' . - 'NOTE: this should be setup on the slave nodes and not the primary node!'); +))->setHelp('IP address of master nodes webConfigurator to synchronize voucher database and used vouchers from.%1$s' . + 'NOTE: this should be setup on the slave nodes and not the primary node!', '<br />'); $section->addInput(new Form_Input( 'vouchersyncport', |
