add EmptyTrash values and finish consolidating the CGP timezone arrays, RT#7083

[freeside.git] / FS / FS / Mason.pm

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index 6bc2338..0f14150 100644 (file)
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -244,6 +244,10 @@ if ( -e $addl_handler_use_file ) {
   use FS::cgp_rule_action;
   use FS::bill_batch;
   use FS::cust_bill_batch;
+  use FS::rate_time;
+  use FS::rate_time_interval;
+  use FS::msg_template;
+  use FS::part_tag;
   # Sammath Naur
 
   if ( $FS::Mason::addl_handler_use ) {
@@ -476,14 +480,17 @@ sub mason_interps {
 
   my $html_defang = new HTML::Defang (%defang_opts);
 
+  my $js_string_sub = sub {
+    #${$_[0]} =~ s/(['\\\n])/'\\'.($1 eq "\n" ? 'n' : $1)/ge;
+    ${$_[0]} =~ s/(['\\])/\\$1/g;
+    ${$_[0]} =~ s/\r/\\r/g;
+    ${$_[0]} =~ s/\n/\\n/g;
+    ${$_[0]} = "'". ${$_[0]}. "'";
+  };
+
   my $fs_interp = new HTML::Mason::Interp (
     %interp,
-    escape_flags => { 'js_string' => sub {
-                        #${$_[0]} =~ s/(['\\\n])/'\\'.($1 eq "\n" ? 'n' : $1)/ge;
-                        ${$_[0]} =~ s/(['\\])/\\$1/g;
-                        ${$_[0]} =~ s/\n/\\n/g;
-                        ${$_[0]} = "'". ${$_[0]}. "'";
-                      },
+    escape_flags => { 'js_string' => $js_string_sub,
                       'defang'    => sub {
                         ${$_[0]} = $html_defang->defang(${$_[0]});
                       },
@@ -495,7 +502,9 @@ sub mason_interps {
 
   my $rt_interp = new HTML::Mason::Interp (
     %interp,
-    escape_flags => { 'h' => \&RT::Interface::Web::EscapeUTF8 },
+    escape_flags => { 'h'         => \&RT::Interface::Web::EscapeUTF8,
+                      'js_string' => $js_string_sub,
+                    },
     compiler     => HTML::Mason::Compiler::ToObject->new(
                       default_escape_flags => 'h',
                       allow_globals        => [qw(%session)],