X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_acct.pm;h=c5da82da521d13b86685811f91734a6b6469d12a;hb=90c18c7cbe323bf4072335745d250cd0fbdd5f5e;hp=efe66505e5f4cca184aef73830937ef1d195fa98;hpb=d32d0810e0beba37f3c5b13d4b99d883da5080c0;p=freeside.git

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index efe66505e..c5da82da5 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1184,13 +1184,14 @@ sub check {
 
   # First, if _password is blank, generate one and set default encoding.
   if ( ! $recref->{_password} ) {
-    $self->set_password('');
+    $error = $self->set_password('');
   }
   # But if there's a _password but no encoding, assume it's plaintext and 
   # set it to default encoding.
   elsif ( ! $recref->{_password_encoding} ) {
-    $self->set_password($recref->{_password});
+    $error = $self->set_password($recref->{_password});
   }
+  return $error if $error;
 
   # Next, check _password to ensure compliance with the encoding.
   if ( $recref->{_password_encoding} eq 'ldap' ) {
@@ -1232,11 +1233,8 @@ sub check {
       $recref->{_password} =~ /\!/ and return gettext('illegal_password');
     }
   }
-  elsif ( $recref->{_password_encoding} eq 'legacy' ) {
-    # this happens when set_password fails
-    return gettext('illegal_password'). " $passwordmin-$passwordmax ".
-           FS::Msgcat::_gettext('illegal_password_characters').
-           ": ". $recref->{_password};
+  else {
+    return "invalid password encoding ('".$recref->{_password_encoding}."'";
   }
   $self->SUPER::check;
 
@@ -1300,7 +1298,14 @@ sub set_password {
   my $self = shift;
   my $pass = shift;
   my ($encoding, $encryption);
+  my $failure = gettext('illegal_password'). " $passwordmin-$passwordmax ".
+                FS::Msgcat::_gettext('illegal_password_characters').
+                ": ". $pass;
 
+  if(($passwordmin and length($pass) < $passwordmin) or 
+     ($passwordmax and length($pass) > $passwordmax)) {
+    return $failure;
+  }
 
   if($self->_password_encoding) {
     $encoding = $self->_password_encoding;
@@ -1344,7 +1349,7 @@ sub set_password {
         $self->_password_encoding('crypt');
       }
       else {
-        # do nothing; check() will recognize this as an error
+        return $failure;
       }
    }
   }
@@ -1947,26 +1952,13 @@ sub _op_usage {
         ( $action eq 'suspend'   && !$self->overlimit 
        || $action eq 'unsuspend' &&  $self->overlimit ) 
      ) {
-    foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
-      if ($part_export->option('overlimit_groups')) {
-        my ($new,$old);
-        my $other = new FS::svc_acct $self->hashref;
-        my $groups = &{ $self->_fieldhandlers->{'usergroup'} }
-                       ($self, $part_export->option('overlimit_groups'));
-        $other->usergroup( $groups );
-        if ($action eq 'suspend'){
-          $new = $other; $old = $self;
-        }else{
-          $new = $self; $old = $other;
-        }
-        my $error = $part_export->export_replace($new, $old);
-        $error ||= $self->overlimit($action);
-        if ( $error ) {
-          $dbh->rollback if $oldAutoCommit;
-          return "Error replacing radius groups in export, ${op}: $error";
-        }
-      }
+
+    my $error = $self->_op_overlimit($action);
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return $error;
     }
+
   }
 
   if ( $conf->exists("svc_acct-usage_$action")
@@ -2011,6 +2003,61 @@ sub _op_usage {
 
 }
 
+sub _op_overlimit {
+  my( $self, $action ) = @_;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $cust_pkg = $self->cust_svc->cust_pkg;
+
+  my $conf_overlimit =
+    $cust_pkg
+      ? $conf->config('overlimit_groups', $cust_pkg->cust_main->agentnum )
+      : $conf->config('overlimit_groups');
+
+  foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
+
+    my $groups = $conf_overlimit || $part_export->option('overlimit_groups');
+    next unless $groups;
+
+    my $gref = &{ $self->_fieldhandlers->{'usergroup'} }( $self, $groups );
+
+    my $other = new FS::svc_acct $self->hashref;
+    $other->usergroup( $gref );
+
+    my($new,$old);
+    if ($action eq 'suspend') {
+      $new = $other;
+      $old = $self;
+    } else { # $action eq 'unsuspend'
+      $new = $self;
+      $old = $other;
+    }
+
+    my $error = $part_export->export_replace($new, $old)
+                || $self->overlimit($action);
+
+    if ( $error ) {
+      $dbh->rollback if $oldAutoCommit;
+      return "Error replacing radius groups: $error";
+    }
+
+  }
+
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+
+}
+
 sub set_usage {
   my( $self, $valueref, %options ) = @_;
 
@@ -2075,36 +2122,28 @@ sub set_usage {
   #$self->snapshot; #not necessary, we retain the old values
   #create an object with the updated usage values
   my $new = qsearchs('svc_acct', { 'svcnum' => $self->svcnum });
-  #call exports
-  my $error = $new->replace($self);
+  local($FS::Record::nowarn_identical) = 1;
+  my $error = $new->replace($self); #call exports
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
     return "Error replacing: $error";
   }
 
   if ( $reset ) {
-    my $error;
-
-    if ($self->overlimit) {
-      $error = $self->overlimit('unsuspend');
-      foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
-        if ($part_export->option('overlimit_groups')) {
-          my $old = new FS::svc_acct $self->hashref;
-          my $groups = &{ $self->_fieldhandlers->{'usergroup'} }
-                         ($self, $part_export->option('overlimit_groups'));
-          $old->usergroup( $groups );
-          $error ||= $part_export->export_replace($self, $old);
-        }
-      }
-    }
 
-    if ( $conf->exists("svc_acct-usage_unsuspend")) {
-      $error ||= $self->cust_svc->cust_pkg->unsuspend;
-    }
+    my $error = '';
+
+    $error = $self->_op_overlimit('unsuspend')
+      if $self->overlimit;;
+
+    $error ||= $self->cust_svc->cust_pkg->unsuspend
+      if $conf->exists("svc_acct-usage_unsuspend");
+
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
       return "Error unsuspending: $error";
     }
+
   }
 
   warn "$me update successful; committing\n"