From 68834437676eff4326b488150005ea8b4f004a01 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Mar 2008 00:30:28 +0000
Subject: [PATCH] fix harmless code leaking out onto the page, hehe, closes:
 Bug#3253, also remove silly formatting on catchall edit

---
 httemplate/misc/catchall.cgi   | 6 ++----
 httemplate/view/svc_domain.cgi | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/httemplate/misc/catchall.cgi b/httemplate/misc/catchall.cgi
index 2094494be..240f34d0e 100755
--- a/httemplate/misc/catchall.cgi
+++ b/httemplate/misc/catchall.cgi
@@ -4,10 +4,9 @@
 
 <FORM ACTION="<%$p1%>process/catchall.cgi" METHOD=POST>
 
-<PRE>
-
 <INPUT TYPE="hidden" NAME="svcnum" VALUE="<% $svcnum |h %>">
 Service #<FONT SIZE=+1><B><% $svcnum ? $svcnum : ' (NEW)' |h %></B></FONT>
+<BR><BR>
 
 <INPUT TYPE="hidden" NAME="pkgnum" VALUE="<% $pkgnum |h %>">
 
@@ -23,8 +22,7 @@ Mail to <I>(anything)</I>@<B><% $domain |h %></B> forwards to <SELECT NAME="catc
     <OPTION<% $_ eq $catchall ? ' SELECTED' : '' %> VALUE="<% $_ %>"><% $email{$_} %>
 % }
 </SELECT>
-
-</PRE>
+<BR><BR>
 
 <INPUT TYPE="submit" VALUE="Submit">
 
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index a58d75ed6..d6565db34 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -10,10 +10,9 @@
 Service #<% $svcnum %>
 <BR>Service: <B><% $part_svc->svc %></B>
 <BR>Domain name: <B><% $domain %></B>
-<BR>Catch all email 
 % if ( $FS::CurrentUser::CurrentUser->access_right('Edit domain catchall') ) {
-    <BR>Catch all email<A HREF="<% ${p} %>misc/catchall.cgi?<% $svcnum %>">(change)</A>:
-} else {
+    <BR>Catch all email <A HREF="<% ${p} %>misc/catchall.cgi?<% $svcnum %>">(change)</A>:
+% } else {
     <BR>Catch all email:
 % }
 
-- 
2.11.0