projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1979e65
)
better error reporting for illegal usernames
author
ivan
<ivan>
Wed, 11 Jan 2012 04:32:53 +0000
(
04:32
+0000)
committer
ivan
<ivan>
Wed, 11 Jan 2012 04:32:53 +0000
(
04:32
+0000)
FS/FS/svc_acct.pm
patch
|
blob
|
history
diff --git
a/FS/FS/svc_acct.pm
b/FS/FS/svc_acct.pm
index
3bb7af4
..
3187060
100644
(file)
--- a/
FS/FS/svc_acct.pm
+++ b/
FS/FS/svc_acct.pm
@@
-1182,40
+1182,42
@@
sub check {
or return gettext('illegal_username'). " ($usernamemin-$ulen): ". $recref->{username};
$recref->{username} = $1;
or return gettext('illegal_username'). " ($usernamemin-$ulen): ". $recref->{username};
$recref->{username} = $1;
+ my $uerror = gettext('illegal_username'). ': '. $recref->{username};
+
unless ( $username_uppercase ) {
unless ( $username_uppercase ) {
- $recref->{username} =~ /[A-Z]/ and return
gettext('illegal_username')
;
+ $recref->{username} =~ /[A-Z]/ and return
$uerror
;
}
if ( $username_letterfirst ) {
}
if ( $username_letterfirst ) {
- $recref->{username} =~ /^[a-z]/ or return
gettext('illegal_username')
;
+ $recref->{username} =~ /^[a-z]/ or return
$uerror
;
} elsif ( $username_letter ) {
} elsif ( $username_letter ) {
- $recref->{username} =~ /[a-z]/ or return
gettext('illegal_username')
;
+ $recref->{username} =~ /[a-z]/ or return
$uerror
;
}
if ( $username_noperiod ) {
}
if ( $username_noperiod ) {
- $recref->{username} =~ /\./ and return
gettext('illegal_username')
;
+ $recref->{username} =~ /\./ and return
$uerror
;
}
if ( $username_nounderscore ) {
}
if ( $username_nounderscore ) {
- $recref->{username} =~ /_/ and return
gettext('illegal_username')
;
+ $recref->{username} =~ /_/ and return
$uerror
;
}
if ( $username_nodash ) {
}
if ( $username_nodash ) {
- $recref->{username} =~ /\-/ and return
gettext('illegal_username')
;
+ $recref->{username} =~ /\-/ and return
$uerror
;
}
unless ( $username_ampersand ) {
}
unless ( $username_ampersand ) {
- $recref->{username} =~ /\&/ and return
gettext('illegal_username')
;
+ $recref->{username} =~ /\&/ and return
$uerror
;
}
unless ( $username_percent ) {
}
unless ( $username_percent ) {
- $recref->{username} =~ /\%/ and return
gettext('illegal_username')
;
+ $recref->{username} =~ /\%/ and return
$uerror
;
}
unless ( $username_colon ) {
}
unless ( $username_colon ) {
- $recref->{username} =~ /\:/ and return
gettext('illegal_username')
;
+ $recref->{username} =~ /\:/ and return
$uerror
;
}
unless ( $username_slash ) {
}
unless ( $username_slash ) {
- $recref->{username} =~ /\// and return
gettext('illegal_username')
;
+ $recref->{username} =~ /\// and return
$uerror
;
}
unless ( $username_equals ) {
}
unless ( $username_equals ) {
- $recref->{username} =~ /\=/ and return
gettext('illegal_username')
;
+ $recref->{username} =~ /\=/ and return
$uerror
;
}
unless ( $username_pound ) {
}
unless ( $username_pound ) {
- $recref->{username} =~ /\#/ and return
gettext('illegal_username')
;
+ $recref->{username} =~ /\#/ and return
$uerror
;
}
}