X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_acct.cgi;h=f1b8b800b3d6120be05abf387e898f9898f6d442;hp=681d8b5d9adb2eb67527d27be1b590d1ce6f8e36;hb=a5c64e8089d4e6c76ee070102e3a67baf1485181;hpb=1fd6d8cf5d7854860ef4fd10ed89828e0c04ec39 diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi index 681d8b5d9..f1b8b800b 100755 --- a/httemplate/edit/svc_acct.cgi +++ b/httemplate/edit/svc_acct.cgi @@ -1,10 +1,10 @@ - + <% 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') @@ -12,8 +12,9 @@ if ( $cgi->param('error') ) { $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 @@ -27,19 +28,21 @@ 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=''; @@ -47,22 +50,34 @@ if ( $cgi->param('error') ) { my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum}); if ($cust_pkg) { my($cust_main)=qsearchs('cust_main',{'custnum'=> $cust_pkg->custnum } ); - $svc_acct->setfield('finger', - $cust_main->getfield('first') . " " . $cust_main->getfield('last') - ) ; + 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 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, + ); + } } } } + +#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'); @@ -72,7 +87,7 @@ 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*"; @@ -81,7 +96,8 @@ if ( $svc_acct->_password ) { $password = ''; } -my $ulen = $svc_acct->dbdef_table->column('username')->length; +my $ulen = $conf->config('usernamemax') + || $svc_acct->dbdef_table->column('username')->length; my $ulen2 = $ulen+2; my $pmax = $conf->config('passwordmax') || 8; @@ -97,14 +113,13 @@ print qq!Error: !, $cgi->param('error'), print 'Service # '. ( $svcnum ? "$svcnum" : " (NEW)" ). '
'. 'Service: '. $part_svc->svc. '

'. < +
END -print &itable("#cccccc",2), < +print &ntable("#cccccc",2), <Username Password @@ -113,6 +128,18 @@ print &itable("#cccccc",2), < END +my $sec_phrase = $svc_acct->sec_phrase; +if ( $conf->exists('security_phrase') ) { + print <Security phrase + + (for forgotten passwords) + +END +} else { + print qq!!; +} + #domain my $domsvc = $svc_acct->domsvc || 0; if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) { @@ -142,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 } ); @@ -187,12 +214,20 @@ my($uid,$gid,$finger,$dir)=( print < -GECOS - END +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" ) { +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!; +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!!; @@ -229,6 +273,22 @@ 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 ''; + +foreach my $field ($svc_acct->virtual_fields) { + if ( $part_svc->part_svc_column($field)->columnflag ne 'F' ) { + # If the flag is X, it won't even show up in $svc_acct->virtual_fields. + print $svc_acct->pvf($field)->widget('HTML', 'edit', + $svc_acct->getfield($field)); + } +} + #submit print qq!
!;