X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fsvc_acct.cgi;h=a7d5136fb2cedecb2daa05438cc603832de3bafc;hb=4665d5af02f915679207a369222472a25e137c9d;hp=0d2c007f1f475b938148d15195f17b42b3ff226c;hpb=be61853021954c3cf8f6e63a41b1fa693e3af6d8;p=freeside.git diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi index 0d2c007f1..a7d5136fb 100755 --- a/httemplate/edit/process/svc_acct.cgi +++ b/httemplate/edit/process/svc_acct.cgi @@ -44,39 +44,59 @@ unless ( $cgi->param('cgp_accessmodes') ) { } my %hash = $svcnum ? $old->hash : (); -map { +for ( fields('svc_acct'), qw( pkgnum svcpart usergroup ) ) { $hash{$_} = scalar($cgi->param($_)); - #} qw(svcnum pkgnum svcpart username _password popnum uid gid finger dir - # shell quota slipip) - } (fields('svc_acct'), qw ( pkgnum svcpart usergroup )); +} +if ( $svcnum ) { + for ( grep $old->$_, qw( cf_privatekey ) ) { + $hash{$_} = $old->$_; + } +} my $new = new FS::svc_acct ( \%hash ); my $error = ''; +# google captcha auth +if ( $cgi->param('captcha_response') ) { + my $part_svc = $svcnum ? + $old->part_svc : + qsearchs( 'part_svc', + { 'svcpart' => $cgi->param('svcpart') } + ); + my ($export) = $part_svc->part_export('acct_google'); + if ( $export and + ! $export->captcha_auth($cgi->param('captcha_response')) ) { + $error = 'Re-enter the security word.'; + } +} + $new->_password($old->_password) if $old; 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')); + $error ||= $new->set_password($cgi->param('clear_password')); } -if ( $svcnum ) { - foreach ( grep { $old->$_ != $new->$_ } - qw( seconds upbytes downbytes totalbytes ) - ) - { - my %hash = map { $_ => $new->$_ } - grep { $new->$_ } - qw( seconds upbytes downbytes totalbytes ); +if ( ! $error ) { + if ( $svcnum ) { + foreach ( grep { $old->$_ != $new->$_ } + qw( seconds upbytes downbytes totalbytes ) + ) + { + my %hash = map { $_ => $new->$_ } + grep { $new->$_ } + qw( seconds upbytes downbytes totalbytes ); - $error ||= $new->set_usage(\%hash); #unoverlimit and trigger radius changes - last; #once is enough + $error ||= "invalid $_" foreach grep { $hash{$_} !~ /^-?\d+$/ } keys %hash; + $error ||= $new->set_usage(\%hash); #unoverlimit and trigger radius changes + last; #once is enough + } + $error ||= $new->replace($old); + } else { + $error ||= $new->insert; + $svcnum = $new->svcnum; } - $error ||= $new->replace($old); -} else { - $error ||= $new->insert; - $svcnum = $new->svcnum; }