add ability to search on a date range of invoice events and then reprint or reemail...

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

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index c9af56a..a045193 100644 (file)
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1322,12 +1322,12 @@ sub crypt_password {
   #eventually should check a "password-encoding" field
   if ( length($self->_password) == 13
        || $self->_password =~ /^\$(1|2a?)\$/
-       || $self->_password =~ /^(\*|NP|\*LK\*)$/
+       || $self->_password =~ /^(\*|NP|\*LK\*|!!?)$/
      )
   {
     $self->_password;
   } else {
-    my $encryption = scalar(@_) ? shift : 'crypt';
+    my $encryption = ( scalar(@_) && $_[0] ) ? shift : 'crypt';
     if ( $encryption eq 'crypt' ) {
       crypt(
         $self->_password,