X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=fs_selfservice%2FFS-SelfService%2Fcgi%2Fcontact.html;h=798af709058bdf95e51045613face6eec5f049b9;hp=20c15df784270cfaefc6bfa7f61a9db2c6b136ef;hb=f5481d63043954fa6fa8a34a5820b23408192f8b;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c

diff --git a/fs_selfservice/FS-SelfService/cgi/contact.html b/fs_selfservice/FS-SelfService/cgi/contact.html
index 20c15df78..798af7090 100644
--- a/fs_selfservice/FS-SelfService/cgi/contact.html
+++ b/fs_selfservice/FS-SelfService/cgi/contact.html
@@ -3,22 +3,22 @@
 <TR>
   <TH ALIGN="right"><%=$r%>Contact&nbsp;name<BR>(last,&nbsp;first)</TH>
   <TD COLSPAN=5>
-    <INPUT TYPE="text" NAME="<%=$pre%>last" VALUE="<%= ${$pre.'last'} %>" onChange="<%= $onchange %>" <%=$disabled%>> , 
-    <INPUT TYPE="text" NAME="<%=$pre%>first" VALUE="<%= ${$pre.'first'} %>" onChange="<%= $onchange %>" <%=$disabled%>>
+    <INPUT TYPE="text" NAME="<%=$pre%>last" VALUE="<%= encode_entities(${$pre.'last'}) %>" onChange="<%= $onchange %>" <%=$disabled%>> , 
+    <INPUT TYPE="text" NAME="<%=$pre%>first" VALUE="<%= encode_entities(${$pre.'first'}) %>" onChange="<%= $onchange %>" <%=$disabled%>>
   </TD>
 </TR>
 
 <TR>
   <TD ALIGN="right">Company</TD>
   <TD COLSPAN=7>
-    <INPUT TYPE="text" NAME="<%=$pre%>company" VALUE="<%= ${$pre.'company'} %>" SIZE=70 onChange="<%= $onchange %>" <%=$disabled%>>
+    <INPUT TYPE="text" NAME="<%=$pre%>company" VALUE="<%= encode_entities(${$pre.'company'}) %>" SIZE=70 onChange="<%= $onchange %>" <%=$disabled%>>
   </TD>
 </TR>
 
 <TR>
   <TH ALIGN="right"><%=$r%>Address</TH>
   <TD COLSPAN=7>
-    <INPUT TYPE="text" NAME="<%=$pre%>address1" VALUE="<%= ${$pre.'address1'} %>" SIZE=70 onChange="<%= $onchange %>" <%=$disabled%>>
+    <INPUT TYPE="text" NAME="<%=$pre%>address1" VALUE="<%= encode_entities(${$pre.'address1'}) %>" SIZE=70 onChange="<%= $onchange %>" <%=$disabled%>>
   </TD>
 </TR>
 
@@ -37,19 +37,16 @@
     %>
   </TD>
   <TD COLSPAN=7>
-    <INPUT TYPE="text" NAME="<%=$pre%>address2" VALUE="<%= ${$pre.'address2'} %>" SIZE=70 onChange="<%= $onchange %>" <%=$disabled%>>
+    <INPUT TYPE="text" NAME="<%=$pre%>address2" VALUE="<%= encode_entities(${$pre.'address2'}) %>" SIZE=70 onChange="<%= $onchange %>" <%=$disabled%>>
   </TD>
 </TR>
 
 <TR>
-  <TH ALIGN="right"><%=$r%>City</TH>
-  <TD>
-    <INPUT TYPE="text" ID="<%=$pre%>city" NAME="<%=$pre%>city" VALUE="<%= ${$pre.'city'} %>" onChange="<%= $onchange %>" <%=$disabled%>>
-  </TD>
   <%= 
-    ($county_html, $state_html, $country_html) = 
+    ($county_html, $state_html, $country_html, $city_html) =
       FS::SelfService::regionselector( {
         prefix           => $pre,
+        selected_city    => ${$pre.'city'},
         selected_county  => ${$pre.'county'},
         selected_state   => ${$pre.'state'},
         selected_country => ${$pre.'country'},
@@ -58,6 +55,8 @@
         locales          => \@cust_main_county,
       } );
 
+  $OUT .= qq!<TH ALIGN="right">${r}City</TH>!;
+  $OUT .= qq!<TD>$city_html</TD>!;
   $OUT .= qq!<TH ALIGN="right">${r}State/County</TH>!;
   $OUT .= qq!<TD>$county_html $state_html</TD>!;
   $OUT .= qq!<TH>${r}Zip</TH>!;
@@ -73,7 +72,7 @@
   <%=
     if ( $disabled ) {
       $OUT .= qq!var what = document.getElementById("${pre}city");!;
-      for (qw( county state country ) ) {
+      for (qw( city county state country ) ) {
         $OUT .= "what.form.$pre$_.disabled = true;";
         $OUT .= "what.form.$pre$_.style.backgroundColor = '#dddddd';";
       }