X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_acct.cgi;h=38567ef673bb0e16b7ef9796de8e377e1737f905;hp=71b324d9977d4bbc6060ffc560df82edb6351e5e;hb=75e11f1d1a5ced24496b5732e290f7762403feb8;hpb=924a1bde45d6fbe134ecd502cd3ba072f5d73195

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 71b324d99..38567ef67 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,450 +1,524 @@
-<%
+<& /elements/header.html, mt("$action [_1] account",$svc) &>
 
-my $conf = new FS::Conf;
-my @shells = $conf->config('shells');
-
-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');
-
-} else {
-
-  my($query) = $cgi->keywords;
-  if ( $query =~ /^(\d+)$/ ) { #editing
-    $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;
-
-  } else { #adding
-
-    foreach $_ (split(/-/,$query)) {
-      $pkgnum=$1 if /^pkgnum(\d+)$/;
-      $svcpart=$1 if /^svcpart(\d+)$/;
-    }
-    $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
-    die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
-
-    $svc_acct = new FS::svc_acct({svcpart => $svcpart}); 
-
-    $svcnum='';
-
-  }
-}
-
-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
+<& /elements/error.html &>
 
-  #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')
-      );
-    }
-  }
+% if ( $cust_main ) { 
 
-  $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*";
+  <& /elements/small_custview.html, $cust_main, '', 1,
+              popurl(2) . "view/cust_main.cgi" &>
+  <BR>
+% } 
+
+<SCRIPT TYPE="text/javascript">
+function randomPass() {
+  var i=0;
+  var pw_set='<% join('', 'a'..'z', 'A'..'Z', '0'..'9' ) %>';
+  var pass='';
+  while(i < 8) {
+    i++;
+    pass += pw_set.charAt(Math.floor(Math.random() * pw_set.length));
   }
-} else {
-  $password = '';
+  document.OneTrueForm.clear_password.value = pass;
 }
+</SCRIPT>
+
+<FORM NAME="OneTrueForm" ACTION="<% $p1 %>process/svc_acct.cgi" METHOD=POST>
+<INPUT TYPE="hidden" NAME="svcnum" VALUE="<% $svcnum %>">
+<INPUT TYPE="hidden" NAME="pkgnum" VALUE="<% $pkgnum %>">
+<INPUT TYPE="hidden" NAME="svcpart" VALUE="<% $svcpart %>">
+
+% if ( $svcnum ) {
+% my $svclabel = emt("Service #[_1]",$svcnum);
+% $svclabel =~ s/$svcnum/<B>$svcnum<\/B>/;
+<% $svclabel %>
+% } else {
+<% mt("Service # (NEW)") |h %>
+% }
+<BR>
 
-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);
-
-%>
-
-<%= include("/elements/header.html","$action $svc account") %>
-
-<% if ( $cgi->param('error') ) { %>
-  <FONT SIZE="+1" COLOR="#ff0000">Error: <%= $cgi->param('error') %></FONT>
-  <BR><BR>
-<% } %>
-
-<% if ( $cust_main ) { %>
-  <%= include( '/elements/small_custview.html', $cust_main, '', 1 ) %>
-  <BR>
-<% } %>
-
-<FORM NAME="OneTrueForm" ACTION="<%= $p1 %>process/svc_acct.cgi" METHOD=POST>
-<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%= $svcnum %>">
-<INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%= $pkgnum %>">
-<INPUT TYPE="hidden" NAME="svcpart" VALUE="<%= $svcpart %>">
-
-Service # <%= $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
-
-<%= ntable("#cccccc",2) %>
+<% ntable("#cccccc",2) %>
 
 <TR>
-  <TD ALIGN="right">Service</TD>
-  <TD BGCOLOR="#eeeeee"><%= $part_svc->svc %></TD>
+  <TD ALIGN="right"><% mt('Service') |h %></TD>
+  <TD BGCOLOR="#eeeeee"><% $part_svc->svc %></TD>
 </TR>
 
 <TR>
-  <TD ALIGN="right">Username</TD>
-  <TD>
-    <INPUT TYPE="text" NAME="username" VALUE="<%= $username %>" SIZE=<%= $ulen2 %> MAXLENGTH=<%= $ulen %>>
-  </TD>
+  <TD ALIGN="right"><% mt('Username') |h %></TD>
+% if ( $svcnum && $conf->exists('svc_acct-no_edit_username') ) {
+    <TD BGCOLOR="#eeeeee"><% $svc_acct->username() %></TD>
+    <INPUT TYPE="hidden" NAME="username" VALUE="<% $username %>">
+% } else {
+    <TD>
+      <INPUT TYPE="text" NAME="username" VALUE="<% $username %>" SIZE=<% $ulen2 %> MAXLENGTH=<% $ulen %>>
+    </TD>
+% }
 </TR>
 
