diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2017-10-03 09:36:51 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2017-10-03 09:36:51 -0700 |
| commit | 929783d1045757abbe5c84ff2439547b0f8eca23 (patch) | |
| tree | 21b0a2c17ce809115712042b61f47c97b3b8ef0a /httemplate/misc/process | |
| parent | 9270a9fe7ea00f5a24a9ce3b927f932db6650b23 (diff) | |
| parent | 90430c5c67581b41b3c4ad48f70b9e443092977b (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate/misc/process')
| -rw-r--r-- | httemplate/misc/process/change-password.html | 5 | ||||
| -rw-r--r-- | httemplate/misc/process/contact-import.cgi | 10 |
2 files changed, 13 insertions, 2 deletions
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... diff --git a/httemplate/misc/process/contact-import.cgi b/httemplate/misc/process/contact-import.cgi new file mode 100644 index 000000000..108ee93e9 --- /dev/null +++ b/httemplate/misc/process/contact-import.cgi @@ -0,0 +1,10 @@ +<% $server->process %> +<%init> + +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('Import'); + +my $server = + new FS::UI::Web::JSRPC 'FS::contact::Import::process_batch_import', $cgi; + +</%init> |