java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java | 9
+++++++++
1 file changed, 9 insertions(+)
New commits:
commit e0d234c0dea61fda4f7c992d03705dbf48a76bbc
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 15:43:07 2011 +0200
683200 - encode hostname to IDN in GeneralConfig.do page
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java
b/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java
index c655c69..4b713d5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java
@@ -31,6 +31,7 @@ import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.apache.struts.action.DynaActionForm;
+import java.net.IDN;
import java.util.Arrays;
import java.util.Iterator;
import java.util.LinkedList;
@@ -127,6 +128,9 @@ public class GeneralConfigAction extends BaseConfigAction {
else {
String value = (String)
form.get(translateFormPropertyName(configKey));
+ if (configKey.equals("server.jabber_server")) {
+ value = IDN.toASCII(value);
+ }
csc.updateString(configKey, value);
}
}
@@ -160,6 +164,11 @@ public class GeneralConfigAction extends BaseConfigAction {
translateFormPropertyName("server.satellite.http_proxy_password_confirm"),
configValue);
}
+ else if (configKey.equals("server.jabber_server")) {
+ form.set(
+ translateFormPropertyName("server.jabber_server"),
+ IDN.toUnicode(configValue));
+ }
}
}
}
Show replies by date