projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#17599: display cancelled services from history [welcome_email sensitive to noexpor...
[freeside.git]
/
FS
/
FS
/
svc_acct.pm
diff --git
a/FS/FS/svc_acct.pm
b/FS/FS/svc_acct.pm
index
8b852f1
..
a86db9c
100644
(file)
--- a/
FS/FS/svc_acct.pm
+++ b/
FS/FS/svc_acct.pm
@@
-114,12
+114,11
@@
FS::UID->install_callback( sub {
$smtpmachine = $conf->config('smtpmachine');
$radius_password = $conf->config('radius-password') || 'Password';
$radius_ip = $conf->config('radius-ip') || 'Framed-IP-Address';
$smtpmachine = $conf->config('smtpmachine');
$radius_password = $conf->config('radius-password') || 'Password';
$radius_ip = $conf->config('radius-ip') || 'Framed-IP-Address';
- @pw_set =
( 'A'..'Z' ) if $conf->exists('password-generated-allcaps')
;
+ @pw_set =
FS::svc_acct->pw_set
;
}
);
@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
}
);
@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
-@pw_set = ( 'a'..'z', 'A'..'Z', '0'..'9', '(', ')', '#', '.', ',' );
sub _cache {
my $self = shift;
sub _cache {
my $self = shift;
@@
-338,6
+337,7
@@
sub table_info {
'domsvc' => {
label => 'Domain',
type => 'select',
'domsvc' => {
label => 'Domain',
type => 'select',
+ select_svc => 1,
select_table => 'svc_domain',
select_key => 'svcnum',
select_label => 'domain',
select_table => 'svc_domain',
select_key => 'svcnum',
select_label => 'domain',
@@
-738,7
+738,7
@@
sub insert {
#welcome email
my @welcome_exclude_svcparts = $conf->config('svc_acct_welcome_exclude');
#welcome email
my @welcome_exclude_svcparts = $conf->config('svc_acct_welcome_exclude');
- unless (
grep { $_ eq $self->svcpart } @welcome_exclude_svcparts
) {
+ unless (
$FS::svc_Common::noexport_hack or ( grep { $_ eq $self->svcpart } @welcome_exclude_svcparts )
) {
my $error = '';
my $msgnum = $conf->config('welcome_msgnum', $agentnum);
if ( $msgnum ) {
my $error = '';
my $msgnum = $conf->config('welcome_msgnum', $agentnum);
if ( $msgnum ) {