X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Facct_sql.pm;h=a4320e491c9b9c45578bb72db2feb3fd304481ef;hb=f7ac8653683327aee6f5e825c49f09d751e0c352;hp=8e102fcc1fbca1d79ca11e7331cd48128629bfb5;hpb=9e9e7407e7e8c5a94c27609145ee65205f984ac5;p=freeside.git

diff --git a/FS/FS/part_export/acct_sql.pm b/FS/FS/part_export/acct_sql.pm
index 8e102fcc1..a4320e491 100644
--- a/FS/FS/part_export/acct_sql.pm
+++ b/FS/FS/part_export/acct_sql.pm
@@ -18,7 +18,23 @@ tie my %options, 'Tie::IxHash',
                             type  => 'textarea',
                           },
   'primary_key'        => { label => 'Database primary key' },
+  'crypt'              => { label => 'Password encryption',
+                            type=>'select', options=>[qw(crypt md5)],
+                            default=>'crypt',
+                          },
+;
+
+tie my %vpopmail_map, 'Tie::IxHash',
+  'pw_name'   => 'username',
+  'pw_domain' => 'domain',
+  'pw_passwd' => 'crypt_password',
+  'pw_uid'    => 'uid',
+  'pw_gid'    => 'gid',
+  'pw_gecos'  => 'finger',
+  'pw_dir'    => 'dir',
+  'pw_shell'  => 'shell',
 ;
+my $vpopmail_map = join('\n', map "$_ $vpopmail_map{$_}", keys %vpopmail_map );
 
 tie my %postfix_courierimap_mailbox_map, 'Tie::IxHash',
   'username' => 'email',
@@ -46,30 +62,34 @@ my $postfix_courierimap_alias_map =
 %info = (
   'svc'      => 'svc_acct',
   'desc'     => 'Real-time export of accounts to SQL databases '.
-                '(Postfix+Courier IMAP, others?)',
+                '(vpopmail, Postfix+Courier IMAP, others?)',
   'options'  => \%options,
   'nodomain' => '',
   'notes'    => <<END
-Export accounts (svc_acct records) to SQL databases.  Written for
-Postfix+Courier IMAP but intended to be generally useful for generic SQL
-exports, eventually.
+Export accounts (svc_acct records) to SQL databases.  Currently has default
+configurations for vpopmail and Postfix+Courier IMAP but intended to be
+configurable for other schemas as well.
 
-<BR><BR>In contrast to sqlmail, this is newer and less well tested, and
-currently less flexible.  It is intended to export just svc_acct records only,
-rather than a single export for svc_acct, svc_forward and svc_domain records,
-to export in "default" formats rather than configure the MTA or POP/IMAP server
-for a Freeside-specific schema, and possibly to be configured for different
-mail server setups through some subclassing rather than options.
+<BR><BR>In contrast to sqlmail, this is intended to export just svc_acct
+records only, rather than a single export for svc_acct, svc_forward and
+svc_domain records, to export in "default" database schemas rather than
+configure the MTA or POP/IMAP server for a Freeside-specific schema, and
+to be configured for different mail server setups.
 
 <BR><BR>Use these buttons for some useful presets:
 <UL>
+  <li><INPUT TYPE="button" VALUE="vpopmail" onClick='
+    this.form.table.value = "vpopmail";
+    this.form.schema.value = "$vpopmail_map";
+    this.form.primary_key.value = "pw_name, pw_domain";
+  '>
   <LI><INPUT TYPE="button" VALUE="postfix_courierimap_mailbox" onClick='
     this.form.table.value = "mailbox";
     this.form.schema.value = "$postfix_courierimap_mailbox_map";
     this.form.primary_key.value = "username";
   '>
   <LI><INPUT TYPE="button" VALUE="postfix_courierimap_alias" onClick='
-    this.form.table.value = "mailbox";
+    this.form.table.value = "alias";
     this.form.schema.value = "$postfix_courierimap_alias_map";
     this.form.primary_key.value = "address";
   '>
@@ -90,7 +110,10 @@ sub _export_insert {
   my %map = $self->_map;
 
   my %record = map { my $value = $map{$_};
-                     $_ => $svc_acct->$value();
+                     my @arg = ();
+                     push @arg, $self->option('crypt')
+                       if $_ eq 'crypt_password' && $self->option('crypt');
+                     $_ => $svc_acct->$value(@arg);
                    } keys %map;
 
   my $err_or_queue =
@@ -107,6 +130,27 @@ sub _export_insert {
 }
 
 sub _export_replace {
+  my($self, $new, $old) = (shift, shift, shift);
+
+  my %map = $self->_map;
+  my $keymap = $map{$self->option('primary_key')};
+
+  my %record = map { my $value = $map{$_};
+                     my @arg = ();
+                     push @arg, $self->option('crypt')
+                       if $_ eq 'crypt_password' && $self->option('crypt');
+                     $_ => $new->$value(@arg);
+                   } keys %map;
+
+  my $err_or_queue = $self->acct_sql_queue(
+    $new->svcnum,
+    'replace',
+    $self->option('table'),
+    $self->option('primary_key') => $old->$keymap(),
+    %record,
+  );
+  return $err_or_queue unless ref($err_or_queue);
+  '';
 }
 
 sub _export_delete {
@@ -146,7 +190,7 @@ sub acct_sql_insert { #subroutine, not method
     " ) VALUES ( ". join(", ", map '?', keys %record ). " )"
   ) or die $dbh->errstr;
 
-  $sth->execute( map $record{$_}, keys %record )
+  $sth->execute( values(%record) )
     or die "can't insert into $table table: ". $sth->errstr;
 
   $dbh->disconnect;
@@ -157,7 +201,7 @@ sub acct_sql_delete { #subroutine, not method
   my( $table, %record ) = @_;
 
   my $sth = $dbh->prepare(
-    "DELETE FROM  $table WHERE ". join(' AND ', map "$_ = ? ", keys %record )
+    "DELETE FROM $table WHERE ". join(' AND ', map "$_ = ? ", keys %record )
   ) or die $dbh->errstr;
 
   $sth->execute( map $record{$_}, keys %record )
@@ -166,6 +210,20 @@ sub acct_sql_delete { #subroutine, not method
   $dbh->disconnect;
 }
 
+sub acct_sql_replace { #subroutine, not method
+  my $dbh = acct_sql_connect(shift, shift, shift);
+  my( $table, $pkey, $old_pkey, %record ) = @_;
+
+  my $sth = $dbh->prepare(
+    "UPDATE $table SET ". join(', ', map "$_ = ?", keys %record ).
+    "WHERE $pkey = ?"
+  ) or die $dbh->errstr;
+
+  $sth->execute( values(%record), $old_pkey );
+
+  $dbh->disconnect;
+}
+
 sub acct_sql_connect {
   #my($datasrc, $username, $password) = @_;
   #DBI->connect($datasrc, $username, $password) or die $DBI::errstr;
@@ -174,4 +232,3 @@ sub acct_sql_connect {
 
 1;
 
-