projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
first part of ACL and re-skinning work and some other small stuff
[freeside.git]
/
htetc
/
handler.pl
diff --git
a/htetc/handler.pl
b/htetc/handler.pl
index
1bbea16
..
cbe2dd3
100644
(file)
--- a/
htetc/handler.pl
+++ b/
htetc/handler.pl
@@
-113,7
+113,10
@@
sub handler
use Business::CreditCard;
use String::Approx qw(amatch);
use Chart::LinesPoints;
use Business::CreditCard;
use String::Approx qw(amatch);
use Chart::LinesPoints;
+ use Chart::Mountain;
+ use Color::Scheme;
use HTML::Widgets::SelectLayers 0.05;
use HTML::Widgets::SelectLayers 0.05;
+ use Locale::Country;
use FS;
use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
use FS::Record qw(qsearch qsearchs fields dbdef);
use FS;
use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
use FS::Record qw(qsearch qsearchs fields dbdef);
@@
-122,7
+125,7
@@
sub handler
eidiot small_custview myexit http_header);
use FS::UI::Web;
use FS::Msgcat qw(gettext geterror);
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 send_fax
states_hash state_label
);
use FS::Report::Table::Monthly;
use FS::TicketSystem;
use FS::Report::Table::Monthly;
use FS::TicketSystem;
@@
-173,6
+176,11
@@
sub handler
use FS::XMLRPC;
use FS::payby;
use FS::cdr;
use FS::XMLRPC;
use FS::payby;
use FS::cdr;
+ use FS::inventory_class;
+ use FS::inventory_item;
+ use FS::pkg_class;
+ use FS::access_user;
+ use FS::access_group;
if ( %%%RT_ENABLED%%% ) {
eval '
if ( %%%RT_ENABLED%%% ) {
eval '
@@
-206,6
+214,7
@@
sub handler
my( $self, $location ) = @_;
use vars qw($m);
my( $self, $location ) = @_;
use vars qw($m);
+ # false laziness w/below
if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect
my $page =
if ( defined(@DBIx::Profile::ISA) ) { #profiling redirect
my $page =
@@
-263,7
+272,10
@@
sub handler
);
dbh->{'private_profile'} = {};
);
dbh->{'private_profile'} = {};
- $m->abort(200);
+ #whew. removing this is all that's needed to fix the annoying
+ #blank-page-instead-of-profiling-redirect-when-called-from-an-include
+ #bug triggered by mason 1.32
+ #my $rv = $m->abort(200);
} else { #normal redirect
} else { #normal redirect