update quickpay for current search capabilities

[freeside.git] / FS / FS / svc_acct.pm

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 89fb76c..bb9fe67 100644 (file)
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -11,7 +11,7 @@ use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
              $dirhash
              $icradius_dbh
              @saltset @pw_set
-             $rsync $ssh);
+             $rsync $ssh $exportdir $vpopdir);
 use Carp;
 use File::Path;
 use Fcntl qw(:flock);
@@ -273,6 +273,16 @@ sub insert {
                                'domsvc'   => $self->domsvc,
                              } );
 
+  if ( $self->svcnum ) {
+    my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$self->svcnum});
+    unless ( $cust_svc ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "no cust_svc record found for svcnum ". $self->svcnum;
+    }
+    $self->pkgnum($cust_svc->pkgnum);
+    $self->svcpart($cust_svc->svcpart);
+  }
+
   my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
   return "Unknown svcpart" unless $part_svc;
   return "uid in use"
@@ -495,7 +505,7 @@ sub vpopmail_insert {
   my( $username, $password, $domain, $vpopdir ) = @_;
   
   (open(VPASSWD, ">>$exportdir/domains/$domain/vpasswd")
-    and flock(VPASSWD,LOCK_EX|LOCK_NB)
+    and flock(VPASSWD,LOCK_EX)
   ) or die "can't open vpasswd file for $username\@$domain: $exportdir/domains/$domain/vpasswd";
   print VPASSWD join(":",
     $username,
@@ -517,7 +527,8 @@ sub vpopmail_insert {
   mkdir "$exportdir/domains/$domain/$username/Maildir/tmp", 0700 or die "can't create Maildir";
  
   my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_sync' };
-  $error = $queue->insert;
+  my $error = $queue->insert;
+  die $error if $error;
 
   1;
 }
@@ -528,7 +539,7 @@ sub vpopmail_sync {
   my ($machine, $dir, $uid, $gid) = split (/\s+/, $vpopmailmachines[0]);
   
   chdir $exportdir;
-  my @args = ("$rsync", "-rlpt", "-e", "$ssh", "domains/", "vpopmail\@$machine:$pdir/domains/")
+  my @args = ("$rsync", "-rlpt", "-e", "$ssh", "domains/", "vpopmail\@$machine:$vpopdir/domains/");
   system {$args[0]} @args;
 
 }
@@ -759,7 +770,7 @@ sub vpopmail_delete {
   my( $username, $domain ) = @_;
   
   (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
-    and flock(VPASSWD,LOCK_EX|LOCK_NB)
+    and flock(VPASSWD,LOCK_EX)
   ) or die "can't open $exportdir/domains/$domain/vpasswd: $!";
 
   open(VPASSWDTMP, ">$exportdir/domains/$domain/vpasswd.tmp")
@@ -1007,7 +1018,7 @@ sub vpopmail_replace_password {
   my( $username, $password, $domain ) = @_;
   
   (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
-    and flock(VPASSWD,LOCK_EX|LOCK_NB)
+    and flock(VPASSWD,LOCK_EX)
   ) or die "can't open $exportdir/domains/$domain/vpasswd: $!";
 
   open(VPASSWDTMP, ">$exportdir/domains/$domain/vpasswd.tmp")
@@ -1029,7 +1040,8 @@ sub vpopmail_replace_password {
   close(VPASSWD);
 
   my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_sync' };
-  $error = $queue->insert;
+  my $error = $queue->insert;
+  die $error if $error;
 
   1;
 }