projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move from otaker to proper usernum FK
[freeside.git]
/
FS
/
FS
/
Mason.pm
diff --git
a/FS/FS/Mason.pm
b/FS/FS/Mason.pm
index
c5b68f5
..
4c8c808
100644
(file)
--- a/
FS/FS/Mason.pm
+++ b/
FS/FS/Mason.pm
@@
-70,6
+70,7
@@
if ( -e $addl_handler_use_file ) {
use HTML::Entities;
use HTML::TreeBuilder;
use HTML::FormatText;
use HTML::Entities;
use HTML::TreeBuilder;
use HTML::FormatText;
+ use HTML::Defang;
use JSON;
use MIME::Base64;
use IO::Handle;
use JSON;
use MIME::Base64;
use IO::Handle;
@@
-174,6
+175,7
@@
if ( -e $addl_handler_use_file ) {
use FS::part_export;
use FS::part_export_option;
use FS::export_svc;
use FS::part_export;
use FS::part_export_option;
use FS::export_svc;
+ use FS::export_device;
use FS::msgcat;
use FS::rate;
use FS::rate_region;
use FS::msgcat;
use FS::rate;
use FS::rate_region;
@@
-226,6
+228,11
@@
if ( -e $addl_handler_use_file ) {
use FS::cust_category;
use FS::prospect_main;
use FS::contact;
use FS::cust_category;
use FS::prospect_main;
use FS::contact;
+ use FS::svc_pbx;
+ use FS::discount;
+ use FS::cust_pkg_discount;
+ use FS::cust_bill_pkg_discount;
+ use FS::svc_mailinglist;
# Sammath Naur
if ( $FS::Mason::addl_handler_use ) {
# Sammath Naur
if ( $FS::Mason::addl_handler_use ) {
@@
-388,15
+395,22
@@
if ( -e $addl_handler_use_file ) {
=over 4
=over 4
-=item mason_interps [ MODE ]
+=item mason_interps [ MODE
[ OPTION => VALUE ... ]
]
Returns a list consisting of two HTML::Mason::Interp objects, the first for
Freeside pages, and the second for RT pages.
Returns a list consisting of two HTML::Mason::Interp objects, the first for
Freeside pages, and the second for RT pages.
-#MODE can be 'apache' or 'standalone'. If not specified, defaults to 'apache'.
+MODE can be 'apache' or 'standalone'. If not specified, defaults to 'apache'.
+
+Options and values can be passed following mode. Currently available options
+are:
+
+I<outbuf> should be set to a scalar reference in standalone mode.
=cut
=cut
+my %defang_opts = ( attribs_to_callback => ['src'], attribs_callback => sub { 1 });
+
sub mason_interps {
my $mode = shift || 'apache';
my %opt = @_;
sub mason_interps {
my $mode = shift || 'apache';
my %opt = @_;
@@
-406,7
+420,7
@@
sub mason_interps {
my $request_class = 'FS::Mason::Request';
#not entirely sure it belongs here, but what the hey
my $request_class = 'FS::Mason::Request';
#not entirely sure it belongs here, but what the hey
- if ( %%%RT_ENABLED%%% ) {
+ if ( %%%RT_ENABLED%%%
&& $mode ne 'standalone'
) {
RT::LoadConfig();
}
RT::LoadConfig();
}
@@
-440,6
+454,8
@@
sub mason_interps {
$interp{out_method} = $opt{outbuf} if $mode eq 'standalone' && $opt{outbuf};
$interp{out_method} = $opt{outbuf} if $mode eq 'standalone' && $opt{outbuf};
+ my $html_defang = new HTML::Defang (%defang_opts);
+
my $fs_interp = new HTML::Mason::Interp (
%interp,
escape_flags => { 'js_string' => sub {
my $fs_interp = new HTML::Mason::Interp (
%interp,
escape_flags => { 'js_string' => sub {
@@
-447,7
+463,10
@@
sub mason_interps {
${$_[0]} =~ s/(['\\])/\\$1/g;
${$_[0]} =~ s/\n/\\n/g;
${$_[0]} = "'". ${$_[0]}. "'";
${$_[0]} =~ s/(['\\])/\\$1/g;
${$_[0]} =~ s/\n/\\n/g;
${$_[0]} = "'". ${$_[0]}. "'";
- }
+ },
+ 'defang' => sub {
+ ${$_[0]} = $html_defang->defang(${$_[0]});
+ },
},
compiler => HTML::Mason::Compiler::ToObject->new(
allow_globals => [qw(%session)],
},
compiler => HTML::Mason::Compiler::ToObject->new(
allow_globals => [qw(%session)],