X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_acct.cgi;h=14d6759dc87a6c897f209e1b20fa9ab3a564b8cd;hb=08dc9fe500cf44346e409fb8c75eda541300d64d;hp=7badfe6966e0d0efdf94faf06e9daebd1c26a50c;hpb=51984ac3d3da3006809c6866fdecd4ad83610731;p=freeside.git

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 7badfe696..14d6759dc 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,79 +1,23 @@
 <%
-#
-# $Id: svc_acct.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: svc_acct.cgi {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
-#        http://server.name/path/svc_acct.cgi? {svcnum} | pkgnum{pkgnum}-svcpart{svcpart}
-#
-# ivan@voicenet.com 96-dec-18
-#
-# rewrite ivan@sisd.com 98-mar-8
-#
-# Changes to allow page to work at a relative position in server
-# Changed 'password' to '_password' because Pg6.3 reserves the password word
-#       bmccane@maxbaud.net     98-apr-3
-#
-# use conf/shells and dbdef username length ivan@sisd.com 98-jul-13
-#
-# $Log: svc_acct.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.10  1999/04/14 11:27:06  ivan
-# showpasswords config option to show passwords
-#
-# Revision 1.9  1999/02/28 00:03:37  ivan
-# removed misleading comments
-#
-# Revision 1.8  1999/02/23 08:09:22  ivan
-# beginnings of one-screen new customer entry and some other miscellania
-#
-# Revision 1.7  1999/02/07 09:59:22  ivan
-# more mod_perl fixes, and bugfixes Peter Wemm sent via email
-#
-# Revision 1.6  1999/01/19 05:13:43  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.5  1999/01/18 09:41:32  ivan
-# all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl
-# (good idea anyway)
-#
-# Revision 1.4  1998/12/30 23:03:22  ivan
-# bugfixes; fields isn't exported by derived classes
-#
-# Revision 1.3  1998/12/17 06:17:08  ivan
-# fix double // in relative URLs, s/CGI::Base/CGI/;
-#
-
-use strict;
-use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart
-             $part_svc $svc $otaker $username $password $ulen $ulen2 $p1
-             $popnum $uid $gid $finger $dir $shell $quota $slipip );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup getotaker);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_acct;
-use FS::Conf;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-@shells = $conf->config('shells');
 
+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!" unless $part_svc;
+  $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;
@@ -86,50 +30,78 @@ if ( $cgi->param('error') ) {
     $pkgnum=$cust_svc->pkgnum;
     $svcpart=$cust_svc->svcpart;
 
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
+    $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
+    die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
 
-  } else { #adding
+    @groups = $svc_acct->radius_groups;
 
-    $svc_acct = new FS::svc_acct({}); 
+  } 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!" unless $part_svc;
+    $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='';
 
-    #set gecos
-    my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-    if ($cust_pkg) {
-      my($cust_main)=qsearchs('cust_main',{'custnum'=> $cust_pkg->custnum } );
+  }
+}
+
+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')
-      ) ;
+      );
     }
+  }
 
-    #set fixed and default fields from part_svc
-    my($field);
-    foreach $field ( fields('svc_acct') ) {
-      if ( $part_svc->getfield('svc_acct__'. $field. '_flag') ne '' ) {
-        $svc_acct->setfield($field,$part_svc->getfield('svc_acct__'. $field) );
-      }
+  $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 = ();
+                           [];
+                         }
     }
+  );
 
-  }
 }
-$action = $svcnum ? 'Edit' : 'Add';
 
-$svc = $part_svc->getfield('svc');
+#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';
 
-$otaker = getotaker;
+my $svc = $part_svc->getfield('svc');
 
