[freeside-commits] freeside/httemplate/view svc_acct.cgi, 1.59, 1.59.2.1

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/httemplate/view
In directory wavetail.420.am:/tmp/cvs-serv10130/httemplate/view

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	svc_acct.cgi 
Log Message:
Tweak set_password per RT#6358

Index: svc_acct.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/svc_acct.cgi,v
retrieving revision 1.59
retrieving revision 1.59.2.1
diff -u -d -r1.59 -r1.59.2.1
--- svc_acct.cgi	15 Apr 2009 05:52:09 -0000	1.59
+++ svc_acct.cgi	23 Dec 2009 00:30:26 -0000	1.59.2.1
@@ -160,14 +160,19 @@
 <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 {