diff options
author | jim-p <jimp@pfsense.org> | 2014-08-06 15:53:29 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2014-08-06 15:53:29 -0400 |
commit | 978c71d28ffb108c91f9b4ae79f225780d574308 (patch) | |
tree | c56da354ef7a91f18cd17f29f6585d71a3bc0f7e | |
parent | bf2fb3db04c8724dec8eba8fd29dbb507da67655 (diff) | |
download | pfsense-978c71d28ffb108c91f9b4ae79f225780d574308.zip pfsense-978c71d28ffb108c91f9b4ae79f225780d574308.tar.gz |
Encode interface/VIP descriptions before displaying them on the GRE and GIF pages also;
While here, the GRE page was missing IP aliases from its list of bind IPs, add it in.
-rw-r--r-- | usr/local/www/interfaces_gif_edit.php | 2 | ||||
-rw-r--r-- | usr/local/www/interfaces_gre_edit.php | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/usr/local/www/interfaces_gif_edit.php b/usr/local/www/interfaces_gif_edit.php index 4add083..c9de743 100644 --- a/usr/local/www/interfaces_gif_edit.php +++ b/usr/local/www/interfaces_gif_edit.php @@ -161,7 +161,7 @@ include("head.inc"); echo "<option value=\"{$ifn}\""; if ($ifn == $pconfig['if']) echo " selected=\"selected\""; - echo ">{$ifinfo}</option>"; + echo ">" . htmlspecialchars($ifinfo) . "</option>\n"; } ?> </select> diff --git a/usr/local/www/interfaces_gre_edit.php b/usr/local/www/interfaces_gre_edit.php index 5d97cd6..dc28560 100644 --- a/usr/local/www/interfaces_gre_edit.php +++ b/usr/local/www/interfaces_gre_edit.php @@ -148,11 +148,14 @@ include("head.inc"); $carplist = get_configured_carp_interface_list(); foreach ($carplist as $cif => $carpip) $portlist[$cif] = $carpip." (".get_vip_descr($carpip).")"; + $aliaslist = get_configured_ip_aliases_list(); + foreach ($aliaslist as $aliasip => $aliasif) + $portlist[$aliasif.'|'.$aliasip] = $aliasip." (".get_vip_descr($aliasip).")"; foreach ($portlist as $ifn => $ifinfo) { echo "<option value=\"{$ifn}\""; if ($ifn == $pconfig['if']) echo " selected=\"selected\""; - echo ">{$ifinfo}</option>"; + echo ">" . htmlspecialchars($ifinfo) . "</option>\n"; } ?> </select> |