X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=7e94df16dc65d50ebc9e6ace122c3ab5b94dc81b;hb=d0221fabd4656b3a04251ca6168cc45f54d23574;hp=e6d2b690fc46b81a6e818640d517977edf88f10e;hpb=f9938915b0df2609f41c24d761d607595d5d0a34;p=freeside.git
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index e6d2b690f..7e94df16d 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -157,17 +157,29 @@ Service #<% $svcnum %>
<% $domain %> |
+% if ( $svc_acct->pbxsvc ) {
+
+ PBX |
+ <% $svc_acct->pbx_title %> |
+
+%}
+
Password |
-% my $password = $svc_acct->_password;
+% my $password = $svc_acct->get_cleartext_password;
% if ( $password =~ /^\*\w+\* (.*)$/ ) {
% $password = $1;
%
(login disabled)
% }
-% if ( $conf->exists('showpasswords') ) {
+% if ( !$password and
+% $svc_acct->_password_encryption ne 'plain' and
+% $svc_acct->_password ) {
+ (<% uc($svc_acct->_password_encryption) %> encrypted)
+% }
+% elsif ( $conf->exists('showpasswords') ) {
<% encode_entities($password) %>
% } else {
@@ -214,7 +226,7 @@ Service #<% $svcnum %>
% if ($svc_acct->finger ne '') {
|
- GECOS |
+ Real Name |
<% $svc_acct->finger %> |
% }
@@ -260,7 +272,10 @@ Service #<% $svcnum %>
% my $tf = $uf . "_threshold";
% if ( $svc_acct->$uf ne '' ) {
% my $v = $uf eq 'seconds'
-% ? (($svc_acct->$uf < 0 ? '-' : ''). duration_exact($svc_acct->$uf) )
+% #? (($svc_acct->$uf < 0 ? '-' : ''). duration_exact($svc_acct->$uf) )
+% ? ($svc_acct->$uf < 0 ? '-' : '').
+% int(abs($svc_acct->$uf)/3600). "hr ".
+% sprintf("%02d",(abs($svc_acct->$uf)%3600)/60). "min"
% : FS::UI::bytecount::display_bytecount($svc_acct->$uf);
<% $ulabel{$uf} %> remaining |
@@ -351,7 +366,9 @@ my $svc_acct = qsearchs({
'table' => 'svc_acct',
'addl_from' => $addl_from,
'hashref' => { 'svcnum' => $svcnum },
- 'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+ 'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql(
+ 'null_right' => 'View/link unlinked services'
+ ),
});
die "Unknown svcnum" unless $svc_acct;