+%if ( $part_svc->part_svc_column('_password')->columnflag ne 'F' ) {
 <TR>
-  <TD ALIGN="right">Password</TD>
+  <TD ALIGN="right"><% mt('Password') |h %></TD>
   <TD>
-    <INPUT TYPE="text" NAME="_password" VALUE="<%= $password %>" SIZE=<%= $pmax2 %> MAXLENGTH=<%= $pmax %>>
-    (blank to generate)
+    <INPUT TYPE="text" NAME="clear_password" VALUE="<% $password %>" SIZE=<% $pmax2 %> MAXLENGTH=<% $pmax %>>
+    <INPUT TYPE="button" VALUE="<% mt('Generate') |h %>" onclick="randomPass();">
   </TD>
 </TR>
-
-
-<%
-my $sec_phrase = $svc_acct->sec_phrase;
-if ( $conf->exists('security_phrase') ) {
-%>
+%}else{
+    <INPUT TYPE="hidden" NAME="clear_password" VALUE="<% $password %>">
+%}
+<INPUT TYPE="hidden" NAME="_password_encoding" VALUE="<% $svc_acct->_password_encoding %>">
+%
+%my $sec_phrase = $svc_acct->sec_phrase;
+%if ( $conf->exists('security_phrase') 
+%  && $part_svc->part_svc_column('sec_phrase')->columnflag ne 'F' ) {
 
   <TR>
-    <TD ALIGN="right">Security phrase</TD>
+    <TD ALIGN="right"><% mt('Security phrase') |h %></TD>
     <TD>
-      <INPUT TYPE="text" NAME="sec_phrase" VALUE="<%= $sec_phrase %>" SIZE=32>
-      (for forgotten passwords)
+      <INPUT TYPE="text" NAME="sec_phrase" VALUE="<% $sec_phrase %>" SIZE=32>
+      (<% mt('for forgotten passwords') |h %>)
     </TD>
   </TD>
-
-<% } else { %>
-
-  <INPUT TYPE="hidden" NAME="sec_phrase" VALUE="<%= $sec_phrase %>">
-
-<% } %>
-
-
-<%
-#domain
-my $domsvc = $svc_acct->domsvc || 0;
-if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
-%>
-
-  <INPUT TYPE="hidden" NAME="domsvc" VALUE="<%= $domsvc %>">
-
-<% } else { 
-
-  my %svc_domain = ();
-
-  if ( $domsvc ) {
-    my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $domsvc, } );
-    if ( $svc_domain ) {
-      $svc_domain{$svc_domain->svcnum} = $svc_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 ($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', {} );
-  }
-
-%>
+% } else { 
+
+  <INPUT TYPE="hidden" NAME="sec_phrase" VALUE="<% $sec_phrase %>">
+% } 
+%
+%#domain
+%my $domsvc = $svc_acct->domsvc || 0;
+%if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
+%
+
+  <INPUT TYPE="hidden" NAME="domsvc" VALUE="<% $domsvc %>">
+% } else { 
+%
+%  my %svc_domain = ();
+%
+%  if ( $domsvc ) {
+%    my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $domsvc, } );
+%    if ( $svc_domain ) {
+%      $svc_domain{$svc_domain->svcnum} = $svc_domain->domain;
+%    } else {
+%      warn "unknown svc_domain.svcnum for svc_acct.domsvc: $domsvc";
+%    }
+%  }
+%
+%  %svc_domain = (%svc_domain,
+%                 domain_select_hash FS::svc_acct('svcpart' => $svcpart,
+%                                                 'pkgnum'  => $pkgnum,
+%                                                )
+%                );
 
   <TR>
-    <TD ALIGN="right">Domain</TD>
+    <TD ALIGN="right"><% mt('Domain') |h %></TD>
     <TD>
       <SELECT NAME="domsvc" SIZE=1>
