diff options
author | jim-p <jimp@pfsense.org> | 2011-08-30 13:19:44 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2011-08-30 13:19:44 -0400 |
commit | d07b96a5f041631f1aad7d1992d465f002fd626b (patch) | |
tree | 3898201db6cafbaf4ed65849fa5707bf4949da5d /usr/local/www | |
parent | 571aa4aa2b8885c122013cdfa672677f9abca60a (diff) | |
download | pfsense-d07b96a5f041631f1aad7d1992d465f002fd626b.zip pfsense-d07b96a5f041631f1aad7d1992d465f002fd626b.tar.gz |
Sync note for "server address" between PPTP/PPPoE/L2TP for consistency.
Diffstat (limited to 'usr/local/www')
-rw-r--r-- | usr/local/www/vpn_l2tp.php | 9 | ||||
-rwxr-xr-x | usr/local/www/vpn_pppoe_edit.php | 14 | ||||
-rwxr-xr-x | usr/local/www/vpn_pptp.php | 2 |
3 files changed, 17 insertions, 8 deletions
diff --git a/usr/local/www/vpn_l2tp.php b/usr/local/www/vpn_l2tp.php index 37eac0f..3c62476 100644 --- a/usr/local/www/vpn_l2tp.php +++ b/usr/local/www/vpn_l2tp.php @@ -321,8 +321,13 @@ function enable_change(enable_over) { <td width="22%" valign="top" class="vncellreq"><?=gettext("Server address");?></td> <td width="78%" class="vtable"> <?=$mandfldhtml;?><input name="localip" type="text" class="formfld unknown" id="localip" size="20" value="<?=htmlspecialchars($pconfig['localip']);?>" /> - <br /> - <?=gettext("Enter the IP address the L2TP server should use on its side for all clients.");?></td> + <br/> + <?=gettext("Enter the IP address the L2TP server should give to clients for use as their \"gateway\""); ?>. + <br/> + <?=gettext("Typically this is set to an unused IP just outside of the client range"); ?>. + <br/> + <br/> + <?=gettext("NOTE: This should NOT be set to any IP address currently in use on this firewall"); ?>.</td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Remote address range");?></td> diff --git a/usr/local/www/vpn_pppoe_edit.php b/usr/local/www/vpn_pppoe_edit.php index 92d617f..73ed4eb 100755 --- a/usr/local/www/vpn_pppoe_edit.php +++ b/usr/local/www/vpn_pppoe_edit.php @@ -138,9 +138,9 @@ if ($_POST) { for($x=0; $x<4999; $x++) { if ($_POST["username{$x}"]) { if (empty($_POST["password{$x}"])) - $input_errors[] = gettext("No password specified for username ") . $_POST["username{$x}"]; + $input_errors[] = sprintf(gettext("No password specified for username %s"),$_POST["username{$x}"]); if ($_POST["ip{$x}"] <> "" && !is_ipaddr($_POST["ip{$x}"])) - $input_errors[] = gettext("Incorrect ip address specified for username ") . $_POST["username{$x}"]; + $input_errors[] = sprintf(gettext("Incorrect ip address specified for username %s"),$_POST["username{$x}"]); } } } @@ -424,9 +424,13 @@ function enable_change(enable_over) { <td width="22%" valign="top" class="vncellreq"><?=gettext("Server address"); ?></td> <td width="78%" class="vtable"> <?=$mandfldhtml;?><input name="localip" type="text" class="formfld unknown" id="localip" size="20" value="<?=htmlspecialchars($pconfig['localip']);?>"> - <br> - <?=gettext("Enter the IP address the PPPoE server should use on its side " . - "for all clients"); ?>.</td> + <br/> + <?=gettext("Enter the IP address the PPPoE server should give to clients for use as their \"gateway\""); ?>. + <br/> + <?=gettext("Typically this is set to an unused IP just outside of the client range"); ?>. + <br/> + <br/> + <?=gettext("NOTE: This should NOT be set to any IP address currently in use on this firewall"); ?>.</td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Remote address range"); ?></td> diff --git a/usr/local/www/vpn_pptp.php b/usr/local/www/vpn_pptp.php index 52190ec..48d0354 100755 --- a/usr/local/www/vpn_pptp.php +++ b/usr/local/www/vpn_pptp.php @@ -359,7 +359,7 @@ function enable_change(enable_over) { <?=gettext("Typically this is set to an unused IP just outside of the client range"); ?>. <br/> <br/> - <?=gettext("NOTE: This should NOT be set to any IP address currently in use on this firewall"); ?>. + <?=gettext("NOTE: This should NOT be set to any IP address currently in use on this firewall"); ?>.</td> </tr> <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Remote address " . |