X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FTicketSystem%2FRT_Internal.pm;h=665c16692c5801ff06d41c0c7d74be345486e0da;hb=23db52e232596d87b97561f5f76f11668cbe33bd;hp=ffa8c7c1c5c20f2bab3836f0aaf36250b8f57be8;hpb=1c59bba12621e154765a8255534e94a041dfd200;p=freeside.git diff --git a/FS/FS/TicketSystem/RT_Internal.pm b/FS/FS/TicketSystem/RT_Internal.pm index ffa8c7c1c..665c16692 100644 --- a/FS/FS/TicketSystem/RT_Internal.pm +++ b/FS/FS/TicketSystem/RT_Internal.pm @@ -50,7 +50,7 @@ sub access_right { sub session { my( $self, $session ) = @_; - if ( $session && $session->{'Current_User'} ) { # does this even work? + if ( $session && $session->{'CurrentUser'} ) { # does this even work? warn "$me session: using existing session and CurrentUser: \n". Dumper($session->{'CurrentUser'}) if $DEBUG; @@ -92,6 +92,7 @@ sub init { # this needs to be done on each fork warn "$me init: initializing RT\n" if $DEBUG; { + local $SIG{__WARN__}; local $SIG{__DIE__}; eval 'RT::Init("NoSignalHandlers"=>1);'; } @@ -151,7 +152,7 @@ sub _tickets_search { sub href_customer_tickets { my ($self, $custnum) = (shift, shift); if ($custnum =~ /^(\d+)$/) { - return $self->href_search_tickets("Customer.number = $custnum"); + return $self->href_search_tickets("Customer.number = $custnum", @_); } warn "bad custnum $custnum"; ''; } @@ -159,7 +160,7 @@ sub href_customer_tickets { sub href_service_tickets { my ($self, $svcnum) = (shift, shift); if ($svcnum =~ /^(\d+)$/ ) { - return $self->href_search_tickets("Service.number = $svcnum"); + return $self->href_search_tickets("Service.number = $svcnum", @_); } warn "bad svcnum $svcnum"; ''; } @@ -588,7 +589,7 @@ sub _web_external_auth { # we failed to successfully create the user. abort abort abort. delete $session->{'CurrentUser'}; - die "can't auto-create RT user"; #an error message would be nice :/ + die "can't auto-create RT user: $msg"; #an error message would be nice :/ #$m->abort() unless $RT::WebFallbackToInternalAuth; #$m->comp( '/Elements/Login', %ARGS, # Error => loc( 'Cannot create user: [_1]', $msg ) );