+% foreach my $svcnum (
+%             sort { $svc_domain{$a} cmp $svc_domain{$b} }
+%                  keys %svc_domain
+%           ) {
+%             my $svc_domain = $svc_domain{$svcnum};
+%        
 
-        <% foreach my $svcnum (
-             sort { $svc_domain{$a}->domain cmp $svc_domain{$b}->domain }
-                  keys %svc_domain
-           ) {
-             my $svc_domain = $svc_domain{$svcnum};
-        %>
+             <OPTION VALUE="<% $svcnum %>" <% $svcnum == $domsvc ? ' SELECTED' : '' %>><% $svc_domain{$svcnum} %>
+% } 
 
-             <OPTION VALUE="<%= $svc_domain->svcnum %>" <%= $svc_domain->svcnum == $domsvc ? ' SELECTED' : '' %>><%= $svc_domain->domain %>
-
-       <% } %>
       </SELECT>
     </TD>
   </TR>
-
-<% } %>
+% } 
 
 
-<%
-#pop
-my $popnum = $svc_acct->popnum || 0;
-if ( $part_svc->part_svc_column('popnum')->columnflag eq 'F' ) {
-%>
+% if ( $communigate ) {
 
-  <INPUT TYPE="hidden" NAME="popnum" VALUE="<%= $popnum %>">
+    <TR>
+      <TD ALIGN="right"><% mt('Aliases') |h %></TD>
+      <TD><INPUT TYPE="text" NAME="cgp_aliases" VALUE="<% $svc_acct->cgp_aliases %>"></TD>
+    </TR>
 
+% } else {
+    <INPUT TYPE="hidden" NAME="cgp_aliases" VALUE="<% $svc_acct->cgp_aliases %>">
+% }
 
-<% } else { %>
 
-  <TR>
-    <TD ALIGN="right">Access number</TD>
-    <TD><%= FS::svc_acct_pop::popselector($popnum) %></TD>
-  </TR>
+<& /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' ) {
+%
 
+  <INPUT TYPE="hidden" NAME="popnum" VALUE="<% $popnum %>">
+% } else { 
 
-<% #uid/gid %>
-<% foreach my $xid (qw( uid gid )) { %>
+  <TR>
+    <TD ALIGN="right"><% mt('Access number') |h %></TD>
+    <TD><% FS::svc_acct_pop::popselector($popnum) %></TD>
+  </TR>
+% } 
+
+%#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 {
+    <INPUT TYPE="hidden" NAME="sectornum" VALUE="<% $svc_acct->sectornum %>">
+%}
+
+% #uid/gid 
+% foreach my $xid (qw( uid gid )) { 
+%
+%  if ( $part_svc->part_svc_column($xid)->columnflag =~ /^[FA]$/
+%       || ! $conf->exists("svc_acct-edit_$xid")
+%     ) {
+%  
+% if ( length($svc_acct->$xid()) ) { 
 
-  <%
-  if ( $part_svc->part_svc_column($xid)->columnflag =~ /^[FA]$/
-       || ! $conf->exists("svc_acct-edit_$xid")
-     ) {
-  %>
-  
-    <% if ( length($svc_acct->$xid()) ) { %>
-  
       <TR>
-        <TD ALIGN="right"><%= uc($xid) %></TD>
-          <TD BGCOLOR="#eeeeee"><%= $svc_acct->$xid() %></TD>
+        <TD ALIGN="right"><% uc($xid) %></TD>
+          <TD BGCOLOR="#eeeeee"><% $svc_acct->$xid() %></TD>
         <TD>
         </TD>
       </TR>
+% } 
   
-    <% } %>
-  
-    <INPUT TYPE="hidden" NAME="<%= $xid %>" VALUE="<%= $svc_acct->$xid() %>">
-  
-  <% } else { %>
+    <INPUT TYPE="hidden" NAME="<% $xid %>" VALUE="<% $svc_acct->$xid() %>">
+% } else { 
   
     <TR>
-      <TD ALIGN="right"><%= uc($xid) %></TD>
+      <TD ALIGN="right"><% uc($xid) %></TD>
       <TD>
-        <INPUT TYPE="text" NAME="<%= $xid %>" SIZE=8 MAXLENGTH=6 VALUE="<%= $svc_acct->$xid() %>">
+        <INPUT TYPE="text" NAME="<% $xid %>" SIZE=8 MAXLENGTH=6 VALUE="<% $svc_acct->$xid() %>">
       </TD>
     </TR>
-  
-  <% } %>
-
-<% } %>
-
-
-<%
-#finger
-if ( $part_svc->part_svc_column('uid')->columnflag eq 'F'
-     && ! $svc_acct->finger ) { 
-%>
+% } 
+% } 
+%
+%#finger
+%if ( $part_svc->part_svc_column('uid')->columnflag eq 'F'
+%     && ! $svc_acct->finger ) { 
+%
 
   <INPUT TYPE="hidden" NAME="finger" VALUE="">
+% } else { 
 
-<% } else { %>
 
   <TR>
-    <TD ALIGN="right">GECOS</TD>
+    <TD ALIGN="right"><% mt('Real Name') |h %></TD>
     <TD>
-      <INPUT TYPE="text" NAME="finger" VALUE="<%= $svc_acct->finger %>">
+      <INPUT TYPE="text" NAME="finger" VALUE="<% $svc_acct->finger %>">
     </TD>
   </TR>
-
-<% } %>
+% } 
+%
+%#dir
+%if ( $part_svc->part_svc_column('dir')->columnflag eq 'F'
+%     || !$curuser->access_right('Edit home dir')
+%   ) { 
 
 
-<INPUT TYPE="hidden" NAME="dir" VALUE="<%= $svc_acct->dir %>">
+<INPUT TYPE="hidden" NAME="dir" VALUE="<% $svc_acct->dir %>">
+% } else {
 
 
-<%
-#shell
-my $shell = $svc_acct->shell;
-if ( $part_svc->part_svc_column('shell')->columnflag eq 'F'
-     || ( !$shell && $part_svc->part_svc_column('uid')->columnflag eq 'F' )
-   ) {
-%>
+  <TR>
+    <TD ALIGN="right"><% mt('Home directory') |h %></TD>
+    <TD><INPUT TYPE="text" NAME="dir" VALUE="<% $svc_acct->dir %>"></TD>
+  </TR>
+% } 
+%
+%#shell
+%my $shell = $svc_acct->shell;
+%if ( $part_svc->part_svc_column('shell')->columnflag eq 'F'
+%     || ( !$shell && $part_svc->part_svc_column('uid')->columnflag eq 'F' )
+%   ) {
+%
 
-  <INPUT TYPE="hidden" NAME="shell" VALUE="<%= $shell %>">
+  <INPUT TYPE="hidden" NAME="shell" VALUE="<% $shell %>">
+% } else { 
 
-<% } else { %>
 
   <TR>
-    <TD ALIGN="right">Shell</TD>
+    <TD ALIGN="right"><% mt('Shell') |h %></TD>
     <TD>
       <SELECT NAME="shell" SIZE=1>
+%
+%           my($etc_shell);
+%           foreach $etc_shell (@shells) {
+%        
 
-        <%
-           my($etc_shell);
-           foreach $etc_shell (@shells) {
-        %>
+          <OPTION<% $etc_shell eq $shell ? ' SELECTED' : '' %>><% $etc_shell %>
+% } 
 
-          <OPTION<%= $etc_shell eq $shell ? ' SELECTED' : '' %>><%= $etc_shell %>
-
-        <% } %>
 
       </SELECT>
     </TD>
   </TR>
+% } 
 
-<% } %>
+<& svc_acct/communigate.html,
+             'svc_acct'    => $svc_acct,
+             'part_svc'    => $part_svc,
+             'communigate' => $communigate,
+&>
 
