X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_acct.cgi;h=4bc81c9fdb82bd5ebaeceebae439eca7ec94b4e5;hb=ddb53fcc9fc80561354b97e4e7803004990138d0;hp=5847270010696647e9c38bf0eef1fae5d3147d78;hpb=eb75efa2c03350afff1fa29f8d4c8c6b3827900a;p=freeside.git diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi index 584727001..4bc81c9fd 100755 --- a/httemplate/edit/svc_acct.cgi +++ b/httemplate/edit/svc_acct.cgi @@ -1,25 +1,10 @@ + <% - - -use strict; -use vars qw( $conf $cgi @shells $action $svcnum $svc_acct $pkgnum $svcpart - $part_svc $svc $otaker $username $password $ulen $ulen2 $p1 - $popnum $domsvc $uid $gid $finger $dir $shell $quota $slipip - @svc_domain ); -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); if ( $cgi->param('error') ) { $svc_acct = new FS::svc_acct ( { map { $_, scalar($cgi->param($_)) } fields('svc_acct') @@ -68,24 +53,26 @@ if ( $cgi->param('error') ) { } #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) ); - } + foreach my $part_svc_column ( + grep { $_->columnflag } $part_svc->all_part_svc_column + ) { + $svc_acct->setfield( $part_svc_column->columnname, + $part_svc_column->columnvalue, + ); } } } -$action = $svcnum ? 'Edit' : 'Add'; +my $action = $svcnum ? 'Edit' : 'Add'; -$svc = $part_svc->getfield('svc'); +my $svc = $part_svc->getfield('svc'); -$otaker = getotaker; +my $otaker = getotaker; -$username = $svc_acct->username; +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*"; @@ -94,76 +81,103 @@ if ( $svc_acct->_password ) { $password = ''; } -$ulen = $svc_acct->dbdef_table->column('username')->length; -$ulen2 = $ulen+2; +my $ulen = $svc_acct->dbdef_table->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 header("$action $svc account"); print qq!Error: !, $cgi->param('error'), - "" + "" if $cgi->param('error'); -print <$svcnum" : " (NEW)" ). ''. + 'Service: '. $part_svc->svc. ''. + < -Username: - -Password: - -(blank to generate) +END + +print &itable("#cccccc",2), < +Username + +Password + +(blank to generate) + END #domain -$domsvc = $svc_acct->domsvc || 0; -if ( $part_svc->svc_acct__domsvc_flag eq "F" ) { +my $domsvc = $svc_acct->domsvc || 0; +if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) { print qq!!; } else { - my @svc_domain = (); + 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; + } + } + my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } ); if ($cust_pkg) { my @cust_svc = map { qsearch('cust_svc', { 'pkgnum' => $_->pkgnum } ) } qsearch('cust_pkg', { 'custnum' => $cust_pkg->custnum } ); foreach my $cust_svc ( @cust_svc ) { - $svc_domain = qsearchs('svc_domain', { 'svcnum' => $_->svcnum } ); - push @svc_domain, $svc_domain if $svc_domain; + my $svc_domain = + qsearchs('svc_domain', { 'svcnum' => $cust_svc->svcnum } ); + $svc_domain{$svc_domain->svcnum} = $svc_domain if $svc_domain; } } else { - @svc_domain = qsearch('svc_domain', {} ); + %svc_domain = map { $_->svcnum => $_ } qsearch('svc_domain', {} ); } - print qq!Domain: \n!; - foreach my $svc_domain ( sort { $a->domain cmp $b->domain } @svc_domain ) { - print qq!svcnum == $domsvc ? ' SELECTED' : '', - ">", $svc_domain->domain, "\n" - ; + print qq!Domain!. + qq!\n!; + foreach my $svcnum ( + sort { $svc_domain{$a}->domain cmp $svc_domain{$b}->domain } + keys %svc_domain + ) { + my $svc_domain = $svc_domain{$svcnum}; + print qq!svcnum == $domsvc ? ' SELECTED' : '' ). + '>'. $svc_domain->domain. "\n" ; } - print ""; + print ""; } #pop -$popnum = $svc_acct->popnum || 0; -if ( $part_svc->svc_acct__popnum_flag eq "F" ) { +my $popnum = $svc_acct->popnum || 0; +if ( $part_svc->part_svc_column('popnum')->columnflag eq "F" ) { print qq!!; } else { - print qq!POP: \n!; - my($svc_acct_pop); - foreach $svc_acct_pop ( qsearch ('svc_acct_pop',{} ) ) { - print "popnum == $popnum ? ' SELECTED' : '', ">", - $svc_acct_pop->popnum, ": ", - $svc_acct_pop->city, ", ", - $svc_acct_pop->state, - " (", $svc_acct_pop->ac, ")/", - $svc_acct_pop->exch, "\n" - ; - } - print ""; + print qq!Access number!. + 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, @@ -173,38 +187,50 @@ if ( $part_svc->svc_acct__popnum_flag eq "F" ) { print < -GECOS: +GECOS END -$shell = $svc_acct->shell; -if ( $part_svc->svc_acct__shell_flag eq "F" ) { +my $shell = $svc_acct->shell; +if ( $part_svc->part_svc_column('shell')->columnflag eq "F" ) { print qq!!; } else { - print qq!Shell: !; + print qq!Shell!; my($etc_shell); foreach $etc_shell (@shells) { print "", $etc_shell, "\n"; } - print ""; + print ""; } -($quota,$slipip)=( +my($quota,$slipip)=( $svc_acct->quota, $svc_acct->slipip, ); print qq!!; -if ( $part_svc->svc_acct__slipip_flag eq "F" ) { +if ( $part_svc->part_svc_column('slipip')->columnflag eq "F" ) { print qq!!; } else { - print qq!IP: !; + print qq!IP!; +} + +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 eq 'F' ) { + print qq!'; + } else { + print qq!$FS::raddb::attrib{$a}'; + } } #submit -print qq!!; +print qq!!; print <
!; +print qq!!; print <