projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b3b2c98
)
backport duplicate checking fixes to 1.4
author
ivan
<ivan>
Mon, 14 Feb 2005 04:08:46 +0000
(
04:08
+0000)
committer
ivan
<ivan>
Mon, 14 Feb 2005 04:08:46 +0000
(
04:08
+0000)
FS/FS/svc_acct.pm
patch
|
blob
|
history
diff --git
a/FS/FS/svc_acct.pm
b/FS/FS/svc_acct.pm
index
626c13f
..
91b5162
100644
(file)
--- a/
FS/FS/svc_acct.pm
+++ b/
FS/FS/svc_acct.pm
@@
-845,20
+845,19
@@
sub _check_duplicate {
or die dbh->errstr;
warn "$me acquired svc_acct table lock for duplicate search" if $DEBUG;
or die dbh->errstr;
warn "$me acquired svc_acct table lock for duplicate search" if $DEBUG;
- my $svcpart = $self->svcpart;
- my $part_svc = qsearchs('part_svc', { 'svcpart' => $svcpart } );
+ my $part_svc = qsearchs('part_svc', { 'svcpart' => $self->svcpart } );
unless ( $part_svc ) {
return 'unknown svcpart '. $self->svcpart;
}
my $global_unique = $conf->config('global_unique-username');
unless ( $part_svc ) {
return 'unknown svcpart '. $self->svcpart;
}
my $global_unique = $conf->config('global_unique-username');
- my @dup_user = grep {
$svcpart != $_->svcpart
}
+ my @dup_user = grep {
!$self->svcnum || $_->svcnum != $self->svcnum
}
qsearch( 'svc_acct', { 'username' => $self->username } );
return gettext('username_in_use')
if $global_unique eq 'username' && @dup_user;
qsearch( 'svc_acct', { 'username' => $self->username } );
return gettext('username_in_use')
if $global_unique eq 'username' && @dup_user;
- my @dup_userdomain = grep {
$svcpart != $_->svcpart
}
+ my @dup_userdomain = grep {
!$self->svcnum || $_->svcnum != $self->svcnum
}
qsearch( 'svc_acct', { 'username' => $self->username,
'domsvc' => $self->domsvc } );
return gettext('username_in_use')
qsearch( 'svc_acct', { 'username' => $self->username,
'domsvc' => $self->domsvc } );
return gettext('username_in_use')
@@
-867,7
+866,7
@@
sub _check_duplicate {
my @dup_uid;
if ( $part_svc->part_svc_column('uid')->columnflag ne 'F'
&& $self->username !~ /^(toor|(hyla)?fax)$/ ) {
my @dup_uid;
if ( $part_svc->part_svc_column('uid')->columnflag ne 'F'
&& $self->username !~ /^(toor|(hyla)?fax)$/ ) {
- @dup_uid = grep {
$svcpart != $_->svcpart
}
+ @dup_uid = grep {
!$self->svcnum || $_->svcnum != $self->svcnum
}
qsearch( 'svc_acct', { 'uid' => $self->uid } );
} else {
@dup_uid = ();
qsearch( 'svc_acct', { 'uid' => $self->uid } );
} else {
@dup_uid = ();
@@
-928,8
+927,8
@@
sub _check_duplicate {
my $dup_svcpart = $dup_uid->cust_svc->svcpart;
if ( exists($conflict_user_svcpart{$dup_svcpart})
|| exists($conflict_userdomain_svcpart{$dup_svcpart}) ) {
my $dup_svcpart = $dup_uid->cust_svc->svcpart;
if ( exists($conflict_user_svcpart{$dup_svcpart})
|| exists($conflict_userdomain_svcpart{$dup_svcpart}) ) {
- return "duplicate uid: conflicts with svcnum". $dup_uid->svcnum.
- "via exportnum ". $conflict_user_svcpart{$dup_svcpart}
+ return "duplicate uid: conflicts with svcnum
". $dup_uid->svcnum.
+ "
via exportnum ". $conflict_user_svcpart{$dup_svcpart}
|| $conflict_userdomain_svcpart{$dup_svcpart};
}
}
|| $conflict_userdomain_svcpart{$dup_svcpart};
}
}