diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-11-17 17:00:06 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-11-17 17:00:06 -0800 |
| commit | f32ac83068c6211f829f1688a1a9cdec71bc6ec7 (patch) | |
| tree | a6b6866f50a90fc7716861b4884ec4ffeb5ce535 /httemplate/edit/process | |
| parent | 2c112f32561f23f9c538ace00db46659ce16da32 (diff) | |
| parent | c0886229d19cfa798580fbeb342826fd11ceeeb0 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate/edit/process')
| -rw-r--r-- | httemplate/edit/process/reason.html | 2 | ||||
| -rwxr-xr-x | httemplate/edit/process/svc_acct.cgi | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/httemplate/edit/process/reason.html b/httemplate/edit/process/reason.html index cb79ed254..dfc18624e 100644 --- a/httemplate/edit/process/reason.html +++ b/httemplate/edit/process/reason.html @@ -1,6 +1,6 @@ <% include( 'elements/process.html', 'table' => 'reason', - 'redirect' => popurl(3) . 'browse/reason.html?class=' . + 'redirect' => popurl(3) . 'browse/reason_type.html?class=' . $cgi->param('class') . '&', ) %> diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi index 9cac2c568..d75ff92c1 100755 --- a/httemplate/edit/process/svc_acct.cgi +++ b/httemplate/edit/process/svc_acct.cgi @@ -81,7 +81,12 @@ if ( $cgi->param('clear_password') eq '*HIDDEN*' || $cgi->param('clear_password') =~ /^\(.* encrypted\)$/ ) { die "fatal: no previous account to recall hidden password from!" unless $old; } else { - $error ||= $new->set_password($cgi->param('clear_password')); + my $newpass = $cgi->param('clear_password'); + if ( ! $old->check_password($newpass) ) { + # then the password is being changed + $error ||= $new->is_password_allowed($newpass) + || $new->set_password($newpass); + } } if ( ! $error ) { |