From 4abeb53ac1ba98d441dab810c859c025e7307809 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 11 Nov 2012 22:18:55 -0800
Subject: [PATCH] fix XSS

---
 FS/FS/UI/Web/small_custview.pm    | 12 ++++++------
 httemplate/elements/location.html |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/FS/FS/UI/Web/small_custview.pm b/FS/FS/UI/Web/small_custview.pm
index c3d251c6d..0660038d9 100644
--- a/FS/FS/UI/Web/small_custview.pm
+++ b/FS/FS/UI/Web/small_custview.pm
@@ -89,14 +89,14 @@ sub small_custview {
 
     $html .= '<TD VALIGN="top">'. ntable("#cccccc",2).
       '<TR><TD ALIGN="right" VALIGN="top">Service<BR>Address</TD><TD BGCOLOR="#ffffff">'.
-      $cust_main->get("${pre}last"). ', '.
-      $cust_main->get("${pre}first"). '<BR>';
-    $html .= $cust_main->get("${pre}company"). '<BR>'
+      encode_entities($cust_main->get("${pre}last")). ', '.
+      encode_entities($cust_main->get("${pre}first")). '<BR>';
+    $html .= encode_entities($cust_main->get("${pre}company")). '<BR>'
       if $cust_main->get("${pre}company");
-    $html .= $cust_main->get("${pre}address1"). '<BR>';
-    $html .= $cust_main->get("${pre}address2"). '<BR>'
+    $html .= encode_entities($cust_main->get("${pre}address1")). '<BR>';
+    $html .= encode_entities($cust_main->get("${pre}address2")). '<BR>'
       if $cust_main->get("${pre}address2");
-    $html .= $cust_main->get("${pre}city"). ', '.
+    $html .= encode_entities($cust_main->get("${pre}city")). ', '.
              $cust_main->get("${pre}state"). '  '.
              $cust_main->get("${pre}zip"). '<BR>';
     $html .= $cust_main->get("${pre}country"). '<BR>'
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index c606523f0..a0c5644e8 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -214,7 +214,7 @@ Example:
     <TR>
       <<%$th%> ALIGN="right">Tax district<BR>(automatic)</<%$th%>>
       <TD>
-        <INPUT TYPE="text" NAME="district" VALUE="<%$object->get('district')%>">
+        <INPUT TYPE="text" NAME="district" VALUE="<% $object->get('district') |h %>">
       </TD>
     </TR>
 %   }
-- 
2.20.1