X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_acct.cgi;h=b9a587d2a4c0574412bcea6d83bb4cb2bf3a3fae;hb=ad57c5c8513d0980165e3088518ddddeba0db633;hp=60ca24d3e6a37f85e1be479fe7a8d0b7078eddbd;hpb=3ce7691203a7737406bf2d4442f7fd84b81f847e;p=freeside.git
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 60ca24d3e..b9a587d2a 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,138 +1,11 @@
-%
-%
-%my $conf = new FS::Conf;
-%my @shells = $conf->config('shells');
-%
-%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')
-% } );
-% $svcnum = $svc_acct->svcnum;
-% $pkgnum = $cgi->param('pkgnum');
-% $svcpart = $cgi->param('svcpart');
-% $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!";
-%
-% $pkgnum=$cust_svc->pkgnum;
-% $svcpart=$cust_svc->svcpart;
-%
-% $part_svc = qsearchs( 'part_svc', { 'svcpart' => $svcpart } );
-% die "No part_svc entry for svcpart $svcpart!" unless $part_svc;
-%
-% @groups = $svc_acct->radius_groups;
-%
-% } 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 for svcpart $svcpart!" unless $part_svc;
-%
-% $svc_acct = new FS::svc_acct({svcpart => $svcpart});
-%
-% $svcnum='';
-%
-% }
-%}
-%
-%my( $cust_pkg, $cust_main ) = ( '', '' );
-%if ( $pkgnum ) {
-% $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $pkgnum } );
-% $cust_main = $cust_pkg->cust_main;
-%}
-%
-%unless ( $svcnum || $cgi->param('error') ) { #adding
-%
-% #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')
-% );
-% }
-% }
-%
-% $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 = ();
-% [];
-% }
-% }
-% } );
-%
-%}
-%
-%#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');
-%
-%my $otaker = getotaker;
-%
-%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->exists('usernamemax')
-% ? $conf->config('usernamemax')
-% : dbdef->table('svc_acct')->column('username')->length;
-%my $ulen2 = $ulen+2;
-%
-%my $pmax = $conf->config('passwordmax') || 8;
-%my $pmax2 = $pmax+2;
-%
-%my $p1 = popurl(1);
-%
-%
-
+<% include('/elements/header.html', "$action $svc account") %>
-<% include("/elements/header.html","$action $svc account") %>
-% if ( $cgi->param('error') ) {
+<% include('/elements/error.html') %>
- Error: <% $cgi->param('error') %>
-
-% }
% if ( $cust_main ) {
- <% include( '/elements/small_custview.html', $cust_main, '', 1 ) %>
+ <% include( '/elements/small_custview.html', $cust_main, '', 1,
+ popurl(2) . "view/cust_main.cgi") %>
% }
@@ -158,6 +31,7 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
+%if ( $part_svc->part_svc_column('_password')->columnflag ne 'F' ) {
| Password |
@@ -165,9 +39,13 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
(blank to generate)
|
+%}else{
+
+%}
%
%my $sec_phrase = $svc_acct->sec_phrase;
-%if ( $conf->exists('security_phrase') ) {
+%if ( $conf->exists('security_phrase')
+% && $part_svc->part_svc_column('sec_phrase')->columnflag ne 'F' ) {
%
@@ -204,31 +82,11 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% }
% }
%
-% 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;
-% }
-% }
-%
-% 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', {} );
-% }
-%
+% %svc_domain = (%svc_domain,
+% domain_select_hash FS::svc_acct('svcpart' => $svcpart,
+% 'pkgnum' => $pkgnum,
+% )
+% );
%
@@ -237,14 +95,14 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
@@ -310,16 +168,28 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
|
- | GECOS |
+ Real Name |
|
% }
-
+%
+%#dir
+%if ( $part_svc->part_svc_column('dir')->columnflag eq 'F'
+% || !$curuser->access_right('Edit home dir')
+% ) {
+% } else {
+
+
+
+ | Home directory |
+ |
+
+% }
%
%#shell
%my $shell = $svc_acct->shell;
@@ -376,6 +246,28 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
% }
%
+% my %label = ( seconds => 'Time',
+% upbytes => 'Upload bytes',
+% downbytes => 'Download bytes',
+% totalbytes => 'Total bytes',
+% );
+% foreach my $uf (keys %label) {
+% my $tf = $uf . "_threshold";
+% if ( $curuser->access_right('Edit usage') ) {
+
+ | <% $label{$uf} %> remaining |
+ (blank disables) |
+
+
+ | <% $label{$uf} %> threshold |
+ (blank disables) |
+
+% }else{
+
+
+% }
+% }
+%
%foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
% $r =~ /^^r(adius|[cr])_(.+)$/ or next; #?
% my $a = $2;
@@ -425,4 +317,136 @@ Service # <% $svcnum ? "$svcnum" : " (NEW)" %>
-