X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Faccess_user.pm;h=075733a6861a0cfecfef4732607f096eb8d83bb2;hp=72e9140688716a79c5286cdc38277f93f71366e1;hb=aed8ec35ccb9cdeb7ea0cb6ff2946f9d83d582f6;hpb=efa7c9c0233f2c3d1e39d62f17cac30b36f593c4 diff --git a/FS/FS/access_user.pm b/FS/FS/access_user.pm index 72e914068..075733a68 100644 --- a/FS/FS/access_user.pm +++ b/FS/FS/access_user.pm @@ -132,9 +132,8 @@ sub insert { sub htpasswd_kludge { my $self = shift; - - #awful kludge to skip setting htpasswd for fs_* users - return '' if $self->username =~ /^fs_/; + + return '' if $self->is_system_user; unshift @_, '-c' unless -e $htpasswd_file; if ( @@ -512,6 +511,25 @@ sub default_customer_view { } +=item is_system_user + +Returns true if this user has the name of a known system account. These +users will not appear in the htpasswd file and can't have passwords set. + +=cut + +sub is_system_user { + my $self = shift; + return grep { $_ eq $self->username } ( qw( + fs_queue + fs_daily + fs_selfservice + fs_signup + fs_bootstrap + fs_selfserv +) ); +} + =back =head1 BUGS