X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_acct.cgi;h=38567ef673bb0e16b7ef9796de8e377e1737f905;hp=ebaa4b2ba5261cbf3f19f2ff3e05212c127d3d1a;hb=75e11f1d1a5ced24496b5732e290f7762403feb8;hpb=be10e7a1421c13eec4b1bb3676eaf5c84344e601 diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi index ebaa4b2ba..38567ef67 100755 --- a/httemplate/edit/svc_acct.cgi +++ b/httemplate/edit/svc_acct.cgi @@ -1,189 +1,86 @@ -% -% -%my $conf = new FS::Conf; -%my @shells = $conf->config('shells'); -% -%my $curuser = $FS::CurrentUser::CurrentUser; -% -%my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct, @groups); -%if ( $cgi->param('error') ) { -% -% $svc_acct = new FS::svc_acct ( { -% map { $_, scalar($cgi->param($_)) } fields('svc_acct') -% } ); -% $svcnum = $svc_acct->svcnum; -% $pkgnum = $cgi->param('pkgnum'); -% $svcpart = $cgi->param('svcpart'); -% $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } ); -% die "No part_svc entry for svcpart $svcpart!" unless $part_svc; -% @groups = $cgi->param('radius_usergroup'); -% -%} elsif ( $cgi->param('pkgnum') && $cgi->param('svcpart') ) { #adding -% -% $cgi->param('pkgnum') =~ /^(\d+)$/ or die 'unparsable pkgnum'; -% $pkgnum = $1; -% $cgi->param('svcpart') =~ /^(\d+)$/ or die 'unparsable svcpart'; -% $svcpart = $1; -% -% $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart}); -% die "No part_svc entry!" unless $part_svc; -% -% $svc_acct = new FS::svc_acct({svcpart => $svcpart}); -% -% $svcnum=''; -% -%} else { #editing -% -% my($query) = $cgi->keywords; -% $query =~ /^(\d+)$/ or die "unparsable svcnum"; -% $svcnum=$1; -% $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svcnum}) -% or die "Unknown (svc_acct) svcnum!"; -% -% my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum}) -% or die "Unknown (cust_svc) svcnum!"; -% -% $pkgnum=$cust_svc->pkgnum; -% $svcpart=$cust_svc->svcpart; -% -% $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } ); -% die "No part_svc entry for svcpart $svcpart!" unless $part_svc; -% -% @groups = $svc_acct->radius_groups; -% -%} -% -%my( $cust_pkg, $cust_main ) = ( '', '' ); -%if ( $pkgnum ) { -% $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } ); -% $cust_main = $cust_pkg->cust_main; -%} -% -%unless ( $svcnum || $cgi->param('error') ) { #adding -% -% #set gecos -% if ($cust_main) { -% unless ( $part_svc->part_svc_column('uid')->columnflag eq 'F' ) { -% $svc_acct->setfield('finger', -% $cust_main->getfield('first') . " " . $cust_main->getfield('last') -% ); -% } -% } -% -% $svc_acct->set_default_and_fixed( { -% #false laziness w/svc-acct::_fieldhandlers -% 'usergroup' => sub { -% my( $self, $groups ) = @_; -% if ( ref($groups) eq 'ARRAY' ) { -% @groups = @$groups; -% $groups; -% } elsif ( length($groups) ) { -% @groups = split(/\s*,\s*/, $groups); -% [ @groups ]; -% } else { -% @groups = (); -% []; -% } -% } -% } ); -% -%} -% -%#fixed radius groups always override & display -%if ( $part_svc->part_svc_column('usergroup')->columnflag eq 'F' ) { -% @groups = split(',', $part_svc->part_svc_column('usergroup')->columnvalue); -%} -% -%my $action = $svcnum ? 'Edit' : 'Add'; -% -%my $svc = $part_svc->getfield('svc'); -% -%my $otaker = getotaker; -% -%my $username = $svc_acct->username; -%my $password; -%if ( $svc_acct->_password ) { -% if ( $conf->exists('showpasswords') || ! $svcnum ) { -% $password = $svc_acct->_password; -% } else { -% $password = "*HIDDEN*"; -% } -%} else { -% $password = ''; -%} -% -%my $ulen = -% $conf->exists('usernamemax') -% ? $conf->config('usernamemax') -% : dbdef->table('svc_acct')->column('username')->length; -%my $ulen2 = $ulen+2; -% -%my $pmax = $conf->config('passwordmax') || 8; -%my $pmax2 = $pmax+2; -% -%my $p1 = popurl(1); -% -% - +<& /elements/header.html, mt("$action [_1] account",$svc) &> -<% include("/elements/header.html","$action $svc account") %> -% if ( $cgi->param('error') ) { +<& /elements/error.html &> - Error: <% $cgi->param('error') %> -

-% } % if ( $cust_main ) { - <% include( '/elements/small_custview.html', $cust_main, '', 1, - popurl(2) . "view/cust_main.cgi") %> + <& /elements/small_custview.html, $cust_main, '', 1, + popurl(2) . "view/cust_main.cgi" &>
% } +
-Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
+% if ( $svcnum ) { +% my $svclabel = emt("Service #[_1]",$svcnum); +% $svclabel =~ s/$svcnum/$svcnum<\/B>/; +<% $svclabel %> +% } else { +<% mt("Service # (NEW)") |h %> +% } +
<% ntable("#cccccc",2) %> - Service + <% mt('Service') |h %> <% $part_svc->svc %> - Username - - MAXLENGTH=<% $ulen %>> - + <% mt('Username') |h %> +% if ( $svcnum && $conf->exists('svc_acct-no_edit_username') ) { + <% $svc_acct->username() %> + +% } else { + + MAXLENGTH=<% $ulen %>> + +% } +%if ( $part_svc->part_svc_column('_password')->columnflag ne 'F' ) { - Password + <% mt('Password') |h %> - MAXLENGTH=<% $pmax %>> - (blank to generate) + MAXLENGTH=<% $pmax %>> + +%}else{ + +%} + % %my $sec_phrase = $svc_acct->sec_phrase; -%if ( $conf->exists('security_phrase') ) { -% - +%if ( $conf->exists('security_phrase') +% && $part_svc->part_svc_column('sec_phrase')->columnflag ne 'F' ) { - Security phrase + <% mt('Security phrase') |h %> - (for forgotten passwords) + (<% mt('for forgotten passwords') |h %>) % } else { - % } % @@ -192,7 +89,6 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
%if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) { % - % } else { % @@ -201,82 +97,82 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% if ( $domsvc ) { % my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $domsvc, } ); % if ( $svc_domain ) { -% $svc_domain{$svc_domain->svcnum} = $svc_domain; +% $svc_domain{$svc_domain->svcnum} = $svc_domain->domain; % } else { % warn "unknown svc_domain.svcnum for svc_acct.domsvc: $domsvc"; % } % } % -% if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'D' ) { -% my $svc_domain = qsearchs('svc_domain', { -% 'svcnum' => $part_svc->part_svc_column('domsvc')->columnvalue, -% } ); -% if ( $svc_domain ) { -% $svc_domain{$svc_domain->svcnum} = $svc_domain; -% } else { -% warn "unknown svc_domain.svcnum for part_svc_column domsvc: ". -% $part_svc->part_svc_column('domsvc')->columnvalue; -% } -% } -% -% if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'S' ) { -% foreach my $domain -% (split(',',$part_svc->part_svc_column('domsvc')->columnvalue)) { -% my $svc_domain = -% qsearchs('svc_domain', { 'svcnum' => $domain } ); -% $svc_domain{$svc_domain->svcnum} = $svc_domain if $svc_domain; -% } -% }elsif ($cust_pkg && !$conf->exists('svc_acct-alldomains') ) { -% my @cust_svc = -% map { qsearch('cust_svc', { 'pkgnum' => $_->pkgnum } ) } -% qsearch('cust_pkg', { 'custnum' => $cust_pkg->custnum } ); -% foreach my $cust_svc ( @cust_svc ) { -% my $svc_domain = -% qsearchs('svc_domain', { 'svcnum' => $cust_svc->svcnum } ); -% $svc_domain{$svc_domain->svcnum} = $svc_domain if $svc_domain; -% } -% } else { -% %svc_domain = map { $_->svcnum => $_ } qsearch('svc_domain', {} ); -% } -% -% - +% %svc_domain = (%svc_domain, +% domain_select_hash FS::svc_acct('svcpart' => $svcpart, +% 'pkgnum' => $pkgnum, +% ) +% ); - Domain + <% mt('Domain') |h %> % } -% + + +% if ( $communigate ) { + + + <% mt('Aliases') |h %> + + + +% } else { + +% } + + +<& /elements/tr-select-svc_pbx.html, + 'curr_value' => $svc_acct->pbxsvc, + 'part_svc' => $part_svc, + 'cust_pkg' => $cust_pkg, +&> + %#pop %my $popnum = $svc_acct->popnum || 0; %if ( $part_svc->part_svc_column('popnum')->columnflag eq 'F' ) { % - % } else { - - Access number + <% mt('Access number') |h %> <% FS::svc_acct_pop::popselector($popnum) %> % } + +%#tower (huh) +%if ( $conf->exists('svc_acct-tower_sector') +% && $part_svc->part_svc_column('sectornum')->columnflag ne 'F' ) { + <& /elements/tr-select-tower_sector.html, + 'curr_value' => $svc_acct->sectornum, + #'part_svc' => $part_svc, + #'cust_pkg' => $cust_pkg, + &> +%} else { + +%} + % #uid/gid % foreach my $xid (qw( uid gid )) { % @@ -286,7 +182,6 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% % if ( length($svc_acct->$xid()) ) { - <% uc($xid) %> <% $svc_acct->$xid() %> @@ -294,11 +189,9 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% } - % } else { - <% uc($xid) %> @@ -314,22 +207,33 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% && ! $svc_acct->finger ) { % - % } else { - GECOS + <% mt('Real Name') |h %> % } - +% +%#dir +%if ( $part_svc->part_svc_column('dir')->columnflag eq 'F' +% || !$curuser->access_right('Edit home dir') +% ) { +% } else { + + + + <% mt('Home directory') |h %> + + +% } % %#shell %my $shell = $svc_acct->shell; @@ -338,13 +242,12 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% ) { % - % } else { - Shell + <% mt('Shell') |h %> -% } else { - - - - Quota: - - -% } % if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) { - - % } else { - - - IP + <% mt('IP') |h %> % } -% -% if ( $curuser->access_right('Edit usage') ) { -% my %label = ( seconds => 'Seconds', -% upbytes => 'Upload bytes', -% downbytes => 'Download bytes', -% totalbytes => 'Total bytes', -% ); -% foreach my $uf (keys %label) { -% my $tf = $uf . "_threshold"; -% if ( $svc_acct->$tf ne '' ) { +% my %label = ( seconds => 'Time', +% upbytes => 'Upload bytes', +% downbytes => 'Download bytes', +% totalbytes => 'Total bytes', +% ); +% foreach my $uf (keys %label) { +% my $tf = $uf . "_threshold"; +% if ( $curuser->access_right('Edit usage') ) { - <% $label{$uf} %> remaining - + <% mt("[_1] remaining",$label{$uf}) |h %> + (<% mt('blank disables') |h %>) -% } + + <% mt("[_1] threshold",$label{$uf}) |h %> + (<% mt('blank disables') |h %>) + +% }else{ + + % } -% } +% } % %foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) { % $r =~ /^^r(adius|[cr])_(.+)$/ or next; #? @@ -410,11 +307,9 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% % if ( $part_svc->part_svc_column($r)->columnflag =~ /^[FA]$/ ) { - % } else { - <% $FS::raddb::attrib{$a} %> @@ -423,34 +318,207 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% } - - RADIUS groups -% if ( $part_svc->part_svc_column('usergroup')->columnflag eq 'F' ) { - - - <% join('
', @groups) %> + <% mt('RADIUS groups') |h %> +% if ( $part_svc_usergroup->columnflag eq 'F' ) { + <% join('
', @groupnames) %> % } else { - - - <% FS::svc_acct::radius_usergroup_selector( \@groups ) %> +% my $radius_group_selected = ''; +% if ( $svc_acct->svcnum ) { +% $radius_group_selected = join(',',$svc_acct->radius_groups('groupnum')); +% } +% elsif ( !$svc_acct->svcnum && $part_svc_usergroup->columnflag eq 'D' ) { +% $radius_group_selected = $part_svc_usergroup->columnvalue; +% } + <& /elements/select-radius_group.html, + curr_value => $radius_group_selected, + element_name => 'radius_usergroup', + multiple => 1, + &> + % } - % foreach my $field ($svc_acct->virtual_fields) { % # If the flag is X, it won't even show up in $svc_acct->virtual_fields. % if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) { - <% $svc_acct->pvf($field)->widget('HTML', 'edit', $svc_acct->getfield($field)) %> % } % } -
+% if ( $captcha_url ) { +
+<% mt('Enter the word shown above:') |h %>
+
+% } + - + + +<& /elements/footer.html &> + +<%init> + +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('Provision customer service'); #something else more specific? + +my $conf = new FS::Conf; +my @shells = $conf->config('shells'); + +my $curuser = $FS::CurrentUser::CurrentUser; + +my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct, @groups); +if ( $cgi->param('error') ) { + + $svc_acct = new FS::svc_acct ( { + map { $_, scalar($cgi->param($_)) } fields('svc_acct') + } ); + $svcnum = $svc_acct->svcnum; + $pkgnum = $cgi->param('pkgnum'); + $svcpart = $cgi->param('svcpart'); + $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } ); + die "No part_svc entry for svcpart $svcpart!" unless $part_svc; + @groups = $cgi->param('radius_usergroup'); + +} elsif ( $cgi->param('pkgnum') && $cgi->param('svcpart') ) { #adding + + $cgi->param('pkgnum') =~ /^(\d+)$/ or die 'unparsable pkgnum'; + $pkgnum = $1; + $cgi->param('svcpart') =~ /^(\d+)$/ or die 'unparsable svcpart'; + $svcpart = $1; + + $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart}); + die "No part_svc entry!" unless $part_svc; + + $svc_acct = new FS::svc_acct({svcpart => $svcpart}); + + $svcnum=''; + + $svc_acct->password_recover('Y'); #default. hmm. + +} else { #editing + + my($query) = $cgi->keywords; + $query =~ /^(\d+)$/ or die "unparsable svcnum"; + $svcnum=$1; + $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svcnum}) + or die "Unknown (svc_acct) svcnum!"; + + my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum}) + or die "Unknown (cust_svc) svcnum!"; + + $pkgnum=$cust_svc->pkgnum; + $svcpart=$cust_svc->svcpart; + + $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } ); + die "No part_svc entry for svcpart $svcpart!" unless $part_svc; + + @groups = $svc_acct->radius_groups; + +} + +my $communigate = scalar($part_svc->part_export('communigate_pro')); + # || scalar($part_svc->part_export('communigate_pro_singledomain')); + +my( $cust_pkg, $cust_main ) = ( '', '' ); +if ( $pkgnum ) { + $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } ); + $cust_main = $cust_pkg->cust_main; +} + +unless ( $svcnum || $cgi->param('error') ) { #adding + + #set gecos + if ($cust_main) { + unless ( $part_svc->part_svc_column('uid')->columnflag eq 'F' ) { + $svc_acct->setfield('finger', + $cust_main->getfield('first') . " " . $cust_main->getfield('last') + ); + } + } + + $svc_acct->set_default_and_fixed( { + #false laziness w/svc-acct::_fieldhandlers + 'usergroup' => sub { + my( $self, $groups ) = @_; + if ( ref($groups) eq 'ARRAY' ) { + @groups = @$groups; + $groups; + } elsif ( length($groups) ) { + @groups = split(/\s*,\s*/, $groups); + [ @groups ]; + } else { + @groups = (); + []; + } + } + } ); + +} + +my $part_svc_usergroup = $part_svc->part_svc_column('usergroup'); +#fixed radius groups always override & display +my @groupnames; # only used for display of Fixed RADIUS groups +if ( $part_svc_usergroup->columnflag eq 'F' ) { + @groups = split(',',$part_svc_usergroup->columnvalue); + @groupnames = map { $_->long_description } + qsearch({ 'table' => 'radius_group', + 'extra_sql' => "where groupnum in (".$part_svc_usergroup->columnvalue.")", + }) if length($part_svc_usergroup->columnvalue); +} + +my $action = $svcnum ? 'Edit' : 'Add'; + +my $svc = $part_svc->getfield('svc'); + +my $otaker = getotaker; + +my $username = $svc_acct->username; + +my $password = ''; +if ( $cgi->param('error') ) { + $password = $cgi->param('clear_password'); +} elsif ( $svcnum ) { + my $password_encryption = $svc_acct->_password_encryption; + if ( $password = $svc_acct->get_cleartext_password ) { + $password = '*HIDDEN*' unless $conf->exists('showpasswords'); + } elsif( $svc_acct->_password and $password_encryption ne 'plain' ) { + $password = "(".uc($password_encryption)." encrypted)"; + } +} + +my $ulen = + $conf->exists('usernamemax') + ? $conf->config('usernamemax') + : dbdef->table('svc_acct')->column('username')->length; +my $ulen2 = $ulen+2; + +my $pmax = max($conf->config('passwordmax') || 13); +my $pmax2 = $pmax+2; + +my $p1 = popurl(1); + +sub max { + (sort(@_))[-1] +} + +my $captcha_url; +my ($export_google) = $part_svc->part_export('acct_google'); +if ( $export_google ) { + my $error = $export_google->auth_error; + if ( $error ) { + if ( $error->{'captcha_url'} ) { + $captcha_url = $error->{'captcha_url'}; + } + else { + $cgi->param('error', $error->{'message'}); + } + } #if $error +} + +