don't attempt to use RT::CurrentUser before RT has been initialized. very weird...

[freeside.git] / FS / FS / TicketSystem / RT_Internal.pm

diff --git a/FS/FS/TicketSystem/RT_Internal.pm b/FS/FS/TicketSystem/RT_Internal.pm
index d6b9c52..4036d90 100644 (file)
--- a/FS/FS/TicketSystem/RT_Internal.pm
+++ b/FS/FS/TicketSystem/RT_Internal.pm
@@ -7,7 +7,6 @@ use MIME::Entity;
 use FS::UID qw(dbh);
 use FS::CGI qw(popurl);
 use FS::TicketSystem::RT_Libs;
-use RT::CurrentUser;
 
 @ISA = qw( FS::TicketSystem::RT_Libs );
 
@@ -15,10 +14,10 @@ $DEBUG = 0;
 $me = '[FS::TicketSystem::RT_Internal]';
 
 sub sql_num_customer_tickets {
-  "( select count(*) from tickets
-                     join links on ( tickets.id = links.localbase )
-     where ( status = 'new' or status = 'open' or status = 'stalled' )
-       and target = 'freeside://freeside/cust_main/' || custnum
+  "( select count(*) from Tickets
+                     join Links on ( Tickets.id = Links.LocalBase )
+     where ( Status = 'new' or Status = 'open' or Status = 'stalled' )
+       and Target = 'freeside://freeside/cust_main/' || custnum
    )";
 }
 
@@ -138,6 +137,11 @@ Cc: email address or arrayref of addresses
 
 Ticket message
 
+=item mime_type
+
+MIME type to use for message.  Defaults to text/plain.  Specifying text/html
+can be useful to use HTML markup in message.
+
 =item custnum
 
 Customer number (see L<FS::cust_main>) to associate with ticket.
@@ -169,7 +173,7 @@ sub create_ticket {
 
   my $mimeobj = MIME::Entity->build(
     'Data' => $param{'message'},
-    'Type' => 'text/plain',
+    'Type' => ( $param{'mime_type'} || 'text/plain' ),
   );
 
   my %ticket = (
@@ -218,6 +222,9 @@ sub _web_external_auth {
 
   my $user = $FS::CurrentUser::CurrentUser->username;
 
+  eval 'use RT::CurrentUser;';
+  die $@ if $@;
+
   $session ||= {};
   $session->{'CurrentUser'} = RT::CurrentUser->new();