projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
initial indosoft export, RT#4068
[freeside.git]
/
FS
/
FS
/
Mason.pm
diff --git
a/FS/FS/Mason.pm
b/FS/FS/Mason.pm
index
98cf254
..
82e64f2
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;
@@
-101,6
+102,7
@@
if ( -e $addl_handler_use_file ) {
use String::Approx qw(amatch);
use Chart::LinesPoints;
use Chart::Mountain;
use String::Approx qw(amatch);
use Chart::LinesPoints;
use Chart::Mountain;
+ use Chart::Bars;
use Color::Scheme;
use HTML::Widgets::SelectLayers 0.07; #should go away in favor of
#selectlayers.html
use Color::Scheme;
use HTML::Widgets::SelectLayers 0.07; #should go away in favor of
#selectlayers.html
@@
-174,6
+176,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;
@@
-185,6
+188,7
@@
if ( -e $addl_handler_use_file ) {
use FS::XMLRPC;
use FS::payby;
use FS::cdr;
use FS::XMLRPC;
use FS::payby;
use FS::cdr;
+ use FS::cdr_batch;
use FS::inventory_class;
use FS::inventory_item;
use FS::pkg_category;
use FS::inventory_class;
use FS::inventory_item;
use FS::pkg_category;
@@
-221,6
+225,15
@@
if ( -e $addl_handler_use_file ) {
#use FS::h_phone_device;
use FS::h_svc_www;
use FS::cust_statement;
#use FS::h_phone_device;
use FS::h_svc_www;
use FS::cust_statement;
+ use FS::cust_class;
+ 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 ) {
@@
-261,9
+274,11
@@
if ( -e $addl_handler_use_file ) {
#to throw a real error instead of just a mysterious unstyled RT
use CSS::Squish 0.06;
#to throw a real error instead of just a mysterious unstyled RT
use CSS::Squish 0.06;
+ use RT::Interface::Web::Request;
+
#slow, unreliable, segfaults and is optional
#see rt/html/Ticket/Elements/ShowTransactionAttachments
#slow, unreliable, segfaults and is optional
#see rt/html/Ticket/Elements/ShowTransactionAttachments
- use Text::Quoted;
+
#
use Text::Quoted;
#?#use File::Path qw( rmtree );
#?#use File::Glob qw( bsd_glob );
#?#use File::Path qw( rmtree );
#?#use File::Glob qw( bsd_glob );
@@
-381,15
+396,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 = @_;
@@
-399,7
+421,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();
}
@@
-433,6
+455,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 {
@@
-440,7
+464,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)],