From cfd85994ae364f5b7c0c4bc1bf30d3485e748a08 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Tue, 9 Feb 2016 10:57:08 -0800 Subject: Revert "make password-insecure option work when adding a new svc_acct, #40236" This reverts commit a19a04f0b684c64039c03216d398af534c858bf9. - password-insecure option is 3.x only. --- httemplate/misc/xmlhttp-validate_password.html | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'httemplate/misc/xmlhttp-validate_password.html') diff --git a/httemplate/misc/xmlhttp-validate_password.html b/httemplate/misc/xmlhttp-validate_password.html index 1efb4aaa3..28dbf6460 100644 --- a/httemplate/misc/xmlhttp-validate_password.html +++ b/httemplate/misc/xmlhttp-validate_password.html @@ -1,14 +1,13 @@ <%doc> -Requires cgi params 'password' (plaintext) and 'sub' ('validate_password' is -only acceptable value.) Also accepts 'svcnum' (for svc_acct, will otherwise -create an empty dummy svc_acct), 'pkgnum' (for when the svc_acct isn't yet -inserted), and 'fieldid' (for html post-processing, passed along in results -for convenience.) - -Returns a json-encoded hashref with keys of 'valid' (set to 1 if object is -valid), 'error' (error text if password is invalid) or 'syserror' (error text -if password could not be validated.) Only one of these keys will be set. -Will also set 'fieldid' if it was passed. +Requires cgi params 'password' (plaintext) and 'sub' ('validate_password' is only +acceptable value.) Also accepts 'svcnum' (for svc_acct, will otherwise create an +empty dummy svc_acct) and 'fieldid' (for html post-processing, passed along in +results for convenience.) + +Returns a json-encoded hashref with keys of 'valid' (set to 1 if object is valid), +'error' (error text if password is invalid) or 'syserror' (error text if password +could not be validated.) Only one of these keys will be set. Will also set +'fieldid' if it was passed. <% encode_json($result) %> @@ -33,13 +32,9 @@ my $validate_password = sub { $result{'syserror'} = 'Invalid svcnum' unless $svcnum =~ /^\d*$/; return \%result if $result{'syserror'}; - my $pkgnum = $arg{'pkgnum'}; - $result{'syserror'} = 'Invalid pkgnum' unless $pkgnum =~ /^\d*$/; - return \%result if $result{'syserror'}; - my $svc_acct = $svcnum ? qsearchs('svc_acct',{'svcnum' => $svcnum}) - : FS::svc_acct->new({ 'pkgnum' => $pkgnum }); + : (new FS::svc_acct {}); $result{'syserror'} = 'Could not find service' unless $svc_acct; return \%result if $result{'syserror'}; -- cgit v1.2.1