wtf?

[freeside.git] / httemplate / edit / svc_acct.cgi

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index f42c146..f9c4074 100755 (executable)
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -134,7 +134,8 @@
 % } 
 % 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") %>
   <BR>
 % } 
 
@@ -160,6 +161,7 @@ Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
   </TD>
 </TR>
 
+%if ( $part_svc->part_svc_column('_password')->columnflag ne 'F' ) {
 <TR>
   <TD ALIGN="right">Password</TD>
   <TD>
@@ -167,9 +169,13 @@ Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
     (blank to generate)
   </TD>
 </TR>
+%}else{
+    <INPUT TYPE="hidden" NAME="_password" VALUE="<% $password %>">
+%}
 %
 %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' ) {
 %
 
 
@@ -325,10 +331,22 @@ Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
     </TD>
   </TR>
 % } 
-
+%
+%#dir
+%if ( $part_svc->part_svc_column('dir')->columnflag eq 'F'
+%     || !$curuser->access_right('Edit home dir')
+%   ) { 
 
 
 <INPUT TYPE="hidden" NAME="dir" VALUE="<% $svc_acct->dir %>">
+% } else {
+
+
+  <TR>
+    <TD ALIGN="right">Home directory</TD>
+    <TD><INPUT TYPE="text" NAME="dir" VALUE="<% $svc_acct->dir %>"></TD>
+  </TR>
+% } 
 %
 %#shell
 %my $shell = $svc_acct->shell;
@@ -385,23 +403,27 @@ Service # <% $svcnum ? "<B>$svcnum</B>" : " (NEW)" %><BR>
   </TR>
 % } 
 %
-% if ( $curuser->access_right('Edit usage') ) { 
-%   my %label = ( seconds => 'Seconds',
-%                 upbytes => 'Upload bytes',
-%                 downbytes => 'Download bytes',
-%                 totalbytes => 'Total bytes',
-%               );
-%   foreach my $uf (keys %label) {
-%     my $tf = $uf . "_threshold";
-%     if ( $svc_acct->$tf ne '' ) { 
-
+% 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') ) { 
   <TR>
     <TD ALIGN="right"><% $label{$uf} %> remaining</TD>
-    <TD><INPUT TYPE="text" NAME="<% $uf %>" VALUE="<% $svc_acct->$uf %>"></TD>
+    <TD><INPUT TYPE="text" NAME="<% $uf %>" VALUE="<% $svc_acct->$uf %>">(blank disables)</TD>
   </TR>
-%     } 
+  <TR>
+    <TD ALIGN="right"><% $label{$uf} %> threshold</TD>
+    <TD><INPUT TYPE="text" NAME="<% $tf %>" VALUE="<% $svc_acct->$tf %>">(blank disables)</TD>
+  </TR>
+%   }else{
+      <INPUT TYPE="hidden" NAME="<% $uf %>" VALUE="<% $svc_acct->$uf %>">
+      <INPUT TYPE="hidden" NAME="<% $tf %>" VALUE="<% $svc_acct->$tf %>">
 %   } 
-% } 
+% }
 %
 %foreach my $r ( grep { /^r(adius|[cr])_/ } fields('svc_acct') ) {
 %  $r =~ /^^r(adius|[cr])_(.+)$/ or next; #?