port skinning, customer display/edit from RT 3.6 integration to RT 3.8 integration

diff --git a/htetc/freeside-base1.99.conf b/htetc/freeside-base1.99.conf
index ce3c3f2..afda381 100644 (file)
--- 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
 AuthType Basic
 AuthUserFile %%%FREESIDE_CONF%%%/htpasswd
 require valid-user

-<Files ~ (\.cgi|\.html)>
+<Files ~ "(\.cgi|\.html)$">

 SetHandler perl-script
 PerlHandler HTML::Mason
 </Files>
 </Directory>
 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 7b8d9da..0834505 100644 (file)
--- 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
 AuthType Basic
 AuthUserFile %%%FREESIDE_CONF%%%/htpasswd
 require valid-user

-<Files ~ (\.cgi|\.html)>
+<Files ~ "(\.cgi|\.html)$">

 AddHandler perl-script .cgi .html
 PerlHandler HTML::Mason
 </Files>
 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>
 <Perl>
 require "%%%MASON_HANDLER%%%";
 </Perl>

-</Directory>

 
 

diff --git a/htetc/freeside-base2.conf b/htetc/freeside-base2.conf
index 1cd1cc5..2f1afcf 100644 (file)
--- 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
 AuthType Basic
 AuthUserFile %%%FREESIDE_CONF%%%/htpasswd
 require valid-user

-<Files ~ (\.cgi|\.html)>
+<Files ~ "(\.cgi|\.html)$">

 SetHandler perl-script
 PerlHandler HTML::Mason
 </Files>
 </Directory>
 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 952d620..38af4cc 100644 (file)
--- 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
       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);
 
 
       $ah->interp($fs_interp);