summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Burger <burgerc@freeside.biz>2019-05-07 12:02:22 -0400
committerChristopher Burger <burgerc@freeside.biz>2019-05-07 12:02:22 -0400
commite3d1afe8e108bbdaf019107109d4b9d9f19a6f8b (patch)
treecb2bd343e92dab675bc7039d29c8c8fcd7109d9e
parent6dcc5cc9c8bdeb5635f122761e2ce2d3f52885b6 (diff)
RT# 82132 - updated password reset by mail to use username-uppercase config
-rw-r--r--FS/FS/ClientAPI/MyAccount.pm17
1 files changed, 13 insertions, 4 deletions
diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 4e2eb1b31..6166a3782 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -3305,13 +3305,22 @@ sub reset_passwd {
my $cust_main = '';
if ( $p->{'email'} ) { #new-style, changes contact and svc_acct
- $contact = FS::contact->by_selfservice_email($p->{'email'});
+ $contact = FS::contact->by_selfservice_email($p->{'email'}, 'case_insensitive');
- if ( $contact ) {
- my @cust_contact = grep $_->selfservice_access, $contact->cust_contact;
- $cust_main = $cust_contact[0]->cust_main if scalar(@cust_contact) == 1;
+ my @customers = grep $_->selfservice_access, $contact->cust_contact;
+ my @cust_contact;
+
+ foreach my $customer (@customers) {
+ if ($conf->exists('username-uppercase') || $conf->exists('username-uppercase', $customer->cust_main->agentnum)) {
+ my $check_contact = FS::contact->by_selfservice_email_custnum($p->{email}, $customer->custnum);
+ push @cust_contact, $customer if $check_contact;
+ }
+ else { push @cust_contact, $customer; }
}
+ $contact = '' unless @cust_contact;
+ $cust_main = $cust_contact[0]->cust_main if scalar(@cust_contact) == 1;
+
#also look for an svc_acct, otherwise it would be super confusing
my($username, $domain) = split('@', $p->{'email'});