X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_acct.pm;h=100af6cb644fd6a099cfb8b6528cac1cfee43508;hb=b563ce9b834e4b8c3b2f0508f6c528d8b881e08d;hp=991cedd21da025697bc2cf0a5a8875709a296bc1;hpb=72a65ceaa28155e8c1c3c1328dd76587b35e089a;p=freeside.git

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 991cedd21..100af6cb6 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -674,10 +674,36 @@ sub unsuspend {
 
 =item cancel
 
-Just returns false (no error) for now.
-
 Called by the cancel method of FS::cust_pkg (see L<FS::cust_pkg>).
 
+If the B<auto_unset_catchall> configuration option is set, this method will
+automatically remove any references to the canceled service in the catchall
+field of svc_domain.  This allows packages that contain both a svc_domain and
+its catchall svc_acct to be canceled in one step.
+
+=cut
+
+sub cancel {
+  # Only one thing to do at this level
+  my $self = shift;
+  foreach my $svc_domain (
+      qsearch( 'svc_domain', { catchall => $self->svcnum } ) ) {
+    if($conf->exists('auto_unset_catchall')) {
+      my %hash = $svc_domain->hash;
+      $hash{catchall} = '';
+      my $new = new FS::svc_domain ( \%hash );
+      my $error = $new->replace($svc_domain);
+      return $error if $error;
+    } else {
+      return "cannot unprovision svc_acct #".$self->svcnum.
+	  " while assigned as catchall for svc_domain #".$svc_domain->svcnum;
+    }
+  }
+
+  $self->SUPER::cancel;
+}
+
+
 =item check
 
 Checks all fields to make sure this is a valid service.  If there is an error,
@@ -1128,14 +1154,21 @@ Currently supported encryptions are: classic DES crypt() and MD5
 
 sub check_password {
   my($self, $check_password) = @_;
+
+  #remove old-style SUSPENDED kludge, they should be allowed to login to
+  #self-service and pay up
+  ( my $password = $self->_password ) =~ s/^\*SUSPENDED\* //;
+
   #eventually should check a "password-encoding" field
-  if ( length($self->_password) < 13 ) { #plaintext
-    $check_password eq $self->_password;
-  } elsif ( length($self->_password) == 13 ) { #traditional DES crypt
-    crypt($check_password, $self->_password) eq $self->_password;
-  } elsif ( $self->_password =~ /^\$1\$/ ) { #MD5 crypt
-    unix_md5_crypt($check_password, $self->_password) eq $self->_password;
-  } elsif ( $self->_password =~ /^\$2a?\$/ ) { #Blowfish
+  if ( $password =~ /^(\*|!!?)$/ ) { #no self-service login
+    return 0;
+  } elsif ( length($password) < 13 ) { #plaintext
+    $check_password eq $password;
+  } elsif ( length($password) == 13 ) { #traditional DES crypt
+    crypt($check_password, $password) eq $password;
+  } elsif ( $password =~ /^\$1\$/ ) { #MD5 crypt
+    unix_md5_crypt($check_password, $password) eq $password;
+  } elsif ( $password =~ /^\$2a?\$/ ) { #Blowfish
     warn "Can't check password: Blowfish encryption not yet supported, svcnum".
          $self->svcnum. "\n";
     0;