projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
undo damage from DBIx::DBSchema 0.37_03
[freeside.git]
/
httemplate
/
view
/
svc_acct.cgi
diff --git
a/httemplate/view/svc_acct.cgi
b/httemplate/view/svc_acct.cgi
index
ec22bd0
..
44a2aa6
100755
(executable)
--- a/
httemplate/view/svc_acct.cgi
+++ b/
httemplate/view/svc_acct.cgi
@@
-160,14
+160,19
@@
Service #<B><% $svcnum %></B>
<TR>
<TD ALIGN="right">Password</TD>
<TD BGCOLOR="#ffffff">
<TR>
<TD ALIGN="right">Password</TD>
<TD BGCOLOR="#ffffff">
-% my $password = $svc_acct->_password;
+% my $password = $svc_acct->
get_cleartext
_password;
% if ( $password =~ /^\*\w+\* (.*)$/ ) {
% $password = $1;
%
<I>(login disabled)</I>
% }
% if ( $password =~ /^\*\w+\* (.*)$/ ) {
% $password = $1;
%
<I>(login disabled)</I>
% }
-% if ( $conf->exists('showpasswords') ) {
+% if ( !$password and
+% $svc_acct->_password_encryption ne 'plain' and
+% $svc_acct->_password ) {
+ <I>(<% uc($svc_acct->_password_encryption) %> encrypted)</I>
+% }
+% elsif ( $conf->exists('showpasswords') ) {
<PRE><% encode_entities($password) %></PRE>
% } else {
<PRE><% encode_entities($password) %></PRE>
% } else {
@@
-214,7
+219,7
@@
Service #<B><% $svcnum %></B>
% if ($svc_acct->finger ne '') {
<TR>
% if ($svc_acct->finger ne '') {
<TR>
- <TD ALIGN="right">
GECOS
</TD>
+ <TD ALIGN="right">
Real Name
</TD>
<TD BGCOLOR="#ffffff"><% $svc_acct->finger %></TD>
</TR>
% }
<TD BGCOLOR="#ffffff"><% $svc_acct->finger %></TD>
</TR>
% }
@@
-354,7
+359,9
@@
my $svc_acct = qsearchs({
'table' => 'svc_acct',
'addl_from' => $addl_from,
'hashref' => { 'svcnum' => $svcnum },
'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;
});
die "Unknown svcnum" unless $svc_acct;