From c3e7784158a020f9fbfb4cb87be8a54ab77f1664 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 6 Aug 2014 15:53:29 -0400
Subject: [PATCH] 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.

---
 usr/local/www/interfaces_gif_edit.php | 2 +-
 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 42cca505fb..517965b748 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 64c34a18a7..c38c222a08 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>