Author: jsuchome
Date: Wed Mar 26 10:56:39 2008
New Revision: 45729
URL: http://svn.opensuse.org/viewcvs/yast?rev=45729&view=rev
Log:
installation proposal: show full name and encryption method
Modified:
trunk/users/src/users_proposal.ycp
Modified: trunk/users/src/users_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users_proposal.ycp?rev=45729&r1=45728&r2=45729&view=diff
==============================================================================
--- trunk/users/src/users_proposal.ycp (original)
+++ trunk/users/src/users_proposal.ycp Wed Mar 26 10:56:39 2008
@@ -27,6 +27,16 @@
"edir_ldap": _("eDirectory LDAP"),
];
+ map encoding2label = $[
+ // encryption type
+ "des" : _("DES"),
+ // encryption type
+ "md5" : _("MD5"),
+ // encryption type
+ "blowfish" : _("Blowfish"),
+ ];
+
+
if ( func == "MakeProposal" )
{
boolean force_reset = param["force_reset" ]:false;
@@ -58,12 +68,24 @@
else if (user["uid"]:"" != "")
{
// summary line: <%1>-<%2> are HTML tags, leave untouched,
- // %3 is user name
+ // %3 is login name
prop = sformat (_("<%1>User<%2> %3 configured"),
ahref, "/a", user["uid"]:"");
+ if (user["cn"]:"" != "")
+ // summary line: <%1>-<%2> are HTML tags, leave untouched,
+ // %3 is full name, %4 login name
+ prop = sformat (_("<%1>User<%2> %3 (%4) configured"),
+ ahref, "/a", user["cn"]:"", user["uid"]:"");
+ }
+ string rest = "";
+ if (UsersSimple::EncryptionMethod () != "blowfish")
+ {
+ // summary line
+ rest = sformat (_("Password Encrypttion Method: %1"),
+ encoding2label[UsersSimple::EncryptionMethod ()]:"");
}
ret = $[
- "preformatted_proposal" : HTML::List ([ prop, root_proposal ]),
+ "preformatted_proposal" : HTML::List ([ prop, root_proposal, rest]),
"language_changed" : false,
"links" : [ "users--user", "users--root" ],
];
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
