- add message catalog table & beginning of web interface

[freeside.git] / httemplate / edit / svc_acct.cgi

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 6846b5c..540d04c 100755 (executable)
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -4,7 +4,7 @@
 my $conf = new FS::Conf;
 my @shells = $conf->config('shells');
 
-my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct);
+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')
@@ -14,6 +14,7 @@ if ( $cgi->param('error') ) {
   $svcpart = $cgi->param('svcpart');
   $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
   die "No part_svc entry!" unless $part_svc;
+  @groups = $cgi->param('radius_usergroup');
 } else {
   my($query) = $cgi->keywords;
   if ( $query =~ /^(\d+)$/ ) { #editing
@@ -30,6 +31,8 @@ if ( $cgi->param('error') ) {
     $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
     die "No part_svc entry!" unless $part_svc;
 
+    @groups = $svc_acct->radius_groups;
+
   } else { #adding
 
     $svc_acct = new FS::svc_acct({}); 
@@ -58,9 +61,13 @@ if ( $cgi->param('error') ) {
     foreach my $part_svc_column (
       grep { $_->columnflag } $part_svc->all_part_svc_column
     ) {
-      $svc_acct->setfield( $part_svc_column->columnname,
-                           $part_svc_column->columnvalue,
-                         );
+      if ( $part_svc_column->columnname eq 'usergroup' ) {
+        @groups = split(',', $part_svc_column->columnvalue);
+      } else {
+        $svc_acct->setfield( $part_svc_column->columnname,
+                             $part_svc_column->columnvalue,
+                           );
+      }
     }
 
   }
@@ -100,7 +107,7 @@ print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
 print 'Service # '. ( $svcnum ? "<B>$svcnum</B>" : " (NEW)" ). '<BR>'.
       'Service: <B>'. $part_svc->svc. '</B><BR><BR>'.
       <<END;
-    <FORM ACTION="${p1}process/svc_acct.cgi" METHOD=POST>
+    <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">
@@ -115,6 +122,15 @@ print &ntable("#cccccc",2), <<END;
 </TR>
 END
 
+if ( $conf->exists('security_phrase') ) {
+  print <<END;
+  <TR><TD ALIGN="right">Security phrase</TD>
+  <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="$sec_phrase" SIZE=32>
+    (for forgotten passwords)</TD>
+  </TD>
+END
+}
+
 #domain
 my $domsvc = $svc_acct->domsvc || 0;
 if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
@@ -239,9 +255,13 @@ foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
   }
 }
 
-print '<TR><TD ALIGN="right">RADIUS groups</TD><TD>'.
-      &FS::svc_acct::radius_usergroup_selector( [ $svc_acct->radius_groups ] ).
-      '</TD></TR>';
+print '<TR><TD ALIGN="right">RADIUS groups</TD>';
+if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) {
+  print '<TD BGCOLOR="#ffffff">'. join('<BR>', @groups);
+} else {
+  print '<TD>'. &FS::svc_acct::radius_usergroup_selector( \@groups );
+}
+print '</TD></TR>';
 
 #submit
 print qq!</TABLE><BR><INPUT TYPE="submit" VALUE="Submit">!;