eliminate some false laziness in FS::Misc::send_email vs. msg_template/email.pm send_...

[freeside.git] / FS / FS / part_export / sqlmail.pm

diff --git a/FS/FS/part_export/sqlmail.pm b/FS/FS/part_export/sqlmail.pm
index 6d61e0e..38308b6 100644 (file)
--- a/FS/FS/part_export/sqlmail.pm
+++ b/FS/FS/part_export/sqlmail.pm
@@ -6,6 +6,7 @@ use Digest::MD5 qw(md5_hex);
 use FS::Record qw(qsearchs);
 use FS::part_export;
 use FS::svc_domain;
+use FS::DBI;
 
 @ISA = qw(FS::part_export);
 
@@ -25,9 +26,9 @@ tie my %options, 'Tie::IxHash',
   'svc_acct_fields'    => { label => 'svc_acct Export Fields',
                             default => 'username _password domsvc svcnum' },
   'svc_forward_fields' => { label => 'svc_forward Export Fields',
-                            default => 'domain svcnum catchall' },
-  'svc_domain_fields'  => { label => 'svc_domain Export Fields',
                             default => 'srcsvc dstsvc dst' },
+  'svc_domain_fields'  => { label => 'svc_domain Export Fields',
+                            default => 'domain svcnum catchall' },
   'resolve_dstsvc'     => { label => q{Resolve svc_forward.dstsvc to an email address and store it in dst. (Doesn't require that you also export dstsvc.)},
                             type => 'checkbox' },
 ;
@@ -37,6 +38,7 @@ tie my %options, 'Tie::IxHash',
   'desc'     => 'Real-time export to SQL-backed mail server',
   'options'  => \%options,
   'nodomain' => '',
+  'default_svc_class' => 'Email',
   'notes'    => <<'END'
 Database schema can be made to work with Courier IMAP, Exim and Dovecot.
 Others could work but are untested.  (more detailed description from
@@ -173,7 +175,7 @@ sub sqlmail_replace {
 }
 
 sub sqlmail_connect {
-  DBI->connect(@_) or die $DBI::errstr;
+  FS::DBI->connect(@_) or die $FS::DBI::errstr;
 }
 
 sub update_values {