X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_acct.cgi;h=5c2d5f4952ebcfdbc8c7a7f4459f295d721bad89;hb=b4f0a47a6893de5f6b11f32307a0195f43a359fb;hp=d4c9a738dc4043053c0f54fcb0d16256b700a9ba;hpb=f4ea75e514763082b64e1b3654cfbbba2ddf1c01;p=freeside.git
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index d4c9a738d..5c2d5f495 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,11 +1,630 @@
-
-<%
+<% include('/elements/header.html', "$action $svc account") %>
+
+<% include('/elements/error.html') %>
+
+% if ( $cust_main ) {
+
+ <% include( '/elements/small_custview.html', $cust_main, '', 1,
+ popurl(2) . "view/cust_main.cgi") %>
+
+% }
+
+
+
+
+
+<% include('/elements/footer.html') %>
+
+<%init>
+
+die "access denied"
+ unless $FS::CurrentUser::CurrentUser->access_right('Provision customer service'); #something else more specific?
my $conf = new FS::Conf;
my @shells = $conf->config('shells');
+my $curuser = $FS::CurrentUser::CurrentUser;
+
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')
} );
@@ -15,270 +634,121 @@ if ( $cgi->param('error') ) {
$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;
- $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svcnum})
- or die "Unknown (svc_acct) svcnum!";
- my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
- or die "Unknown (cust_svc) svcnum!";
+} elsif ( $cgi->param('pkgnum') && $cgi->param('svcpart') ) { #adding
- $pkgnum=$cust_svc->pkgnum;
- $svcpart=$cust_svc->svcpart;
+ $cgi->param('pkgnum') =~ /^(\d+)$/ or die 'unparsable pkgnum';
+ $pkgnum = $1;
+ $cgi->param('svcpart') =~ /^(\d+)$/ or die 'unparsable svcpart';
+ $svcpart = $1;
- $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
- die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
+ $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+ die "No part_svc entry!" unless $part_svc;
- @groups = $svc_acct->radius_groups;
+ $svc_acct = new FS::svc_acct({svcpart => $svcpart});
- } else { #adding
+ $svcnum='';
- $svc_acct = new FS::svc_acct({});
-
- 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 for svcpart $svcpart!" unless $part_svc;
-
- $svcnum='';
-
- #set gecos
- my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
- if ($cust_pkg) {
- my($cust_main)=qsearchs('cust_main',{'custnum'=> $cust_pkg->custnum } );
- unless ( $part_svc->part_svc_column('uid')->columnflag eq 'F' ) {
- $svc_acct->setfield('finger',
- $cust_main->getfield('first') . " " . $cust_main->getfield('last')
- );
- }
- }
+ $svc_acct->password_recover('Y'); #default. hmm.
- #set fixed and default fields from part_svc
- foreach my $part_svc_column (
- grep { $_->columnflag } $part_svc->all_part_svc_column
- ) {
- 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,
- );
- }
- }
+} else { #editing
- }
-}
+ my($query) = $cgi->keywords;
+ $query =~ /^(\d+)$/ or die "unparsable svcnum";
+ $svcnum=$1;
+ $svc_acct=qsearchs('svc_acct',{'svcnum'=>$svcnum})
+ or die "Unknown (svc_acct) svcnum!";
-#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($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+ or die "Unknown (cust_svc) svcnum!";
-my $action = $svcnum ? 'Edit' : 'Add';
+ $pkgnum=$cust_svc->pkgnum;
+ $svcpart=$cust_svc->svcpart;
-my $svc = $part_svc->getfield('svc');
+ $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
+ die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
-my $otaker = getotaker;
+ @groups = $svc_acct->radius_groups;
-my $username = $svc_acct->username;
-my $password;
-if ( $svc_acct->_password ) {
- if ( $conf->exists('showpasswords') || ! $svcnum ) {
- $password = $svc_acct->_password;
- } else {
- $password = "*HIDDEN*";
- }
-} else {
- $password = '';
}
-my $ulen = $conf->config('usernamemax')
- || $svc_acct->dbdef_table->column('username')->length;
-my $ulen2 = $ulen+2;
+my $communigate = scalar($part_svc->part_export('communigate_pro'));
+ # || scalar($part_svc->part_export('communigate_pro_singledomain'));
-my $pmax = $conf->config('passwordmax') || 8;
-my $pmax2 = $pmax+2;
-
-my $p1 = popurl(1);
-print header("$action $svc account");
-
-print qq!Error: !, $cgi->param('error'),
- "
"
- if $cgi->param('error');
-
-print 'Service # '. ( $svcnum ? "$svcnum" : " (NEW)" ). '
'.
- 'Service: '. $part_svc->svc. '
'.
- <
-
-
-
-END
-
-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!!;
+my( $cust_pkg, $cust_main ) = ( '', '' );
+if ( $pkgnum ) {
+ $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
+ $cust_main = $cust_pkg->cust_main;
}
-#domain
-my $domsvc = $svc_acct->domsvc || 0;
-if ( $part_svc->part_svc_column('domsvc')->columnflag eq 'F' ) {
- print qq!!;
-} 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";
- }
- }
+unless ( $svcnum || $cgi->param('error') ) { #adding
- 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;
+ #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')
+ );
}
}
- my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
- 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 qq!Domain | !.
- qq! |
";
-}
+ $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 = ();
+ [];
+ }
+ }
+ } );
-#pop
-my $popnum = $svc_acct->popnum || 0;
-if ( $part_svc->part_svc_column('popnum')->columnflag eq "F" ) {
- print qq!!;
-} else {
- print qq!Access number | !.
- qq!!. FS::svc_acct_pop::popselector($popnum). ' |
';
}
-my($uid,$gid,$finger,$dir)=(
- $svc_acct->uid,
- $svc_acct->gid,
- $svc_acct->finger,
- $svc_acct->dir,
-);
-
-print <
-
-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"
- || ( !$shell && $part_svc->part_svc_column('uid')->columnflag eq 'F' )
- ) {
- print qq!!;
-} else {
- print qq!Shell | |
";
+#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($quota,$slipip)=(
- $svc_acct->quota,
- $svc_acct->slipip,
-);
+my $action = $svcnum ? 'Edit' : 'Add';
-print qq!!;
+my $svc = $part_svc->getfield('svc');
-if ( $part_svc->part_svc_column('slipip')->columnflag eq "F" ) {
- print qq!!;
-} else {
- print qq!IP | |
!;
-}
+my $otaker = getotaker;
-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} | |
';
+my $username = $svc_acct->username;
+
+my $password = '';
+if ( $cgi->param('error') ) {
+ $password = $cgi->param('clear_password');
+} elsif ( $svcnum ) {
+ my $password_encryption = $svc_acct->_password_encryption;
+ if ( $password = $svc_acct->get_cleartext_password ) {
+ $password = '*HIDDEN*' unless $conf->exists('showpasswords');
+ } elsif( $svc_acct->_password and $password_encryption ne 'plain' ) {
+ $password = "(".uc($password_encryption)." encrypted)";
}
}
-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 ' |
';
+my $ulen =
+ $conf->exists('usernamemax')
+ ? $conf->config('usernamemax')
+ : dbdef->table('svc_acct')->column('username')->length;
+my $ulen2 = $ulen+2;
-#submit
-print qq!
!;
+my $pmax = max($conf->config('passwordmax') || 13);
+my $pmax2 = $pmax+2;
-print <
-