+% if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) { 
+  <INPUT TYPE="hidden" NAME="slipip" VALUE="<% $svc_acct->slipip %>">
+% } else { 
+  <TR>
+    <TD ALIGN="right"><% mt('IP') |h %></TD>
+    <TD><INPUT TYPE="text" NAME="slipip" VALUE="<% $svc_acct->slipip %>"></TD>
+  </TR>
+% } 
+
+% 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') ) { 
+  <TR>
+    <TD ALIGN="right"><% mt("[_1] remaining",$label{$uf}) |h %> </TD>
+    <TD><INPUT TYPE="text" NAME="<% $uf %>" VALUE="<% $svc_acct->$uf %>">(<% mt('blank disables') |h %>)</TD>
+  </TR>
+  <TR>
+    <TD ALIGN="right"><% mt("[_1] threshold",$label{$uf}) |h %> </TD>
+    <TD><INPUT TYPE="text" NAME="<% $tf %>" VALUE="<% $svc_acct->$tf %>">(<% mt('blank disables') |h %>)</TD>
+  </TR>
+%   }else{
+      <INPUT TYPE="hidden" NAME="<% $uf %>" VALUE="<% $svc_acct->$uf %>">
+      <INPUT TYPE="hidden" NAME="<% $tf %>" VALUE="<% $svc_acct->$tf %>">
+%   } 
+% }
+%
+%foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
+%  $r =~ /^^r(adius|[cr])_(.+)$/ or next; #?
+%  my $a = $2;
+%
+% if ( $part_svc->part_svc_column($r)->columnflag =~ /^[FA]$/ ) { 
+
+    <INPUT TYPE="hidden" NAME="<% $r %>" VALUE="<% $svc_acct->getfield($r) %>">
+% } else { 
 
-<% if ( $part_svc->part_svc_column('quota')->columnflag eq 'F' ) { %>
+    <TR>
+      <TD ALIGN="right"><% $FS::raddb::attrib{$a} %></TD>
+      <TD><INPUT TYPE="text" NAME="<% $r %>" VALUE="<% $svc_acct->getfield($r) %>"></TD>
+    </TR>
+% } 
+% } 
 
