diff options
| -rwxr-xr-x | usr/local/www/services_captiveportal.php | 103 | ||||
| -rwxr-xr-x | usr/local/www/services_captiveportal_filemanager.php | 8 | ||||
| -rwxr-xr-x | usr/local/www/services_captiveportal_ip.php | 4 | ||||
| -rwxr-xr-x | usr/local/www/services_captiveportal_mac.php | 4 | ||||
| -rw-r--r-- | usr/local/www/services_captiveportal_vouchers.php | 24 | ||||
| -rwxr-xr-x | usr/local/www/services_dhcp.php | 22 | ||||
| -rwxr-xr-x | usr/local/www/services_dnsmasq.php | 2 | ||||
| -rwxr-xr-x | usr/local/www/services_dyndns.php | 2 | ||||
| -rw-r--r-- | usr/local/www/services_dyndns_edit.php | 4 | ||||
| -rwxr-xr-x | usr/local/www/services_igmpproxy.php | 2 | ||||
| -rw-r--r-- | usr/local/www/services_rfc2136_edit.php | 2 | ||||
| -rwxr-xr-x | usr/local/www/services_wol.php | 2 |
12 files changed, 95 insertions, 84 deletions
diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php index c18e496..b3b2f97 100755 --- a/usr/local/www/services_captiveportal.php +++ b/usr/local/www/services_captiveportal.php @@ -318,7 +318,7 @@ function enable_change(enable_change) { </option> <?php endforeach; ?> </select> <br> - <span class="vexpl"><?=gettext("Select the interface(s) to enable for captive portal"); ?>.</span></td> + <span class="vexpl"><?=gettext("Select the interface(s) to enable for captive portal."); ?></span></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("Maximum concurrent connections"); ?></td> @@ -331,28 +331,28 @@ value="<?=htmlspecialchars($pconfig['maxprocperip']);?>"> <?=gettext("per client </table> <?=gettext("This setting limits the number of concurrent connections to the captive portal HTTP(S) server. This does not set how many users can be logged in " . "to the captive portal, but rather how many users can load the portal page or authenticate at the same time! " . -"Default is 4 connections per client IP address, with a total maximum of 16 connections"); ?>.</td> +"Default is 4 connections per client IP address, with a total maximum of 16 connections."); ?></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("Idle timeout"); ?></td> <td class="vtable"> <input name="idletimeout" type="text" class="formfld unknown" id="idletimeout" size="6" value="<?=htmlspecialchars($pconfig['idletimeout']);?>"> <?=gettext("minutes"); ?><br> -<?=gettext("Clients will be disconnected after this amount of inactivity. They may log in again immediately, though. Leave this field blank for no idle timeout"); ?>.</td> +<?=gettext("Clients will be disconnected after this amount of inactivity. They may log in again immediately, though. Leave this field blank for no idle timeout."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Hard timeout"); ?></td> <td width="78%" class="vtable"> <input name="timeout" type="text" class="formfld unknown" id="timeout" size="6" value="<?=htmlspecialchars($pconfig['timeout']);?>"> <?=gettext("minutes"); ?><br> - <?=gettext("Clients will be disconnected after this amount of time, regardless of activity. They may log in again immediately, though. Leave this field blank for no hard timeout (not recommended unless an idle timeout is set)"); ?>.</td> + <?=gettext("Clients will be disconnected after this amount of time, regardless of activity. They may log in again immediately, though. Leave this field blank for no hard timeout (not recommended unless an idle timeout is set)."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Logout popup window"); ?></td> <td width="78%" class="vtable"> <input name="logoutwin_enable" type="checkbox" class="formfld" id="logoutwin_enable" value="yes" <?php if($pconfig['logoutwin_enable']) echo "checked"; ?>> <strong><?=gettext("Enable logout popup window"); ?></strong><br> - <?=gettext("If enabled, a popup window will appear when clients are allowed through the captive portal. This allows clients to explicitly disconnect themselves before the idle or hard timeout occurs"); ?>.</td> + <?=gettext("If enabled, a popup window will appear when clients are allowed through the captive portal. This allows clients to explicitly disconnect themselves before the idle or hard timeout occurs."); ?></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("Redirection URL"); ?></td> @@ -360,14 +360,14 @@ value="<?=htmlspecialchars($pconfig['maxprocperip']);?>"> <?=gettext("per client <input name="redirurl" type="text" class="formfld url" id="redirurl" size="60" value="<?=htmlspecialchars($pconfig['redirurl']);?>"> <br> <?=gettext("If you provide a URL here, clients will be redirected to that URL instead of the one they initially tried " . -"to access after they've authenticated"); ?>.</td> +"to access after they've authenticated."); ?></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("Concurrent user logins"); ?></td> <td class="vtable"> <input name="noconcurrentlogins" type="checkbox" class="formfld" id="noconcurrentlogins" value="yes" <?php if ($pconfig['noconcurrentlogins']) echo "checked"; ?>> <strong><?=gettext("Disable concurrent logins"); ?></strong><br> - <?=gettext("If this option is set, only the most recent login per username will be active. Subsequent logins will cause machines previously logged in with the same username to be disconnected"); ?>.</td> + <?=gettext("If this option is set, only the most recent login per username will be active. Subsequent logins will cause machines previously logged in with the same username to be disconnected."); ?></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("MAC filtering"); ?> </td> @@ -375,22 +375,22 @@ value="<?=htmlspecialchars($pconfig['maxprocperip']);?>"> <?=gettext("per client <input name="nomacfilter" type="checkbox" class="formfld" id="nomacfilter" value="yes" <?php if ($pconfig['nomacfilter']) echo "checked"; ?>> <strong><?=gettext("Disable MAC filtering"); ?></strong><br> <?=gettext("If this option is set, no attempts will be made to ensure that the MAC address of clients stays the same while they're logged in." . - "This is required when the MAC address of the client cannot be determined (usually because there are routers between"); ?> <?php echo $g['product_name'] ?> <?=gettext("and the clients)"); ?>. - <?=gettext("If this is enabled, RADIUS MAC authentication cannot be used"); ?>.</td> + "This is required when the MAC address of the client cannot be determined (usually because there are routers between"); ?> <?php echo $g['product_name'] ?> <?=gettext("and the clients)."); ?> + <?=gettext("If this is enabled, RADIUS MAC authentication cannot be used."); ?></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("Pass-through MAC Auto Entry"); ?></td> <td class="vtable"> <input name="passthrumacadd" type="checkbox" class="formfld" id="passthrumacadd" value="yes" <?php if ($pconfig['passthrumacadd']) echo "checked"; ?>> <strong><?=gettext("Enable Pass-through MAC automatic additions"); ?></strong><br> - <?=gettext("If this option is set, a MAC passthrough entry is automatically added after the user has successfully authenticated. Users of that MAC address will never have to authenticate again"); ?>. - <?=gettext("To remove the passthrough MAC entry you either have to log in and remove it manually from the"); ?> <a href="services_captiveportal_mac.php"><?=gettext("Pass-through MAC tab"); ?></a> <?=gettext("or send a POST from another system to remove it"); ?>. - <?=gettext("If this is enabled, RADIUS MAC authentication cannot be used. Also, the logout window will not be shown"); ?>. + <?=gettext("If this option is set, a MAC passthrough entry is automatically added after the user has successfully authenticated. Users of that MAC address will never have to authenticate again."); ?> + <?=gettext("To remove the passthrough MAC entry you either have to log in and remove it manually from the"); ?> <a href="services_captiveportal_mac.php"><?=gettext("Pass-through MAC tab"); ?></a> <?=gettext("or send a POST from another system to remove it."); ?> + <?=gettext("If this is enabled, RADIUS MAC authentication cannot be used. Also, the logout window will not be shown."); ?> <br/><br/> <input name="passthrumacaddusername" type="checkbox" class="formfld" id="passthrumacaddusername" value="yes" <?php if ($pconfig['passthrumacaddusername']) echo "checked"; ?>> <strong><?=gettext("Enable Pass-through MAC automatic addition with username"); ?></strong><br> - <?=gettext("If this option is set, with the automatically MAC passthrough entry created the username, used during authentication, will be saved"); ?>. - <?=gettext("To remove the passthrough MAC entry you either have to log in and remove it manually from the"); ?> <a href="services_captiveportal_mac.php"><?=gettext("Pass-through MAC tab"); ?></a> <?=gettext("or send a POST from another system to remove it"); ?>. + <?=gettext("If this option is set, with the automatically MAC passthrough entry created the username, used during authentication, will be saved."); ?> + <?=gettext("To remove the passthrough MAC entry you either have to log in and remove it manually from the"); ?> <a href="services_captiveportal_mac.php"><?=gettext("Pass-through MAC tab"); ?></a> <?=gettext("or send a POST from another system to remove it."); ?> </td> </tr> <tr> @@ -408,7 +408,7 @@ value="<?=htmlspecialchars($pconfig['maxprocperip']);?>"> <?=gettext("per client <td><input type="text" class="formfld unknown" name="bwdefaultup" id="bwdefaultup" size="10" value="<?=htmlspecialchars($pconfig['bwdefaultup']);?>"> <?=gettext("Kbit/s"); ?></td> </tr></table> <br> - <?=gettext("If this option is set, the captive portal will restrict each user who logs in to the specified default bandwidth. RADIUS can override the default settings. Leave empty or set to 0 for no limit"); ?>. </td> + <?=gettext("If this option is set, the captive portal will restrict each user who logs in to the specified default bandwidth. RADIUS can override the default settings. Leave empty or set to 0 for no limit."); ?> </td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Authentication"); ?></td> @@ -437,17 +437,17 @@ value="<?=htmlspecialchars($pconfig['maxprocperip']);?>"> <?=gettext("per client <tr> <td class="vncell" valign="top"><?=gettext("IP address"); ?></td> <td class="vtable"><input name="radiusip" type="text" class="formfld unknown" id="radiusip" size="20" value="<?=htmlspecialchars($pconfig['radiusip']);?>"><br> - <?=gettext("Enter the IP address of the RADIUS server which users of the captive portal have to authenticate against"); ?>.</td> + <?=gettext("Enter the IP address of the RADIUS server which users of the captive portal have to authenticate against."); ?></td> </tr> <tr> <td class="vncell" valign="top"><?=gettext("Port"); ?></td> <td class="vtable"><input name="radiusport" type="text" class="formfld unknown" id="radiusport" size="5" value="<?=htmlspecialchars($pconfig['radiusport']);?>"><br> - <?=gettext("Leave this field blank to use the default port (1812)"); ?>.</td> + <?=gettext("Leave this field blank to use the default port (1812)."); ?></td> </tr> <tr> <td class="vncell" valign="top"><?=gettext("Shared secret"); ?> </td> <td class="vtable"><input name="radiuskey" type="text" class="formfld unknown" id="radiuskey" size="16" value="<?=htmlspecialchars($pconfig['radiuskey']);?>"><br> - <?=gettext("Leave this field blank to not use a RADIUS shared secret (not recommended)"); ?>.</td> + <?=gettext("Leave this field blank to not use a RADIUS shared secret (not recommended)."); ?></td> </tr> <tr> <td colspan="2" class="list" height="12"></td> @@ -458,7 +458,7 @@ value="<?=htmlspecialchars($pconfig['maxprocperip']);?>"> <?=gettext("per client <tr> <td class="vncell" valign="top"><?=gettext("IP address"); ?></td> <td class="vtable"><input name="radiusip2" type="text" class="formfld unknown" id="radiusip2" size="20" value="<?=htmlspecialchars($pconfig['radiusip2']);?>"><br> - <?=gettext("If you have a second RADIUS server, you can activate it by entering its IP address here"); ?>.</td> + <?=gettext("If you have a second RADIUS server, you can activate it by entering its IP address here."); ?></td> </tr> <tr> <td class="vncell" valign="top"><?=gettext("Port"); ?></td> @@ -479,12 +479,12 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> <td class="vncell"> </td> <td class="vtable"><input name="radacct_enable" type="checkbox" id="radacct_enable" value="yes" onClick="enable_change(false)" <?php if($pconfig['radacct_enable']) echo "checked"; ?>> <strong><?=gettext("send RADIUS accounting packets"); ?></strong><br> - <?=gettext("If this is enabled, RADIUS accounting packets will be sent to the primary RADIUS server"); ?>.</td> + <?=gettext("If this is enabled, RADIUS accounting packets will be sent to the primary RADIUS server."); ?></td> </tr> <tr> <td class="vncell" valign="top"><?=gettext("Accounting port"); ?></td> <td class="vtable"><input name="radiusacctport" type="text" class="formfld unknown" id="radiusacctport" size="5" value="<?=htmlspecialchars($pconfig['radiusacctport']);?>"><br> - <?=gettext("Leave blank to use the default port (1813)"); ?>.</td> + <?=gettext("Leave blank to use the default port (1813)."); ?></td> </tr> <tr> <td colspan="2" class="list" height="12"></td> @@ -497,7 +497,7 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> <td class="vtable"><input name="reauthenticate" type="checkbox" id="reauthenticate" value="yes" onClick="enable_change(false)" <?php if($pconfig['reauthenticate']) echo "checked"; ?>> <strong><?=gettext("Reauthenticate connected users every minute"); ?></strong><br> <?=gettext("If reauthentication is enabled, Access-Requests will be sent to the RADIUS server for each user that is " . - "logged in every minute. If an Access-Reject is received for a user, that user is disconnected from the captive portal immediately"); ?>.</td> + "logged in every minute. If an Access-Reject is received for a user, that user is disconnected from the captive portal immediately."); ?></td> </tr> <tr> <td class="vncell" valign="top"><?=gettext("Accounting updates"); ?></td> @@ -518,7 +518,7 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> <td class="vtable"> <input name="radmac_enable" type="checkbox" id="radmac_enable" value="yes" onClick="enable_change(false)" <?php if ($pconfig['radmac_enable']) echo "checked"; ?>><strong><?=gettext("Enable RADIUS MAC authentication"); ?></strong><br> <?=gettext("If this option is enabled, the captive portal will try to authenticate users by sending their MAC address as the username and the password " . - "entered below to the RADIUS server"); ?>.</td> + "entered below to the RADIUS server."); ?></td> </tr> <tr> <td class="vncell"><?=gettext("Shared secret"); ?></td> @@ -562,14 +562,14 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> } ?> </select><br/> - <?=gettext("Choose the ip to use for calling station attribute"); ?>. + <?=gettext("Choose the ip to use for calling station attribute."); ?> </td> </tr> <tr> <td class="vncell" valign="top"><?=gettext("Session-Timeout"); ?></td> <td class="vtable"><input name="radiussession_timeout" type="checkbox" id="radiussession_timeout" value="yes" <?php if ($pconfig['radiussession_timeout']) echo "checked"; ?>><strong><?=gettext("Use RADIUS Session-Timeout attributes"); ?></strong><br> - <?=gettext("When this is enabled, clients will be disconnected after the amount of time retrieved from the RADIUS Session-Timeout attribute"); ?>.</td> + <?=gettext("When this is enabled, clients will be disconnected after the amount of time retrieved from the RADIUS Session-Timeout attribute."); ?></td> </tr> <tr> @@ -585,8 +585,9 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> echo "<option value=\"$radiusvendor\">$radiusvendor</option>\n"; } ?></select><br> - <?=gettext("If RADIUS type is set to Cisco, in Access-Requests the value of Calling-Station-Id will be set to the client's IP address and " . - "the Called-Station-Id to the client's MAC address. Default behavior is Calling-Station-Id = client's MAC address and Called-Station-Id"); ?> = <?=$g['product_name']?>'s <?=gettext("WAN IP address"); ?>.</td> + <?=printf(gettext("If RADIUS type is set to Cisco, in Access-Requests the value of Calling-Station-Id will be set to the client's IP address and " . + "the Called-Station-Id to the client's MAC address. Default behavior is Calling-Station-Id = client's MAC address and Called-Station-Id = %s WAN IP address."), + $g['product_name']);?></td> </tr> </table> </tr> @@ -606,46 +607,46 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> ?> </select></br> <?=gettext("This option changes the MAC address format used in the whole RADIUS system. Change this if you also"); ?> - <?=gettext("need to change the username format for RADIUS MAC authentication"); ?>.<br> - <?=gettext("default"); ?>: 00:11:22:33:44:55<br> - <?=gettext("singledash"); ?>: 001122-334455<br> - <?=gettext("ietf"); ?>: 00-11-22-33-44-55<br> - <?=gettext("cisco"); ?>: 0011.2233.4455<br> - <?=gettext("unformatted"); ?>: 001122334455 + <?=gettext("need to change the username format for RADIUS MAC authentication."); ?><br> + <?=gettext("default:"); ?> 00:11:22:33:44:55<br> + <?=gettext("singledash:"); ?> 001122-334455<br> + <?=gettext("ietf:"); ?> 00-11-22-33-44-55<br> + <?=gettext("cisco:"); ?> 0011.2233.4455<br> + <?=gettext("unformatted:"); ?> 001122334455 </tr> <tr> <td valign="top" class="vncell"><?=gettext("HTTPS login"); ?></td> <td class="vtable"> <input name="httpslogin_enable" type="checkbox" class="formfld" id="httpslogin_enable" value="yes" <?php if($pconfig['httpslogin_enable']) echo "checked"; ?>> <strong><?=gettext("Enable HTTPS login"); ?></strong><br> - <?=gettext("If enabled, the username and password will be transmitted over an HTTPS connection to protect against eavesdroppers. A server name, certificate and matching private key must also be specified below"); ?>.</td> + <?=gettext("If enabled, the username and password will be transmitted over an HTTPS connection to protect against eavesdroppers. A server name, certificate and matching private key must also be specified below."); ?></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("HTTPS server name"); ?> </td> <td class="vtable"> <input name="httpsname" type="text" class="formfld unknown" id="httpsname" size="30" value="<?=htmlspecialchars($pconfig['httpsname']);?>"><br> - <?=gettext("This name will be used in the form action for the HTTPS POST and should match the Common Name (CN) in your 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"); ?> <?=$g['product_name']?>. </td> + <?=printf(gettext("This name will be used in the form action for the HTTPS POST and should match the Common Name (CN) in your 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 %s."), $g['product_name']);?> </td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("HTTPS certificate"); ?></td> <td class="vtable"> <textarea name="cert" cols="65" rows="7" id="cert" class="formpre"><?=htmlspecialchars($pconfig['cert']);?></textarea> <br> - <?=gettext("Paste a signed certificate in X.509 PEM format here"); ?>.</td> + <?=gettext("Paste a signed certificate in X.509 PEM format here."); ?></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("HTTPS private key"); ?></td> <td class="vtable"> <textarea name="key" cols="65" rows="7" id="key" class="formpre"><?=htmlspecialchars($pconfig['key']);?></textarea> <br> - <?=gettext("Paste an RSA private key in PEM format here"); ?>.</td> + <?=gettext("Paste an RSA private key in PEM format here."); ?></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("HTTPS intermediate certificate"); ?></td> <td class="vtable"> <textarea name="cacert" cols="65" rows="7" id="cacert" class="formpre"><?=htmlspecialchars($pconfig['cacert']);?></textarea> <br> - <?=gettext("Paste a certificate in X.509 PEM format here"); ?>.</td> + <?=gettext("Paste a certificate in X.509 PEM format here."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Portal page contents"); ?></td> @@ -664,10 +665,20 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> <br> <br> <?php endif; ?> - <?=gettext("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$") -<?=gettext("with a submit button"); ?> (name="accept") <?=gettext("and a hidden field with"); ?> name="redirurl" <?=gettext("and"); ?> value="$PORTAL_REDIRURL$". -<?=gettext("Include the"); ?> "auth_user" <?=gettext("and"); ?> "auth_pass" <?=gettext("and/or"); ?> "auth_voucher" <?=gettext("input fields if authentication is enabled, otherwise it will always fail"); ?>. -<?=gettext("Example code for the form"); ?>:<br> + <?= + printf( + gettext("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 %s) with a submit button (%s) and a hidden field with %s and %s. " . + "Include the %s and %s and/or %s input fields if authentication is enabled, otherwise it will always fail."), + ""{$PORTAL_ACTION}"", + "name="accept"", + "name="redirurl"", + "value="{$PORTAL_REDIRURL}"", + ""auth_user"", + ""auth_pass"", + ""auth_voucher""); + ?> + <?=gettext("Example code for the form:"); ?><br> <br> <tt><form method="post" action="$PORTAL_ACTION$"><br> <input name="auth_user" type="text"><br> @@ -689,7 +700,7 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> <br> <?php endif; ?> <?=gettext("The contents of the HTML/PHP file that you upload here are displayed when an authentication error occurs. " . -"You may include"); ?> "$PORTAL_MESSAGE$", <?=gettext("which will be replaced by the error or reply messages from the RADIUS server, if any"); ?>.</td> +"You may include"); ?> "$PORTAL_MESSAGE$", <?=gettext("which will be replaced by the error or reply messages from the RADIUS server, if any."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Logout"); ?><br> @@ -703,7 +714,7 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> <br> <?php endif; ?> <?=gettext("The contents of the HTML/PHP file that you upload here are displayed when an authentication error occurs. " . -"You may include"); ?> "$PORTAL_MESSAGE$", <?=gettext("which will be replaced by the error or reply messages from the RADIUS server, if any"); ?>.</td> +"You may include"); ?> "$PORTAL_MESSAGE$", <?=gettext("which will be replaced by the error or reply messages from the RADIUS server, if any."); ?></td> </tr> <tr> <td width="22%" valign="top"> </td> @@ -713,8 +724,8 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> </tr> <tr> <td width="22%" valign="top"> </td> - <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note"); ?>:<br> - </strong></span><?=gettext("Changing any settings on this page will disconnect all clients! Don't forget to enable the DHCP server on your captive portal interface! Make sure that the default/maximum DHCP lease time is higher than the timeout entered on this page. Also, the DNS forwarder needs to be enabled for DNS lookups by unauthenticated clients to work"); ?>. </span></td> + <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note:"); ?><br> + </strong></span><?=gettext("Changing any settings on this page will disconnect all clients! Don't forget to enable the DHCP server on your captive portal interface! Make sure that the default/maximum DHCP lease time is higher than the timeout entered on this page. Also, the DNS forwarder needs to be enabled for DNS lookups by unauthenticated clients to work."); ?> </span></td> </tr> </table> </td> diff --git a/usr/local/www/services_captiveportal_filemanager.php b/usr/local/www/services_captiveportal_filemanager.php index 9e99395..59aac37 100755 --- a/usr/local/www/services_captiveportal_filemanager.php +++ b/usr/local/www/services_captiveportal_filemanager.php @@ -199,21 +199,21 @@ include("head.inc"); <?php endif; ?> </table> <span class="vexpl"><span class="red"><strong> - <?=gettext("Note"); ?>:<br> + <?=gettext("Note:"); ?><br> </strong></span> <?=gettext("Any files that you upload 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> + "file manager. Then you can include it in your portal page like this:"); ?><br><br> <tt><img src="captiveportal-test.jpg" width=... height=...></tt> <br><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"); ?>: + "to your custom page from the initial page by using text similar to:"); ?> <br><br> <tt><a href="/captiveportal-aup.php?redirurl=$PORTAL_REDIRURL$"><?=gettext("Acceptable usage policy"); ?></a></tt> <br><br> - <?=gettext("The total size limit for all files is"); ?> <?=format_bytes($g['captiveportal_element_sizelimit']);?>.</span> + <?=printf(gettext("The total size limit for all files is %s."), format_bytes($g['captiveportal_element_sizelimit']));?></span> </td> </tr> </table> diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php index 2eedce3..25615e6 100755 --- a/usr/local/www/services_captiveportal_ip.php +++ b/usr/local/www/services_captiveportal_ip.php @@ -154,9 +154,9 @@ include("head.inc"); </tr> <tr> <td colspan="2" class="list"><p class="vexpl"><span class="red"><strong> - <?=gettext("Note"); ?>:<br> + <?=gettext("Note:"); ?><br> </strong></span> - <?=gettext("Adding allowed IP addresses will allow IP access to/from these addresses through 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><?=gettext("from"); ?></em> <?=gettext("addresses, it may be used to always allow pass-through access from a client behind the captive portal"); ?>.</p> + <?=gettext("Adding allowed IP addresses will allow IP access to/from these addresses through 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."); ?></p> <table border="0" cellspacing="0" cellpadding="0"> <tr> <td><span class="vexpl"><?=gettext("any"); ?> <img src="/themes/<?=$g['theme'];?>/images/icons/icon_in.gif" width="11" height="11" align="absmiddle"> x.x.x.x </span></td> diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php index fd2193c..bbcd217 100755 --- a/usr/local/www/services_captiveportal_mac.php +++ b/usr/local/www/services_captiveportal_mac.php @@ -165,9 +165,9 @@ include("head.inc"); </tr> <tr> <td colspan="2" class="list"><span class="vexpl"><span class="red"><strong> - <?=gettext("Note"); ?>:<br> + <?=gettext("Note:"); ?><br> </strong></span> - <?=gettext("Adding MAC addresses as pass-through MACs allows them access through the captive portal automatically without being taken to the portal page"); ?>. </span></td> + <?=gettext("Adding MAC addresses as pass-through MACs allows them access through the captive portal automatically without being taken to the portal page."); ?> </span></td> <td class="list"> </td> </tr> </table> diff --git a/usr/local/www/services_captiveportal_vouchers.php b/usr/local/www/services_captiveportal_vouchers.php index c6cf3e9..2450fd2 100644 --- a/usr/local/www/services_captiveportal_vouchers.php +++ b/usr/local/www/services_captiveportal_vouchers.php @@ -310,9 +310,9 @@ function enable_change(enable_change) { "captive portal for the configured time. Once a voucher is activated, " . "its clock is started and runs uninterrupted until it expires. During that " . "time, the voucher can be re-used from the same or a different computer. If the voucher " . -"is used again from another computer, the previous session is stopped"); ?>. +"is used again from another computer, the previous session is stopped."); ?> <?php else: ?> -<?=gettext("Enable Voucher support first using the checkbox above and hit Save at the bottom"); ?>.</td> +<?=gettext("Enable Voucher support first using the checkbox above and hit Save at the bottom."); ?></td> <?php endif;?> </tr> <tr> @@ -320,56 +320,56 @@ function enable_change(enable_change) { <td class="vtable"> <textarea name="publickey" cols="65" rows="4" id="publickey" class="formpre"><?=htmlspecialchars($pconfig['publickey']);?></textarea> <br> - <?=gettext("Paste an RSA public key (64 Bit or smaller) in PEM format here. This key is used to decrypt vouchers"); ?>.</td> + <?=gettext("Paste an RSA public key (64 Bit or smaller) in PEM format here. This key is used to decrypt vouchers."); ?></td> </tr> <tr> <td valign="top" class="vncell"><?=gettext("Voucher private key"); ?></td> <td class="vtable"> <textarea name="privatekey" cols="65" rows="5" id="privatekey" class="formpre"><?=htmlspecialchars($pconfig['privatekey']);?></textarea> <br> - <?=gettext("Paste an RSA private key (64 Bit or smaller) in PEM format here. This key is only used to generate encrypted vouchers and doesn't need to be available if the vouchers have been generated offline"); ?>.</td> + <?=gettext("Paste an RSA private key (64 Bit or smaller) in PEM format here. This key is only used to generate encrypted vouchers and doesn't need to be available if the vouchers have been generated offline."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Character set"); ?></td> <td width="78%" class="vtable"> <input name="charset" type="text" class="formfld" id="charset" size="80" value="<?=htmlspecialchars($pconfig['charset']);?>"> <br> - <?=gettext("Tickets are generated with the specified character set. It should contain printable characters (numbers, lower case and upper case letters) that are hard to confuse with others. Avoid e.g. 0/O and l/1"); ?>.</td> + <?=gettext("Tickets are generated with the specified character set. It should contain printable characters (numbers, lower case and upper case letters) that are hard to confuse with others. Avoid e.g. 0/O and l/1."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"># <?=gettext("of Roll Bits"); ?></td> <td width="78%" class="vtable"> <input name="rollbits" type="text" class="formfld" id="rollbits" size="2" value="<?=htmlspecialchars($pconfig['rollbits']);?>"> <br> - <?=gettext("Reserves a range in each voucher to store the Roll# it belongs to. Allowed range: 1..31. Sum of Roll+Ticket+Checksum bits must be one Bit less than the RSA key size"); ?>.</td> + <?=gettext("Reserves a range in each voucher to store the Roll# it belongs to. Allowed range: 1..31. Sum of Roll+Ticket+Checksum bits must be one Bit less than the RSA key size."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"># <?=gettext("of Ticket Bits"); ?></td> <td width="78%" class="vtable"> <input name="ticketbits" type="text" class="formfld" id="ticketbits" size="2" value="<?=htmlspecialchars($pconfig['ticketbits']);?>"> <br> - <?=gettext("Reserves a range in each voucher to store the Ticket# it belongs to. Allowed range: 1..16. Using 16 bits allows a roll to have up to 65535 vouchers. A bit array, stored in RAM and in the config, is used to mark if a voucher has been used. A bit array for 65535 vouchers requires 8 KB of storage"); ?>.</td> + <?=gettext("Reserves a range in each voucher to store the Ticket# it belongs to. Allowed range: 1..16. Using 16 bits allows a roll to have up to 65535 vouchers. A bit array, stored in RAM and in the config, is used to mark if a voucher has been used. A bit array for 65535 vouchers requires 8 KB of storage."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"># <?=gettext("of Checksum Bits"); ?></td> <td width="78%" class="vtable"> <input name="checksumbits" type="text" class="formfld" id="checksumbits" size="2" value="<?=htmlspecialchars($pconfig['checksumbits']);?>"> <br> - <?=gettext("Reserves a range in each voucher to store a simple checksum over Roll# and Ticket#. Allowed range is 0..31"); ?>.</td> + <?=gettext("Reserves a range in each voucher to store a simple checksum over Roll# and Ticket#. Allowed range is 0..31."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Magic Number"); ?></td> <td width="78%" class="vtable"> <input name="magic" type="text" class="formfld" id="magic" size="20" value="<?=htmlspecialchars($pconfig['magic']);?>"> <br> - <?=gettext("Magic number stored in every voucher. Verified during voucher check. Size depends on how many bits are left by Roll+Ticket+Checksum bits. If all bits are used, no magic number will be used and checked"); ?>.</td> + <?=gettext("Magic number stored in every voucher. Verified during voucher check. Size depends on how many bits are left by Roll+Ticket+Checksum bits. If all bits are used, no magic number will be used and checked."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Save Interval"); ?></td> <td width="78%" class="vtable"> <input name="saveinterval" type="text" class="formfld" id="saveinterval" size="4" value="<?=htmlspecialchars($pconfig['saveinterval']);?>"> <?=gettext("Minutes"); ?><br> - <?=gettext("The list of active and used vouchers can be stored in the system's configuration file once every x minutes to survive power outages. No save is done if no new vouchers have been activated. Enter 0 to never write runtime state to XML config"); ?>.</td> + <?=gettext("The list of active and used vouchers can be stored in the system's configuration file once every x minutes to survive power outages. No save is done if no new vouchers have been activated. Enter 0 to never write runtime state to XML config."); ?></td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Invalid Voucher Message"); ?></td> @@ -391,8 +391,8 @@ function enable_change(enable_change) { </tr> <tr> <td colspan="2" class="list"><p class="vexpl"> - <span class="red"><strong> <?=gettext("Note"); ?>:<br> </strong></span> - <?=gettext("Changing any Voucher parameter (apart from managing the list of Rolls) on this page will render existing vouchers useless if they were generated with different settings"); ?>. + <span class="red"><strong> <?=gettext("Note:"); ?><br> </strong></span> + <?=gettext("Changing any Voucher parameter (apart from managing the list of Rolls) on this page will render existing vouchers useless if they were generated with different settings."); ?> </p> </td> </tr> diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index dd64b82..729f324 100755 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -623,8 +623,8 @@ include("head.inc"); <input name="deftime" type="text" class="formfld unknown" id="deftime" size="10" value="<?=htmlspecialchars($pconfig['deftime']);?>"> <?=gettext("seconds");?><br> <?=gettext("This is used for clients that do not ask for a specific " . - "expiration time"); ?>.<br> - <?=gettext("The default is 7200 seconds");?>. + "expiration time."); ?><br> + <?=gettext("The default is 7200 seconds.");?> </td> </tr> <tr> @@ -633,12 +633,12 @@ include("head.inc"); <input name="maxtime" type="text" class="formfld unknown" id="maxtime" size="10" value="<?=htmlspecialchars($pconfig['maxtime']);?>"> <?=gettext("seconds");?><br> <?=gettext("This is the maximum lease time for clients that ask". - " for a specific expiration time"); ?>.<br> - <?=gettext("The default is 86400 seconds");?>. + " for a specific expiration time."); ?><br> + <?=gettext("The default is 86400 seconds.");?> </td> </tr> <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Failover peer IP");?>:</td> + <td width="22%" valign="top" class="vncell"><?=gettext("Failover peer IP:");?></td> <td width="78%" class="vtable"> <input name="failover_peerip" type="text" class="formfld host" id="failover_peerip" size="20" value="<?=htmlspecialchars($pconfig['failover_peerip']);?>"><br> <?=gettext("Leave blank to disable. Enter the interface IP address of the other machine. Machines must be using CARP.");?> @@ -657,7 +657,7 @@ include("head.inc"); <tr> <td> </td> <td> - <span class="red"><strong><?=gettext("Note");?>:</strong></span> <?=gettext("Only the machines listed below will be able to communicate with the firewall on this NIC.");?> + <span class="red"><strong><?=gettext("Note:");?></strong></span> <?=gettext("Only the machines listed below will be able to communicate with the firewall on this NIC.");?> </td> </tr> </table> @@ -674,8 +674,8 @@ include("head.inc"); <b><?=gettext("Enable registration of DHCP client names in DNS.");?></b><br /> <p> <input name="ddnsdomain" type="text" class="formfld unknown" id="ddnsdomain" size="20" value="<?=htmlspecialchars($pconfig['ddnsdomain']);?>"><br /> - <?=gettext("Note: Leave blank to disable dynamic DNS registration");?>.<br /> - <?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server");?>. + <?=gettext("Note: Leave blank to disable dynamic DNS registration.");?><br /> + <?=gettext("Enter the dynamic DNS domain which will be used to register client names in the DNS server.");?> </div> </td> </tr> @@ -805,14 +805,14 @@ include("head.inc"); </tr> <tr> <td width="22%" valign="top"> </td> - <td width="78%"> <p><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br> + <td width="78%"> <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br> </strong></span><?=gettext("The DNS servers entered in"); ?> <a href="system.php"><?=gettext("System: " . "General setup"); ?></a> <?=gettext("(or the"); ?> <a href="services_dnsmasq.php"><?=gettext("DNS " . "forwarder"); ?></a>, <?=gettext("if enabled)"); ?> </span><span class="vexpl"><?=gettext("will " . - "be assigned to clients by the DHCP server"); ?>.<br> + "be assigned to clients by the DHCP server."); ?><br> <br> <?=gettext("The DHCP lease table can be viewed on the"); ?> <a href="status_dhcp_leases.php"><?=gettext("Status: " . - "DHCP leases"); ?></a> <?=gettext("page"); ?>.<br> + "DHCP leases"); ?></a> <?=gettext("page."); ?><br> </span></p> </td> </tr> diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php index 910065b..4535f6b 100755 --- a/usr/local/www/services_dnsmasq.php +++ b/usr/local/www/services_dnsmasq.php @@ -156,7 +156,7 @@ function enable_change(enable_over) { </td> </tr> <tr> - <td><p><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br> + <td><p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br> </strong></span><?php printf(gettext("If the DNS forwarder is enabled, the DHCP". " service (if enabled) will automatically serve the LAN IP". " address as a DNS server to DHCP clients so they will use". diff --git a/usr/local/www/services_dyndns.php b/usr/local/www/services_dyndns.php index b9d2e01..d591a20 100755 --- a/usr/local/www/services_dyndns.php +++ b/usr/local/www/services_dyndns.php @@ -157,7 +157,7 @@ include("head.inc"); </tr> <tr> <td colspan="3" class="list"><p class="vexpl"><span class="red"><strong> - <?=gettext("Note");?>:<br> + <?=gettext("Note:");?><br> </strong></span> <?=gettext("IP addresses appearing in green are up to date with Dynamic DNS provider.");?> </td> diff --git a/usr/local/www/services_dyndns_edit.php b/usr/local/www/services_dyndns_edit.php index bf3c207..24c0267 100644 --- a/usr/local/www/services_dyndns_edit.php +++ b/usr/local/www/services_dyndns_edit.php @@ -180,7 +180,7 @@ include("head.inc"); <input name="host" type="text" class="formfld unknown" id="host" size="30" value="<?=htmlspecialchars($pconfig['host']);?>"> <br> <span class="vexpl"> - <span class="red"><strong><?=gettext("Note");?>:<br></strong> + <span class="red"><strong><?=gettext("Note:");?><br></strong> </span> <?=gettext("Enter the complete host/domain name. example: myhost.dyndns.org");?> </span> @@ -232,7 +232,7 @@ include("head.inc"); </tr> <tr> <td width="22%" valign="top"> </td> - <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br> + <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br> </strong></span><?php printf(gettext("You must configure a DNS server in %sSystem: General setup%s or allow the DNS server list to be overridden by DHCP/PPP on WAN for dynamic DNS updates to work."),'<a href="system.php">','</a>');?></span></td> diff --git a/usr/local/www/services_igmpproxy.php b/usr/local/www/services_igmpproxy.php index 4fc531d..2fb5cdd 100755 --- a/usr/local/www/services_igmpproxy.php +++ b/usr/local/www/services_igmpproxy.php @@ -158,7 +158,7 @@ include("head.inc"); </tr> <tr> <td class="tabcont" colspan="4"> - <p><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br></strong></span><?=gettext("Please add the interface for upstream, the allowed subnets, and the downstream interfaces you would like the proxy to allow. Only one 'upstream' interface can be configured.");?></span></p> + <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br></strong></span><?=gettext("Please add the interface for upstream, the allowed subnets, and the downstream interfaces you would like the proxy to allow. Only one 'upstream' interface can be configured.");?></span></p> </td> </tr> </table> diff --git a/usr/local/www/services_rfc2136_edit.php b/usr/local/www/services_rfc2136_edit.php index df0ea47..d11278c 100644 --- a/usr/local/www/services_rfc2136_edit.php +++ b/usr/local/www/services_rfc2136_edit.php @@ -205,7 +205,7 @@ include("head.inc"); </tr> <tr> <td width="22%" valign="top"> </td> - <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br> + <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br> </strong></span><?php printf(gettext("You must configure a DNS server in %sSystem: " . "General setup %sor allow the DNS server list to be overridden " . "by DHCP/PPP on WAN for dynamic DNS updates to work."),'<a href="system.php">', '</a>');?></span></td> diff --git a/usr/local/www/services_wol.php b/usr/local/www/services_wol.php index b798e39..e95f118 100755 --- a/usr/local/www/services_wol.php +++ b/usr/local/www/services_wol.php @@ -209,7 +209,7 @@ include("head.inc"); <span class="vexpl"> <span class="red"> <strong> - <?=gettext("Note");?>:<br> + <?=gettext("Note:");?><br> </strong> </span><?=gettext("This service can be used to wake up (power on) computers by sending special"); ?> "<?=gettext("Magic Packets"); ?>". <?=gettext("The NIC in the computer that is to be woken up must support Wake on LAN and has to be configured properly (WOL cable, BIOS settings). ");?> </span> |
