summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
authorivan <ivan>2008-03-15 00:30:28 +0000
committerivan <ivan>2008-03-15 00:30:28 +0000
commit68834437676eff4326b488150005ea8b4f004a01 (patch)
treef7388aae9d6da808320f8401ff4791d941605e26 /httemplate
parentc7018e1a451242265a0191f8a6e2ccbbc568fa44 (diff)
fix harmless code leaking out onto the page, hehe, closes: Bug#3253, also remove silly formatting on catchall edit
Diffstat (limited to 'httemplate')
-rwxr-xr-xhttemplate/misc/catchall.cgi6
-rwxr-xr-xhttemplate/view/svc_domain.cgi5
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:
% }