-$username = $svc_acct->username;
+my $otaker = getotaker;
+
+my $username = $svc_acct->username;
+my $password;
 if ( $svc_acct->_password ) {
-  if ( $conf->exists('showpasswords') ) {
+  if ( $conf->exists('showpasswords') || ! $svcnum ) {
     $password = $svc_acct->_password;
   } else {
     $password = "*HIDDEN*";
@@ -138,95 +110,341 @@ if ( $svc_acct->_password ) {
   $password = '';
 }
 
-$ulen = $svc_acct->dbdef_table->column('username')->length;
-$ulen2 = $ulen+2;
+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;
 
-$p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("$action $svc account");
+my $p1 = popurl(1);
 
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
+%>
 
-print <<END;
-    <FORM 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">
-Username: 
-<INPUT TYPE="text" NAME="username" VALUE="$username" SIZE=$ulen2 MAXLENGTH=$ulen>
-<BR>Password: 
-<INPUT TYPE="text" NAME="_password" VALUE="$password" SIZE=10 MAXLENGTH=8> 
-(blank to generate)
-END
+<%= include("/elements/header.html","$action $svc account") %>
 
-#pop
-$popnum = $svc_acct->popnum || 0;
-if ( $part_svc->svc_acct__popnum_flag eq "F" ) {
-  print qq!<INPUT TYPE="hidden" NAME="popnum" VALUE="$popnum">!;
-} else { 
-  print qq!<BR>POP: <SELECT NAME="popnum" SIZE=1><OPTION>\n!;
-  my($svc_acct_pop);
-  foreach $svc_acct_pop ( qsearch ('svc_acct_pop',{} ) ) {
-  print "<OPTION", $svc_acct_pop->popnum == $popnum ? ' SELECTED' : '', ">", 
-        $svc_acct_pop->popnum, ": ", 
-        $svc_acct_pop->city, ", ",
-        $svc_acct_pop->state,
-        " (", $svc_acct_pop->ac, ")/",
-        $svc_acct_pop->exch, "\n"
-      ;
+<% 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) %>
+
+<TR>
+  <TD ALIGN="right">Service</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>
+</TR>
+
+<TR>
+  <TD ALIGN="right">Password</TD>
+  <TD>
+    <INPUT TYPE="text" NAME="_password" VALUE="<%= $password %>" SIZE=<%= $pmax2 %> MAXLENGTH=<%= $pmax %>>
+    (blank to generate)
+  </TD>
+</TR>
+
+
+<%
+my $sec_phrase = $svc_acct->sec_phrase;
+if ( $conf->exists('security_phrase') ) {
+%>
+
+  <TR>
+    <TD ALIGN="right">Security phrase</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="sec_phrase" VALUE="<%= $sec_phrase %>" SIZE=32>
+      (for forgotten passwords)
+    </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";
+    }
   }
-  print "</SELECT>";
-}
 
-($uid,$gid,$finger,$dir)=(
-  $svc_acct->uid,
-  $svc_acct->gid,
-  $svc_acct->finger,
-  $svc_acct->dir,
-);
-
-print <<END;
-<INPUT TYPE="hidden" NAME="uid" VALUE="$uid">
-<INPUT TYPE="hidden" NAME="gid" VALUE="$gid">
-<BR>GECOS: <INPUT TYPE="text" NAME="finger" VALUE="$finger">
-<INPUT TYPE="hidden" NAME="dir" VALUE="$dir">
-END
-
-$shell = $svc_acct->shell;
-if ( $part_svc->svc_acct__shell_flag eq "F" ) {
-  print qq!<INPUT TYPE="hidden" NAME="shell" VALUE="$shell">!;
-} else {
-  print qq!<BR>Shell: <SELECT NAME="shell" SIZE=1>!;
-  my($etc_shell);
-  foreach $etc_shell (@shells) {
-    print "<OPTION", $etc_shell eq $shell ? ' SELECTED' : '', ">",
-          $etc_shell, "\n";
+  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', {} );
   }
-  print "</SELECT>";
-}
 
-($quota,$slipip)=(
-  $svc_acct->quota,
-  $svc_acct->slipip,
-);
+%>
 
-print qq!<INPUT TYPE="hidden" NAME="quota" VALUE="$quota">!;
+  <TR>
+    <TD ALIGN="right">Domain</TD>
+    <TD>
+      <SELECT NAME="domsvc" SIZE=1>
 
-if ( $part_svc->svc_acct__slipip_flag eq "F" ) {
-  print qq!<INPUT TYPE="hidden" NAME="slipip" VALUE="$slipip">!;
-} else {
-  print qq!<BR>IP: <INPUT TYPE="text" NAME="slipip" VALUE="$slipip">!;
-}
+        <% foreach my $svcnum (
+             sort { $svc_domain{$a}->domain cmp $svc_domain{$b}->domain }
+                  keys %svc_domain
+           ) {
+             my $svc_domain = $svc_domain{$svcnum};
+        %>
+
+             <OPTION VALUE="<%= $svc_domain->svcnum %>" <%= $svc_domain->svcnum == $domsvc ? ' SELECTED' : '' %>><%= $svc_domain->domain %>
+
+       <% } %>
+      </SELECT>
+    </TD>
+  </TR>
+
+<% } %>
 
-#submit
-print qq!<P><INPUT TYPE="submit" VALUE="Submit">!; 
 
-print <<END;
-    </FORM>
-  </BODY>
-</HTML>
-END
+<%
+#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 { %>
+
+  <TR>
+    <TD ALIGN="right">Access number</TD>
+    <TD><%= FS::svc_acct_pop::popselector($popnum) %></TD>
+  </TR>
+
+<% } %>
+
+
+<% #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()) ) { %>
+  
+      <TR>
+        <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 { %>
+  
+    <TR>
+      <TD ALIGN="right"><%= uc($xid) %></TD>
+      <TD>
+        <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 ) { 
+%>
 
+  <INPUT TYPE="hidden" NAME="finger" VALUE="">
 
+<% } else { %>
+
+  <TR>
+    <TD ALIGN="right">GECOS</TD>
+    <TD>
+      <INPUT TYPE="text" NAME="finger" VALUE="<%= $svc_acct->finger %>">
+    </TD>
+  </TR>
+
+<% } %>
+
+
+<INPUT TYPE="hidden" NAME="dir" VALUE="<%= $svc_acct->dir %>">
+
+
+<%
+#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 %>">
+
+<% } else { %>
+
+  <TR>
+    <TD ALIGN="right">Shell</TD>
+    <TD>
+      <SELECT NAME="shell" SIZE=1>
+
+        <%
+           my($etc_shell);
+           foreach $etc_shell (@shells) {
+        %>
+
+          <OPTION<%= $etc_shell eq $shell ? ' SELECTED' : '' %>><%= $etc_shell %>
+
+        <% } %>
+
+      </SELECT>
+    </TD>
+  </TR>
+
+<% } %>
+
+
+<% if ( $part_svc->part_svc_column('quota')->columnflag eq 'F' ) { %>
+
+  <INPUT TYPE="hidden" NAME="quota" VALUE="<%= $svc_acct->quota %>">
+
+<% } else { %>
+
+  <TR>
+    <TD ALIGN="right">Quota:</TD>
+    <TD><INPUT TYPE="text" NAME="quota" VALUE="<%= $svc_acct->quota %>"></TD>
+  </TR>
+  
+<% } %>
+
+
+<% if ( $part_svc->part_svc_column('slipip')->columnflag =~ /^[FA]$/ ) { %>
+
+  <INPUT TYPE="hidden" NAME="slipip" VALUE="<%= $svc_acct->slipip %>">
+
+<% } else { %>
+
+  <TR>
+    <TD ALIGN="right">IP</TD>
+    <TD><INPUT TYPE="text" NAME="slipip" VALUE="<%= $svc_acct->slipip %>"></TD>
+  </TR>
+
+<% } %>
+
+
+<%
+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 { %>
+
+    <TR>
+      <TD ALIGN="right"><%= $FS::raddb::attrib{$a} %></TD>
+      <TD><INPUT TYPE="text" NAME="<%= $r %>" VALUE="<%= $svc_acct->getfield($r) %>"></TD>
+    </TR>
+
+  <% } %>
+
+<% } %>
+
+
+<TR>
+  <TD ALIGN="right">RADIUS groups</TD>
+
+  <% if ( $part_svc->part_svc_column('usergroup')->columnflag eq 'F' ) { %>
+
+    <TD BGCOLOR="#eeeeee"><%= join('<BR>', @groups) %></TD>
+
+  <% } else { %>
+
+    <TD><%= FS::svc_acct::radius_usergroup_selector( \@groups ) %></TD>
+
+  <% } %>
+
+</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>
+
+<INPUT TYPE="submit" VALUE="Submit">
+
+</FORM></BODY></HTML>