+print &ntable("#cccccc",2), <Username |
|
Password |
-
+ |
(blank to generate) |
END
+my $sec_phrase = $svc_acct->sec_phrase;
+if ( $conf->exists('security_phrase') ) {
+ print <Security phrase |
+
+ (for forgotten passwords) |
+ |
+END
+} else {
+ print qq!!;
+}
+
#domain
-$domsvc = $svc_acct->domsvc || 0;
+my $domsvc = $svc_acct->domsvc || 0;
if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
print qq!!;
} else {
@@ -155,7 +169,7 @@ if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
}
my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
- if ($cust_pkg) {
+ if ($cust_pkg && !$conf->exists('svc_acct-alldomains') ) {
my @cust_svc =
map { qsearch('cust_svc', { 'pkgnum' => $_->pkgnum } ) }
qsearch('cust_pkg', { 'custnum' => $cust_pkg->custnum } );
@@ -182,7 +196,7 @@ if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
}
#pop
-$popnum = $svc_acct->popnum || 0;
+my $popnum = $svc_acct->popnum || 0;
if ( $part_svc->part_svc_column('popnum')->columnflag eq "F" ) {
print qq!!;
} else {
@@ -190,7 +204,7 @@ if ( $part_svc->part_svc_column('popnum')->columnflag eq "F" ) {
qq!!. FS::svc_acct_pop::popselector($popnum). ' | ';
}
-($uid,$gid,$finger,$dir)=(
+my($uid,$gid,$finger,$dir)=(
$svc_acct->uid,
$svc_acct->gid,
$svc_acct->finger,
@@ -200,12 +214,20 @@ if ( $part_svc->part_svc_column('popnum')->columnflag eq "F" ) {
print <
-GECOS | |
-
END
-$shell = $svc_acct->shell;
-if ( $part_svc->part_svc_column('shell')->columnflag eq "F" ) {
+if ( !$finger && $part_svc->part_svc_column('uid')->columnflag eq 'F' ) {
+ print '';
+} else {
+ print 'GECOS | '.
+ qq! |
!;
+}
+print qq!!;
+
+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' )
+ ) {
print qq!!;
} else {
print qq!Shell | |
";
}
-($quota,$slipip)=(
+my($quota,$slipip)=(
$svc_acct->quota,
$svc_acct->slipip,
);
-print qq!!;
+if ( $part_svc->part_svc_column('quota')->columnflag eq "F" )
+{
+ print qq!!;
+} else {
+ print <Quota: |
+ |
+
+END
+}
if ( $part_svc->part_svc_column('slipip')->columnflag eq "F" ) {
print qq!!;
@@ -242,6 +273,14 @@ foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
}
}
+print 'RADIUS groups | ';
+if ( $part_svc->part_svc_column('usergroup')->columnflag eq "F" ) {
+ print ''. join(' ', @groups);
+} else {
+ print ' | '. &FS::svc_acct::radius_usergroup_selector( \@groups );
+}
+print ' |
';
+
#submit
print qq!
!;