From 380df2ee971291598a2b4864a69f067796694b5f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 3 Jan 2010 07:40:35 +0000
Subject: [PATCH] port skinning, customer display/edit from RT 3.6 integration
 to RT 3.8 integration

---
 htetc/freeside-base1.99.conf | 6 +++++-
 htetc/freeside-base1.conf    | 8 ++++++--
 htetc/freeside-base2.conf    | 6 +++++-
 htetc/handler.pl             | 4 ++--
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/htetc/freeside-base1.99.conf b/htetc/freeside-base1.99.conf
index ce3c3f240..afda3819e 100644
--- a/htetc/freeside-base1.99.conf
+++ b/htetc/freeside-base1.99.conf
@@ -16,9 +16,13 @@ AuthName Freeside
 AuthType Basic
 AuthUserFile %%%FREESIDE_CONF%%%/htpasswd
 require valid-user
-<Files ~ (\.cgi|\.html)>
+<Files ~ "(\.cgi|\.html)$">
 SetHandler perl-script
 PerlHandler HTML::Mason
 </Files>
 </Directory>
+<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/rt/Helpers/>
+SetHandler perl-script
+PerlHandler HTML::Mason
+</Directory>
 
diff --git a/htetc/freeside-base1.conf b/htetc/freeside-base1.conf
index 7b8d9da68..0834505bc 100644
--- a/htetc/freeside-base1.conf
+++ b/htetc/freeside-base1.conf
@@ -10,12 +10,16 @@ AuthName Freeside
 AuthType Basic
 AuthUserFile %%%FREESIDE_CONF%%%/htpasswd
 require valid-user
-<Files ~ (\.cgi|\.html)>
+<Files ~ "(\.cgi|\.html)$">
 AddHandler perl-script .cgi .html
 PerlHandler HTML::Mason
 </Files>
+</Directory>
+<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/rt/Helpers/>
+SetHandler perl-script
+PerlHandler HTML::Mason
+</Directory>
 <Perl>
 require "%%%MASON_HANDLER%%%";
 </Perl>
-</Directory>
 
diff --git a/htetc/freeside-base2.conf b/htetc/freeside-base2.conf
index 1cd1cc550..2f1afcf6e 100644
--- a/htetc/freeside-base2.conf
+++ b/htetc/freeside-base2.conf
@@ -16,9 +16,13 @@ AuthName Freeside
 AuthType Basic
 AuthUserFile %%%FREESIDE_CONF%%%/htpasswd
 require valid-user
-<Files ~ (\.cgi|\.html)>
+<Files ~ "(\.cgi|\.html)$">
 SetHandler perl-script
 PerlHandler HTML::Mason
 </Files>
 </Directory>
+<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/rt/Helpers/>
+SetHandler perl-script
+PerlHandler HTML::Mason
+</Directory>
 
diff --git a/htetc/handler.pl b/htetc/handler.pl
index 952d6203b..38af4cc8c 100644
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -76,8 +76,8 @@ sub handler
       RT::Init() if $RT::VERSION; #for lack of something else
 
       #we don't want the RT error handlers under FS
-      undef $SIG{__WARN__} if defined($SIG{__WARN__});
-      undef $SIG{__DIE__}  if defined($SIG{__DIE__} );
+      undef($SIG{__WARN__}) if defined($SIG{__WARN__});
+      undef($SIG{__DIE__})  if defined($SIG{__DIE__} );
 
       $ah->interp($fs_interp);
 
-- 
2.11.0