X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Facct_sql.pm;h=9f1ae7b5c9e34840dde9ec2d1d4a0ed5acc121ef;hb=f274814c7cde3681578ca594a2b00475370e4c92;hp=4737638d4461ac10fddb89989840e503c4ff3bc0;hpb=a0d361c10ed990a41dbd8f31787c5f19ebed246c;p=freeside.git

diff --git a/FS/FS/part_export/acct_sql.pm b/FS/FS/part_export/acct_sql.pm
index 4737638d4..9f1ae7b5c 100644
--- a/FS/FS/part_export/acct_sql.pm
+++ b/FS/FS/part_export/acct_sql.pm
@@ -1,6 +1,6 @@
 package FS::part_export::acct_sql;
 
-use vars qw(@ISA %info @saltset);
+use vars qw(@ISA %info);
 use Tie::IxHash;
 #use Digest::MD5 qw(md5_hex);
 use FS::Record; #qw(qsearchs);
@@ -17,6 +17,10 @@ tie my %options, 'Tie::IxHash',
                               'Database schema mapping to Freeside methods.',
                             type  => 'textarea',
                           },
+  'static'             => { label =>
+                              'Database schema mapping to static values.',
+                            type  => 'textarea',
+                          },
   'primary_key'        => { label => 'Database primary key' },
   'crypt'              => { label => 'Password encryption',
                             type=>'select', options=>[qw(crypt md5)],
@@ -32,7 +36,8 @@ tie my %vpopmail_map, 'Tie::IxHash',
   'pw_gid'    => 'gid',
   'pw_gecos'  => 'finger',
   'pw_dir'    => 'dir',
-  'pw_shell'  => 'shell',
+  #'pw_shell'  => 'shell',
+  'pw_shell'  => 'quota',
 ;
 my $vpopmail_map = join('\n', map "$_ $vpopmail_map{$_}", keys %vpopmail_map );
 
@@ -59,6 +64,17 @@ my $postfix_courierimap_alias_map =
   join('\n', map "$_ $postfix_courierimap_alias_map{$_}",
                  keys %postfix_courierimap_alias_map      );
 
+tie my %postfix_native_mailbox_map, 'Tie::IxHash',
+  'userid'   => 'email',
+  'uid'      => 'uid',
+  'gid'      => 'gid',
+  'password' => 'ldap_password',
+  'mail'     => 'domain_slash_username',
+;
+my $postfix_native_mailbox_map =
+  join('\n', map "$_ $postfix_native_mailbox_map{$_}",
+                 keys %postfix_native_mailbox_map      );
+
 %info = (
   'svc'      => 'svc_acct',
   'desc'     => 'Real-time export of accounts to SQL databases '.
@@ -93,13 +109,21 @@ to be configured for different mail server setups.
     this.form.schema.value = "$postfix_courierimap_alias_map";
     this.form.primary_key.value = "address";
   '>
+  <LI><INPUT TYPE="button" VALUE="postfix_native_mailbox" onClick='
+    this.form.table.value = "users";
+    this.form.schema.value = "$postfix_native_mailbox_map";
+    this.form.primary_key.value = "userid";
+  '>
 </UL>
 END
 );
 
+sub _schema_map { shift->_map('schema'); }
+sub _static_map { shift->_map('static'); }
+
 sub _map {
   my $self = shift;
-  map { /^\s*(\S+)\s*(\S+)\s*$/ } split("\n", $self->option('schema') );
+  map { /^\s*(\S+)\s*(\S+)\s*$/ } split("\n", $self->option(shift) );
 }
 
 sub rebless { shift; }
@@ -107,14 +131,22 @@ sub rebless { shift; }
 sub _export_insert {
   my($self, $svc_acct) = (shift, shift);
 
-  my %map = $self->_map;
+  my %schema = $self->_schema_map;
+  my %static = $self->_static_map;
+
+  my %record = (
+
+    ( map { $_ => $static{$_} } keys %static ),
+  
+    ( map { my $value = $schema{$_};
+            my @arg = ();
+            push @arg, $self->option('crypt')
+              if $value eq 'crypt_password' && $self->option('crypt');
+            $_ => $svc_acct->$value(@arg);
+          } keys %schema
+    ),
 
-  my %record = map { my $value = $map{$_};
-                     my @arg = ();
-                     push @arg, $self->option('crypt')
-                       if $value eq 'crypt_password' && $self->option('crypt');
-                     $_ => $svc_acct->$value(@arg);
-                   } keys %map;
+  );
 
   my $err_or_queue =
     $self->acct_sql_queue(
@@ -132,21 +164,39 @@ 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 %schema = $self->_schema_map;
+  my %static = $self->_static_map;
+
+  my @primary_key = ();
+  if ( $self->option('primary_key') =~ /,/ ) {
+    foreach my $key ( split(/\s*,\s*/, $self->option('primary_key') ) ) {
+      my $keymap = $schema{$key};
+      push @primary_key, $old->$keymap();
+    }
+  } else {
+    my $keymap = $schema{$self->option('primary_key')};
+    push @primary_key, $old->$keymap();
+  }
+
+  my %record = (
+
+    ( map { $_ => $static{$_} } keys %static ),
+  
+    ( map { my $value = $schema{$_};
+            my @arg = ();
+            push @arg, $self->option('crypt')
+              if $value eq 'crypt_password' && $self->option('crypt');
+            $_ => $new->$value(@arg);
+          } keys %schema
+    ),
 
-  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(),
+    $self->option('primary_key'), @primary_key, 
     %record,
   );
   return $err_or_queue unless ref($err_or_queue);
@@ -155,13 +205,26 @@ sub _export_replace {
 
 sub _export_delete {
   my ( $self, $svc_acct ) = (shift, shift);
-  my %map = $self->_map;
-  my $keymap = $map{$self->option('primary_key')};
+
+  my %schema = $self->_schema_map;
+
+  my %primary_key = ();
+  if ( $self->option('primary_key') =~ /,/ ) {
+    foreach my $key ( split(/\s*,\s*/, $self->option('primary_key') ) ) {
+      my $keymap = $schema{$key};
+      $primary_key{ $key } = $svc_acct->$keymap();
+    }
+  } else {
+    my $keymap = $schema{$self->option('primary_key')};
+    $primary_key{ $self->option('primary_key') } = $svc_acct->$keymap(),
+  }
+
   my $err_or_queue = $self->acct_sql_queue(
     $svc_acct->svcnum,
     'delete',
     $self->option('table'),
-    $self->option('primary_key') => $svc_acct->$keymap(),
+    %primary_key,
+    #$self->option('primary_key') => $svc_acct->$keymap(),
   );
   return $err_or_queue unless ref($err_or_queue);
   '';
@@ -212,14 +275,27 @@ sub acct_sql_delete { #subroutine, not method
 
 sub acct_sql_replace { #subroutine, not method
   my $dbh = acct_sql_connect(shift, shift, shift);
-  my( $table, $pkey, $old_pkey, %record ) = @_;
+
+  my( $table, $pkey ) = ( shift, shift );
+
+  my %primary_key = ();
+  if ( $pkey =~ /,/ ) {
+    foreach my $key ( split(/\s*,\s*/, $pkey ) ) {
+      $primary_key{$key} = shift;
+    }
+  } else {
+    $primary_key{$pkey} = shift;
+  }
+
+  my %record = @_;
 
   my $sth = $dbh->prepare(
-    "UPDATE $table SET ". join(', ', map "$_ = ?", keys %record ).
-    "WHERE $pkey = ?"
+    "UPDATE $table".
+    ' SET '.   join(', ',    map "$_ = ?", keys %record      ).
+    ' WHERE '. join(' AND ', map "$_ = ?", keys %primary_key )
   ) or die $dbh->errstr;
 
-  $sth->execute( values(%record), $old_pkey );
+  $sth->execute( values(%record), values(%primary_key) );
 
   $dbh->disconnect;
 }