X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Fprocess%2Fchange-password.html;h=a3e060168e3608b9a9bcfc524e52eaa435287cc4;hp=be83786cdb82cf502c1aa254bd3ec4286219a862;hb=0a91d21fcf8ebeb12cd71230d79153c1fa0d82a3;hpb=a84d14e36ad747dcc15cd5a4706e91c7cabb0afb diff --git a/httemplate/misc/process/change-password.html b/httemplate/misc/process/change-password.html index be83786cd..a3e060168 100644 --- a/httemplate/misc/process/change-password.html +++ b/httemplate/misc/process/change-password.html @@ -7,6 +7,7 @@ % $cgi->param('contactnum', $contactnum); % $cgi->param("changepw${contactnum}_error", $error); % } +% $cgi->param('error', $error); % } else { % if ($svcnum) { $cgi->query_string($svcnum); } % elsif ($contactnum) { $cgi->query_string($contactnum); } @@ -52,7 +53,7 @@ if ($svcnum) { ! $part_svc->restrict_edit_password ) ); - my $error = $svc_acct->is_password_allowed($newpass) + $error = $svc_acct->is_password_allowed($newpass) || $svc_acct->set_password($newpass) || $svc_acct->replace; @@ -63,7 +64,7 @@ elsif ($contactnum) { my $contact = qsearchs('contact', { 'contactnum' => $contactnum } ) or return { 'error' => "Contact not found" . $contactnum }; - my $error = $contact->is_password_allowed($newpass) + $error = $contact->is_password_allowed($newpass) || $contact->change_password($newpass); # annoyingly specific to view/svc_acct.cgi, for now...