X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_acct.cgi;h=27ea3c5eabac5a594cb20247ede57ced5922352d;hp=58283ef54439815b9ff10ca0b36d94e1db1720be;hb=793956b8a0c19d7d39103e94235b0ca13f0f3e84;hpb=0930d22ffc440f80c1b222b2e750cadbabd9e8f6 diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi index 58283ef54..27ea3c5ea 100755 --- a/httemplate/edit/svc_acct.cgi +++ b/httemplate/edit/svc_acct.cgi @@ -1,64 +1,82 @@ -<% include('/elements/header.html', "$action $svc account") %> +<& /elements/header.html, mt("$action [_1] account",$svc) &> -<% include('/elements/error.html') %> +<& /elements/error.html &> % 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 %>> - +<% include('/elements/tr-td-label.html', + 'label' => $part_svc->part_svc_column('username')->columnlabel || mt('Username'), + 'required' => $part_svc->part_svc_column('username')->required ) %> +% 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 +% #XXX eventually should require "Edit Password" ACL +<% include('/elements/tr-td-label.html', + 'label' => $part_svc->part_svc_column('_password')->columnlabel || mt('Password'), + 'required' => $part_svc->part_svc_column('_password')->required ) %> - MAXLENGTH=<% $pmax %>> - (blank to generate) + MAXLENGTH=<% $pmax %>> + <& /elements/random_pass.html, 'clear_password' &>
+
+ <& '/elements/validate_password.html', + 'fieldid' => 'clear_password', + 'svcnum' => $svcnum + &> %}else{ - + %} + % %my $sec_phrase = $svc_acct->sec_phrase; %if ( $conf->exists('security_phrase') % && $part_svc->part_svc_column('sec_phrase')->columnflag ne 'F' ) { -% - - - Security phrase +<% include('/elements/tr-td-label.html', + 'label' => $part_svc->part_svc_column('sec_phrase')->columnlabel || mt('Security phrase'), + 'required' => $part_svc->part_svc_column('sec_phrase')->required ) %> - (for forgotten passwords) + (<% mt('for forgotten passwords') |h %>) % } else { - % } % @@ -67,7 +85,6 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
%if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) { % - % } else { % @@ -76,7 +93,7 @@ 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"; % } @@ -87,11 +104,10 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% 'pkgnum' => $pkgnum, % ) % ); -% - - - Domain +<% include('/elements/tr-td-label.html', + 'label' => $part_svc->part_svc_column('domsvc')->columnlabel || mt('Domain'), + 'required' => $part_svc->part_svc_column('domsvc')->required ) %> + + +% } else { + +% } + + +<& /elements/tr-select-svc_pbx.html, + 'curr_value' => $svc_acct->pbxsvc, + 'part_svc' => $part_svc, + 'cust_pkg' => $cust_pkg, + 'label' => $part_svc->part_svc_column('pbxsvc')->columnlabel || 'PBX', +&> + %#pop %my $popnum = $svc_acct->popnum || 0; %if ( $part_svc->part_svc_column('popnum')->columnflag eq 'F' ) { % - % } else { - - - Access number +<% include('/elements/tr-td-label.html', + 'label' => $part_svc->part_svc_column('popnum')->columnlabel || mt('Access number'), + 'required' => $part_svc->part_svc_column('popnum')->required ) %> <% 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, + 'required' => $part_svc->part_svc_column('sectornum')->required, + 'label' => $part_svc->part_svc_column('sectornum')->columnlabel || mt('Tower sector'), + &> +%} else { + +%} + +<& /elements/tr-svc_export_machine.html, + 'svc' => $svc_acct, + 'part_svc' => $part_svc, + 'cgi' => $cgi, +&> + % #uid/gid % foreach my $xid (qw( uid gid )) { % @@ -134,22 +189,23 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% % if ( length($svc_acct->$xid()) ) { - - - <% uc($xid) %> +<% include('/elements/tr-td-label.html', + 'label' => $part_svc->part_svc_column($xid)->columnlabel || uc($xid), + 'required' => $part_svc->part_svc_column($xid)->required ) %> +%# +%# <% uc($xid) %> <% $svc_acct->$xid() %> % } - % } else { - - - <% uc($xid) %> +<% include('/elements/tr-td-label.html', + 'label' => $part_svc->part_svc_column($xid)->columnlabel || uc($xid), + 'required' => $part_svc->part_svc_column($xid)->required ) %> @@ -162,13 +218,13 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% && ! $svc_acct->finger ) { % - % } else { - - GECOS +<% include('/elements/tr-td-label.html', + 'label' => $part_svc->part_svc_column('finger')->columnlabel || mt('Real Name'), + 'required' => $part_svc->part_svc_column('finger')->required ) %> @@ -185,8 +241,9 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% } else { - - Home directory +<% include('/elements/tr-td-label.html', + 'label' => $part_svc->part_svc_column('dir')->columnlabel || mt('Home directory'), + 'required' => $part_svc->part_svc_column('dir')->required ) %> % } @@ -198,13 +255,13 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% ) { % - % } else { - - Shell +<% include('/elements/tr-td-label.html', + 'label' => $part_svc->part_svc_column('shell')->columnlabel || mt('Shell'), + 'required' => $part_svc->part_svc_column('shell')->required ) %> -% } else { - - - - Quota: - - -% } -% if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) { - - - -% } else { +<& svc_acct/communigate.html, + 'svc_acct' => $svc_acct, + 'part_svc' => $part_svc, + 'communigate' => $communigate, +&> + +% if ( $conf->exists('svc_acct-ip_addr') ) { +% # router/block selection UI +% # (should we show this if slipip is fixed?) +<& /elements/tr-select-router_block_ip.html, + 'object' => $svc_acct, + 'ip_field' => 'slipip', + 'required' => $part_svc->part_svc_column('routernum')->required, + 'label' => $part_svc->part_svc_column('routernum')->columnlabel, + 'ip_addr_required' => $part_svc->part_svc_column('slipip')->required, + 'ip_addr_label' => $part_svc->part_svc_column('slipip')->columnlabel, +&> +% } else { +% # don't expose these to the user--they're only useful in the other case + + +% if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) { + +% } else { +<% include('/elements/tr-td-label.html', + 'label' => $part_svc->part_svc_column('slipip')->columnlabel || mt('IP'), + 'required' => $part_svc->part_svc_column('slipip')->required ) %> + + +% } +% } - - IP - - -% } -% -% my %label = ( seconds => 'Time', -% upbytes => 'Upload bytes', -% downbytes => 'Download bytes', -% totalbytes => 'Total bytes', -% ); +% tie my %label, 'Tie::IxHash', 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 - (blank disables) + <% mt("[_1] remaining",$label{$uf}) |h %> + (<% mt('blank disables') |h %>) - <% $label{$uf} %> threshold - (blank disables) + <% mt("[_1] threshold",$label{$uf}) |h %> + (<% mt('blank disables') |h %>) % }else{ @@ -274,11 +338,9 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% % if ( $part_svc->part_svc_column($r)->columnflag =~ /^[FA]$/ ) { - % } else { - <% $FS::raddb::attrib{$a} %> @@ -287,39 +349,79 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% } - - - RADIUS groups -% if ( $part_svc->part_svc_column('usergroup')->columnflag eq 'F' ) { - - - <% join('
', @groups) %> +<% include('/elements/tr-td-label.html', + 'label' => $part_svc->part_svc_column('usergroup')->columnlabel || mt('RADIUS groups'), + 'required' => $part_svc->part_svc_column('usergroup')->required ) %> +% 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, + &> + % } - + +% if ( $part_svc->has_router ) { +<& /elements/hidden.html, + field => 'router_routernum', + curr_value => $svc_acct->router_routernum +&> +<& /elements/tr-input-text.html, + label => 'Attached router name', + field => 'router_routername', + size => 32, + curr_value => $svc_acct->router_routername +&> +<& /elements/tr-select-table.html, + label => 'Attached address block', + field => 'router_blocknum', + table => 'addr_block', + hashref => { 'routernum' => '0' }, + extra_sql => ($svc_acct->router_routernum ? + ' OR routernum = '.$svc_acct->router_routernum : ''), + agent_virt => 1, + agent_null => 1, + name_col => 'cidr', + order_by => 'ORDER BY ip_gateway, ip_netmask', + empty_label => '(none)', + disable_empty => 0, + curr_value => $svc_acct->router_blocknum +&> +% } + % 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 %>
+
+% } + -<% include('/elements/footer.html') %> +<& /elements/footer.html &> <%init> @@ -354,9 +456,11 @@ if ( $cgi->param('error') ) { $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart}); die "No part_svc entry!" unless $part_svc; - $svc_acct = new FS::svc_acct({svcpart => $svcpart}); + $svc_acct = new FS::svc_acct({svcpart => $svcpart}); + + $svcnum=''; - $svcnum=''; + $svc_acct->password_recover('Y'); #default. hmm. } else { #editing @@ -379,6 +483,9 @@ if ( $cgi->param('error') ) { } +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 } ); @@ -415,27 +522,33 @@ unless ( $svcnum || $cgi->param('error') ) { #adding } +my $part_svc_usergroup = $part_svc->part_svc_column('usergroup'); #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 @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 ( $svc_acct->_password ) { - if ( $conf->exists('showpasswords') || ! $svcnum ) { - $password = $svc_acct->_password; - } else { - $password = "*HIDDEN*"; + +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)"; } -} else { - $password = ''; } my $ulen = @@ -444,9 +557,44 @@ my $ulen = : dbdef->table('svc_acct')->column('username')->length; my $ulen2 = $ulen+2; -my $pmax = $conf->config('passwordmax') || 8; +my $pmax = max($conf->config('passwordmax') || 12); 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 +} + +if ( $part_svc->has_router ) { # duplicates the one in elements/svc_Common + if ( $svcnum ) { + my $router = qsearchs('router', {svcnum => $svc_acct->svcnum}); + if ( $router ) { + $svc_acct->set("router_$_", $router->get($_)) + foreach ('routername', 'routernum'); + my ($block) = $router->addr_block; + $svc_acct->set('router_blocknum', $block->blocknum) if ( $block ); + } + } + foreach (qw(router_routername router_routernum router_blocknum)) { + if ( $cgi->param($_) =~ /^(\w+)$/ ) { + $svc_acct->set($_, $1); + } + } +} +