diff options
Diffstat (limited to 'htetc')
| -rw-r--r-- | htetc/freeside-base.conf | 15 | ||||
| -rw-r--r-- | htetc/freeside-rt.conf | 31 | ||||
| -rw-r--r-- | htetc/global.asa | 22 | ||||
| -rw-r--r-- | htetc/handler.pl | 20 |
4 files changed, 6 insertions, 82 deletions
diff --git a/htetc/freeside-base.conf b/htetc/freeside-base.conf deleted file mode 100644 index f8ebece9e..000000000 --- a/htetc/freeside-base.conf +++ /dev/null @@ -1,15 +0,0 @@ -PerlModule HTML::Mason -<Directory %%%FREESIDE_DOCUMENT_ROOT%%%> -AuthName Freeside -AuthType Basic -AuthUserFile /usr/local/etc/freeside/htpasswd -require valid-user -<Files ~ (\.cgi|\.html)> -AddHandler perl-script .cgi .html -PerlHandler HTML::Mason -</Files> -<Perl> -require "/usr/local/etc/freeside/handler.pl"; -</Perl> -</Directory> - diff --git a/htetc/freeside-rt.conf b/htetc/freeside-rt.conf deleted file mode 100644 index 1cb089bd6..000000000 --- a/htetc/freeside-rt.conf +++ /dev/null @@ -1,31 +0,0 @@ -<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/rt/NoAuth> -<Limit GET POST> -allow from all -Satisfy any -SetHandler perl-script -PerlHandler HTML::Mason -</Limit> -</Directory> - -<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/rt/REST/1.0/NoAuth> -<Limit GET POST> -allow from all -Satisfy any -SetHandler perl-script -PerlHandler HTML::Mason -</Limit> -</Directory> - -<DirectoryMatch "^%%%FREESIDE_DOCUMENT_ROOT%%%/rt/.*NoAuth/images"> -SetHandler None -</DirectoryMatch> - -<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/rt/Ticket/Attachment> -SetHandler perl-script -PerlHandler HTML::Mason -</Directory> - -<Directory %%%FREESIDE_DOCUMENT_ROOT%%%/rt/Search> -SetHandler perl-script -PerlHandler HTML::Mason -</Directory> diff --git a/htetc/global.asa b/htetc/global.asa index bb30608a4..612f6f4af 100644 --- a/htetc/global.asa +++ b/htetc/global.asa @@ -10,32 +10,25 @@ use CGI 2.47; use Date::Format; use Date::Parse; use Time::Local; -use Time::Duration; use Tie::IxHash; -use URI::Escape; use HTML::Entities; -use JSON; use IO::Handle; use IO::File; -use IO::Scalar; use Net::Whois::Raw qw(whois); if ( $] < 5.006 ) { eval "use Net::Whois::Raw 0.32 qw(whois)"; die $@ if $@; } -use Text::CSV_XS; -use Spreadsheet::WriteExcel; use Business::CreditCard; use String::Approx qw(amatch); use Chart::LinesPoints; -use HTML::Widgets::SelectLayers 0.05; +use HTML::Widgets::SelectLayers 0.03; use FS; use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name); use FS::Record qw(qsearch qsearchs fields dbdef); use FS::Conf; use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot small_custview myexit http_header); -use FS::UI::Web; use FS::Msgcat qw(gettext geterror); use FS::Misc qw( send_email ); use FS::Report::Table::Monthly; @@ -48,7 +41,7 @@ use FS::cust_bill; use FS::cust_bill_pay; use FS::cust_credit; use FS::cust_credit_bill; -use FS::cust_main qw(smart_search); +use FS::cust_main; use FS::cust_main_county; use FS::cust_pay; use FS::cust_pkg; @@ -83,8 +76,6 @@ use FS::msgcat; use FS::rate; use FS::rate_region; use FS::rate_prefix; -use FS::payment_gateway; -use FS::agent_payment_gateway; sub Script_OnStart { $Response->AddHeader('Cache-control' => 'no-cache'); @@ -215,16 +206,9 @@ sub sprintAutoProfile { } sub include { - my $file = shift; - my $shift = 0; - if ( $file =~ m(^([^/].*)/[^/]+) ) { - unshift @{$Response->{asp}{includes_dir}}, "./$1"; - $shift = 1; - } - $file =~ s(^/)(%%%FREESIDE_DOCUMENT_ROOT%%%/); + ( my $file = shift ) =~ s(^/)(%%%FREESIDE_DOCUMENT_ROOT%%%/); #broken in 5.005# ${$Response->TrapInclude($file, @_)}; my $ref = $Response->TrapInclude($file, @_); - shift @{$Response->{asp}{includes_dir}} if $shift; $$ref; } diff --git a/htetc/handler.pl b/htetc/handler.pl index 2f2b0af4a..557ec02ed 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -20,8 +20,6 @@ use HTML::Mason::ApacheHandler; use strict; -###use Module::Refresh;### - # List of modules that you want to use from components (see Admin # manual for details) #{ package HTML::Mason::Commands; @@ -95,34 +93,27 @@ sub handler use Date::Format; use Date::Parse; use Time::Local; - use Time::Duration; use Tie::IxHash; - use URI::Escape; use HTML::Entities; - use JSON; use IO::Handle; use IO::File; - use IO::Scalar; use Net::Whois::Raw qw(whois); if ( $] < 5.006 ) { eval "use Net::Whois::Raw 0.32 qw(whois)"; die $@ if $@; } - use Text::CSV_XS; - use Spreadsheet::WriteExcel; use Business::CreditCard; use String::Approx qw(amatch); use Chart::LinesPoints; - use HTML::Widgets::SelectLayers 0.05; + use HTML::Widgets::SelectLayers 0.03; use FS; use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name); use FS::Record qw(qsearch qsearchs fields dbdef); use FS::Conf; use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot small_custview myexit http_header); - use FS::UI::Web; use FS::Msgcat qw(gettext geterror); - use FS::Misc qw( send_email send_fax ); + use FS::Misc qw( send_email ); use FS::Report::Table::Monthly; use FS::TicketSystem; @@ -168,9 +159,6 @@ sub handler use FS::rate; use FS::rate_region; use FS::rate_prefix; - use FS::payment_gateway; - use FS::agent_payment_gateway; - use FS::XMLRPC; if ( %%%RT_ENABLED%%% ) { eval ' @@ -187,7 +175,7 @@ sub handler use RT::GroupMembers; use RT::CustomFields; use RT::CustomFieldValues; - use RT::ObjectCustomFieldValues; + use RT::TicketCustomFieldValues; use RT::Interface::Web; use MIME::Entity; @@ -273,8 +261,6 @@ sub handler } # end package HTML::Mason::Commands; - ###Module::Refresh->refresh;### - $r->content_type('text/html'); #eorar |