sub set_password {
my( $self, $pass ) = ( shift, shift );
+ warn "[$me] set_password (to $pass) called on $self: ". Dumper($self)
+ if $DEBUG;
+
my $failure = gettext('illegal_password'). " $passwordmin-$passwordmax ".
FS::Msgcat::_gettext('illegal_password_characters').
": ". $pass;
- my ($encoding, $encryption);
+ my( $encoding, $encryption ) = ('', '');
if ( $self->_password_encoding ) {
$encoding = $self->_password_encoding;
$self->_password_encoding($encoding);
}
- if( $encoding eq 'legacy' ) {
+ if ( $encoding eq 'legacy' ) {
# The legacy behavior from check():
# If the password is blank, randomize it and set encoding to 'plain'.
$pass = $1.$3;
$self->_password_encoding('crypt');
# Various disabled crypt passwords
- } elsif ( $pass eq '*' or
- $pass eq '!' or
- $pass eq '!!' ) {
+ } elsif ( $pass eq '*' || $pass eq '!' || $pass eq '!!' ) {
$self->_password_encoding('crypt');
} else {
return $failure;
}
- }
+ }
$self->_password($pass);
return;
$cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
my $svcnum = $1;
-my $error;
my $old;
if ( $svcnum ) {
} (fields('svc_acct'), qw ( pkgnum svcpart usergroup ));
my $new = new FS::svc_acct ( \%hash );
+my $error = '';
+
$new->_password($old->_password) if $old;
-if( $cgi->param('clear_password') eq '*HIDDEN*'
- or $cgi->param('clear_password') =~ /^\(.* encrypted\)$/ ) {
+if ( $cgi->param('clear_password') eq '*HIDDEN*'
+ || $cgi->param('clear_password') =~ /^\(.* encrypted\)$/ ) {
die "fatal: no previous account to recall hidden password from!" unless $old;
-}
-else {
+} else {
$error = $new->set_password($cgi->param('clear_password'));
}
if ( $svcnum ) {
- foreach (grep { $old->$_ != $new->$_ } qw( seconds upbytes downbytes totalbytes )) {
+ foreach ( grep { $old->$_ != $new->$_ }
+ qw( seconds upbytes downbytes totalbytes )
+ )
+ {
my %hash = map { $_ => $new->$_ }
grep { $new->$_ }
qw( seconds upbytes downbytes totalbytes );
- $error = $new->set_usage(\%hash); #unoverlimit and trigger radius changes
- last; #once is enough
+ $error ||= $new->set_usage(\%hash); #unoverlimit and trigger radius changes
+ last; #once is enough
}
$error ||= $new->replace($old);
} else {
- $error = $new->insert;
+ $error ||= $new->insert;
$svcnum = $new->svcnum;
}