projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix errors fixing inadvertantly-encrypted payinfo, RT#8815
[freeside.git]
/
FS
/
FS
/
Mason.pm
diff --git
a/FS/FS/Mason.pm
b/FS/FS/Mason.pm
index
dd18717
..
3d4fac4
100644
(file)
--- a/
FS/FS/Mason.pm
+++ b/
FS/FS/Mason.pm
@@
-133,10
+133,14
@@
if ( -e $addl_handler_use_file ) {
);
use FS::Misc::eps2png qw( eps2png );
use FS::Report::FCC_477;
);
use FS::Misc::eps2png qw( eps2png );
use FS::Report::FCC_477;
+ use FS::Report::Table;
use FS::Report::Table::Monthly;
use FS::Report::Table::Monthly;
+ use FS::Report::Table::Daily;
use FS::TicketSystem;
use FS::NetworkMonitoringSystem;
use FS::Tron qw( tron_lint );
use FS::TicketSystem;
use FS::NetworkMonitoringSystem;
use FS::Tron qw( tron_lint );
+ use FS::Locales;
+ use FS::Maketext qw( mt emt js_mt );
use FS::agent;
use FS::agent_type;
use FS::agent;
use FS::agent_type;
@@
-274,10
+278,23
@@
if ( -e $addl_handler_use_file ) {
use FS::torrus_srvderive_component;
use FS::areacode;
use FS::svc_dish;
use FS::torrus_srvderive_component;
use FS::areacode;
use FS::svc_dish;
+ use FS::h_svc_dish;
use FS::svc_hardware;
use FS::svc_hardware;
+ use FS::h_svc_hardware;
use FS::hardware_class;
use FS::hardware_type;
use FS::hardware_status;
use FS::hardware_class;
use FS::hardware_type;
use FS::hardware_status;
+ use FS::did_order_item;
+ use FS::msa;
+ use FS::rate_center;
+ use FS::cust_msg;
+ use FS::radius_group;
+ use FS::template_content;
+ use FS::dsl_device;
+ use FS::nas;
+ use FS::nas;
+ use FS::export_nas;
+ use FS::legacy_cust_bill;
# Sammath Naur
if ( $FS::Mason::addl_handler_use ) {
# Sammath Naur
if ( $FS::Mason::addl_handler_use ) {
@@
-515,6
+532,7
@@
sub mason_interps {
my $html_defang = new HTML::Defang (%defang_opts);
my $html_defang = new HTML::Defang (%defang_opts);
+ #false laziness w/ FS::Maketext js_mt
my $js_string_sub = sub {
#${$_[0]} =~ s/(['\\\n])/'\\'.($1 eq "\n" ? 'n' : $1)/ge;
${$_[0]} =~ s/(['\\])/\\$1/g;
my $js_string_sub = sub {
#${$_[0]} =~ s/(['\\\n])/'\\'.($1 eq "\n" ? 'n' : $1)/ge;
${$_[0]} =~ s/(['\\])/\\$1/g;
@@
-523,13
+541,15
@@
sub mason_interps {
${$_[0]} = "'". ${$_[0]}. "'";
};
${$_[0]} = "'". ${$_[0]}. "'";
};
+ my $defang_sub = sub {
+ ${$_[0]} = $html_defang->defang(${$_[0]});
+ };
+
my $fs_interp = new HTML::Mason::Interp (
%interp,
comp_root => $fs_comp_root,
my $fs_interp = new HTML::Mason::Interp (
%interp,
comp_root => $fs_comp_root,
- escape_flags => { 'js_string' => $js_string_sub,
- 'defang' => sub {
- ${$_[0]} = $html_defang->defang(${$_[0]});
- },
+ escape_flags => { 'js_string' => $js_string_sub,
+ 'defang' => $defang_sub,
},
compiler => HTML::Mason::Compiler::ToObject->new(
allow_globals => [qw(%session)],
},
compiler => HTML::Mason::Compiler::ToObject->new(
allow_globals => [qw(%session)],