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.
This commit is contained in:
jim-p 2014-08-06 15:53:29 -04:00
parent 92ca4bc3b4
commit c3e7784158
2 changed files with 5 additions and 2 deletions

View File

@ -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>

View File

@ -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>