-  <INPUT TYPE="hidden" NAME="quota" VALUE="<%= $svc_acct->quota %>">
 
-<% } else { %>
+<TR>
+  <TD ALIGN="right"><% mt('RADIUS groups') |h %></TD>
+% if ( $part_svc_usergroup->columnflag eq 'F' ) { 
+    <TD BGCOLOR="#eeeeee"><% join('<BR>', @groupnames) %></TD>
+% } else { 
+%   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;
+%   }
+    <TD><& /elements/select-radius_group.html, 
+                curr_value => $radius_group_selected,
+                element_name => 'radius_usergroup',
+                multiple => 1,
+        &>
+    </TD>
+% } 
 
-  <TR>
-    <TD ALIGN="right">Quota:</TD>
-    <TD><INPUT TYPE="text" NAME="quota" VALUE="<%= $svc_acct->quota %>"></TD>
-  </TR>
+</TR>
+% 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)) %>
+% } 
+% } 
   
-<% } %>
+</TABLE>
+<BR>
 
+% if ( $captcha_url ) {
+<IMG SRC="<% $captcha_url %>"><BR>
+<% mt('Enter the word shown above:') |h %> <INPUT TYPE="text" NAME="captcha_response"><BR>
+<BR>
+% }
 
-<% if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) { %>
+<INPUT TYPE="submit" VALUE="Submit">
 
-  <INPUT TYPE="hidden" NAME="slipip" VALUE="<%= $svc_acct->slipip %>">
+</FORM>
 
-<% } else { %>
+<& /elements/footer.html &>
 
-  <TR>
-    <TD ALIGN="right">IP</TD>
-    <TD><INPUT TYPE="text" NAME="slipip" VALUE="<%= $svc_acct->slipip %>"></TD>
-  </TR>
+<%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');
 
-<%
-foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
-  $r =~ /^^r(adius|[cr])_(.+)$/ or next; #?
-  my $a = $2;
-%>
+my $curuser = $FS::CurrentUser::CurrentUser;
 
-  <% if ( $part_svc->part_svc_column($r)->columnflag =~ /^[FA]$/ ) { %>
+my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct, @groups);
+if ( $cgi->param('error') ) {
 
-    <INPUT TYPE="hidden" NAME="<%= $r %>" VALUE="<%= $svc_acct->getfield($r) %>">
+  $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');
 
-  <% } else { %>
+} elsif ( $cgi->param('pkgnum') && $cgi->param('svcpart') ) { #adding
 
-    <TR>
-      <TD ALIGN="right"><%= $FS::raddb::attrib{$a} %></TD>
-      <TD><INPUT TYPE="text" NAME="<%= $r %>" VALUE="<%= $svc_acct->getfield($r) %>"></TD>
-    </TR>
+  $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='';
 
-<TR>
-  <TD ALIGN="right">RADIUS groups</TD>
+  $svc_acct->password_recover('Y'); #default. hmm.
 
-  <% if ( $part_svc->part_svc_column('usergroup')->columnflag eq 'F' ) { %>
+} else { #editing
 
-    <TD BGCOLOR="#eeeeee"><%= join('<BR>', @groups) %></TD>
+  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!";
 
-  <% } else { %>
+  my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+    or die "Unknown (cust_svc) svcnum!";
 
-    <TD><%= FS::svc_acct::radius_usergroup_selector( \@groups ) %></TD>
+  $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;
 
-</TR>
+  @groups = $svc_acct->radius_groups;
 
-<% 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' ) { %>
+my $communigate = scalar($part_svc->part_export('communigate_pro'));
+                # || scalar($part_svc->part_export('communigate_pro_singledomain'));
 
-    <%= $svc_acct->pvf($field)->widget('HTML', 'edit', $svc_acct->getfield($field)) %>
+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
 
-<% } %>
-  
-</TABLE>
-<BR>
+  #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')
+      );
+    }
+  }
 
-<INPUT TYPE="submit" VALUE="Submit">
+  $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
+}
 
-</FORM></BODY></HTML>
+</%init>