summaryrefslogtreecommitdiff
path: root/httemplate/view
diff options
context:
space:
mode:
authormark <mark>2009-12-23 00:30:26 +0000
committermark <mark>2009-12-23 00:30:26 +0000
commit085516df97471506ac68d1fdd015ea6a33bb38bd (patch)
treed94cd1bdfebe69f0d9ddcf87ffc673549ad843bc /httemplate/view
parentd3916ae37c77a9bd8a9f1a33e0e9679b143d9fdf (diff)
Tweak set_password per RT#6358
Diffstat (limited to 'httemplate/view')
-rwxr-xr-xhttemplate/view/svc_acct.cgi9
1 files changed, 7 insertions, 2 deletions
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 6a47ec767..44a2aa611 100755
--- 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">
-% my $password = $svc_acct->_password;
+% my $password = $svc_acct->get_cleartext_password;
% 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 {