You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/12/04 14:19:41 UTC
svn commit: r600928 - in
/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin:
groups/group-admin.js ipranges/iprange-admin.js users/overview.xsp
users/profile.xsp users/user-admin.js users/users.xsp
Author: andreas
Date: Tue Dec 4 05:19:40 2007
New Revision: 600928
URL: http://svn.apache.org/viewvc?rev=600928&view=rev
Log:
Change admin area XSPs to UTF-8, use request.getParameter() instead of request.get() in admin area flowscripts to get the string in the correct encoding. This fixes bug 42704.
Modified:
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/groups/group-admin.js
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/ipranges/iprange-admin.js
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/overview.xsp
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/profile.xsp
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/user-admin.js
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/users.xsp
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/groups/group-admin.js
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/groups/group-admin.js?rev=600928&r1=600927&r2=600928&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/groups/group-admin.js (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/groups/group-admin.js Tue Dec 4 05:19:40 2007
@@ -41,14 +41,14 @@
"page-title" : "Edit Group"
});
- if (cocoon.request.get("cancel")) {
+ if (cocoon.request.getParameter("cancel")) {
break;
}
- if (cocoon.request.get("submit")) {
- name = cocoon.request.get("name");
+ if (cocoon.request.getParameter("submit")) {
+ name = cocoon.request.getParameter("name");
group.setName(name);
- description = cocoon.request.get("description");
+ description = cocoon.request.getParameter("description");
group.setDescription(description);
group.save();
break;
@@ -112,8 +112,8 @@
"group-machines" : groupMachines,
});
- var otherUserId = cocoon.request.get("user");
- if (cocoon.request.get("add_user") && otherUserId != null) {
+ var otherUserId = cocoon.request.getParameter("user");
+ if (cocoon.request.getParameter("add_user") && otherUserId != null) {
var user = userManager.getUser(otherUserId);
if (!groupUsers.contains(user)) {
groupUsers.add(user);
@@ -121,8 +121,8 @@
}
}
- var groupUserId = cocoon.request.get("group_user");
- if (cocoon.request.get("remove_user") && groupUserId != null) {
+ var groupUserId = cocoon.request.getParameter("group_user");
+ if (cocoon.request.getParameter("remove_user") && groupUserId != null) {
var user = userManager.getUser(groupUserId);
if (groupUsers.contains(user)) {
groupUsers.remove(user);
@@ -130,11 +130,11 @@
}
}
- if (cocoon.request.get("cancel")) {
+ if (cocoon.request.getParameter("cancel")) {
break;
}
- if (cocoon.request.get("submit")) {
+ if (cocoon.request.getParameter("submit")) {
group.removeAllMembers();
var userIterator = groupUsers.iterator();
@@ -179,14 +179,14 @@
"new-group" : true
});
- if (cocoon.request.get("cancel")) {
+ if (cocoon.request.getParameter("cancel")) {
break;
}
message = "";
- groupId = cocoon.request.get("group-id");
- name = cocoon.request.get("name");
- description = cocoon.request.get("description");
+ groupId = cocoon.request.getParameter("group-id");
+ name = cocoon.request.getParameter("name");
+ description = cocoon.request.getParameter("description");
var existingGroup = groupManager.getGroup(groupId);
if (existingGroup != null) {
@@ -223,7 +223,7 @@
var redirectUri = getRequestUri();
var groupManager = getAccreditableManager().getGroupManager();
- var groupId = cocoon.request.get("group-id");
+ var groupId = cocoon.request.getParameter("group-id");
var group = groupManager.getGroup(groupId);
var name = group.getName();
var showPage = true;
@@ -235,11 +235,11 @@
"name" : name
});
- if (cocoon.request.get("cancel")) {
+ if (cocoon.request.getParameter("cancel")) {
break;
}
- if (cocoon.request.get("submit")) {
+ if (cocoon.request.getParameter("submit")) {
groupManager.remove(group);
var members = group.getMembers();
group['delete']();
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/ipranges/iprange-admin.js
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/ipranges/iprange-admin.js?rev=600928&r1=600927&r2=600928&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/ipranges/iprange-admin.js (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/ipranges/iprange-admin.js Tue Dec 4 05:19:40 2007
@@ -138,26 +138,26 @@
}
message = "";
- if (cocoon.request.get("cancel")) {
+ if (cocoon.request.getParameter("cancel")) {
break;
}
- if (cocoon.request.get("submit")) {
+ if (cocoon.request.getParameter("submit")) {
var ok = true;
// get values from request
- name = cocoon.request.get("name");
- description = cocoon.request.get("description");
+ name = cocoon.request.getParameter("name");
+ description = cocoon.request.getParameter("description");
for (i = 0; i < 4; i++) {
- net[i] = cocoon.request.get("net-" + (i+1));
+ net[i] = cocoon.request.getParameter("net-" + (i+1));
if (!checkIPNumber(net[i])) {
netErrors[i] = "true";
ok = false;
message = "Please correct the errors.";
}
- mask[i] = cocoon.request.get("mask-" + (i+1));
+ mask[i] = cocoon.request.getParameter("mask-" + (i+1));
if (!checkIPNumber(mask[i])) {
maskErrors[i] = "true";
ok = false;
@@ -167,7 +167,7 @@
// initialize new IP range
if (newRange == true) {
- iprangeId = cocoon.request.get("iprange-id");
+ iprangeId = cocoon.request.getParameter("iprange-id");
if (ok) {
var existingIPRange = ipRangeManager.getIPRange(iprangeId);
if (existingIPRange != null) {
@@ -222,7 +222,7 @@
try {
var redirectUri = getRequestUri();
var ipRangeManager = getAccreditableManager().getIPRangeManager();
- var ipRangeId = cocoon.request.get("iprange-id");
+ var ipRangeId = cocoon.request.getParameter("iprange-id");
var range = ipRangeManager.getIPRange(ipRangeId);
var name = range.getName();
var showPage = true;
@@ -234,11 +234,11 @@
"name" : name
});
- if (cocoon.request.get("cancel")) {
+ if (cocoon.request.getParameter("cancel")) {
break;
}
- if (cocoon.request.get("submit")) {
+ if (cocoon.request.getParameter("submit")) {
ipRangeManager.remove(range);
range['delete']();
showPage = false;
@@ -279,8 +279,8 @@
"iprange-groups" : rangeGroups
});
- var groupId = cocoon.request.get("group");
- if (cocoon.request.get("add_group") && groupId != "") {
+ var groupId = cocoon.request.getParameter("group");
+ if (cocoon.request.getParameter("add_group") && groupId != "") {
var group = getAccreditableManager().getGroupManager().getGroup(groupId);
if (!rangeGroups.contains(group)) {
rangeGroups.add(group);
@@ -288,8 +288,8 @@
}
}
- var rangeGroupId = cocoon.request.get("iprange_group");
- if (cocoon.request.get("remove_group") && rangeGroupId != "") {
+ var rangeGroupId = cocoon.request.getParameter("iprange_group");
+ if (cocoon.request.getParameter("remove_group") && rangeGroupId != "") {
var group = getAccreditableManager().getGroupManager().getGroup(rangeGroupId);
if (rangeGroups.contains(group)) {
rangeGroups.remove(group);
@@ -297,11 +297,11 @@
}
}
- if (cocoon.request.get("cancel")) {
+ if (cocoon.request.getParameter("cancel")) {
break;
}
- if (cocoon.request.get("submit")) {
+ if (cocoon.request.getParameter("submit")) {
range.removeFromAllGroups();
var iterator = rangeGroups.iterator();
while (iterator.hasNext()) {
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/overview.xsp
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/overview.xsp?rev=600928&r1=600927&r2=600928&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/overview.xsp (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/overview.xsp Tue Dec 4 05:19:40 2007
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/profile.xsp
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/profile.xsp?rev=600928&r1=600927&r2=600928&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/profile.xsp (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/profile.xsp Tue Dec 4 05:19:40 2007
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/user-admin.js
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/user-admin.js?rev=600928&r1=600927&r2=600928&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/user-admin.js (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/user-admin.js Tue Dec 4 05:19:40 2007
@@ -51,12 +51,12 @@
"ldap" : ldap
});
- if (cocoon.request.get("submit")) {
- fullName = cocoon.request.get("fullname");
+ if (cocoon.request.getParameter("submit")) {
+ fullName = cocoon.request.getParameter("fullname");
user.setName(fullName);
- email = cocoon.request.get("email");
+ email = cocoon.request.getParameter("email");
user.setEmail(email);
- description = cocoon.request.get("description");
+ description = cocoon.request.getParameter("description");
user.setDescription(description);
user.save();
ready = true;
@@ -122,11 +122,11 @@
"enabled" : enabled
});
- if (cocoon.request.get("submit")) {
- oldPassword = cocoon.request.get("old-password");
- newPassword = cocoon.request.get("new-password");
+ if (cocoon.request.getParameter("submit")) {
+ oldPassword = cocoon.request.getParameter("old-password");
+ newPassword = cocoon.request.getParameter("new-password");
var password = new Packages.java.lang.String(newPassword);
- confirmPassword = cocoon.request.get("confirm-password");
+ confirmPassword = cocoon.request.getParameter("confirm-password");
if (checkPassword && !user.authenticate(oldPassword)) {
message = "You entered a wrong password.";
@@ -188,8 +188,8 @@
"user-groups" : userGroups
});
- var groupId = cocoon.request.get("group");
- if (cocoon.request.get("add_group") && groupId != null) {
+ var groupId = cocoon.request.getParameter("group");
+ if (cocoon.request.getParameter("add_group") && groupId != null) {
var group = groupManager.getGroup(groupId);
if (!userGroups.contains(group)) {
userGroups.add(group);
@@ -197,8 +197,8 @@
}
}
- var userGroupId = cocoon.request.get("user_group");
- if (cocoon.request.get("remove_group") && userGroupId != null) {
+ var userGroupId = cocoon.request.getParameter("user_group");
+ if (cocoon.request.getParameter("remove_group") && userGroupId != null) {
var group = groupManager.getGroup(userGroupId);
if (userGroups.contains(group)) {
userGroups.remove(group);
@@ -206,7 +206,7 @@
}
}
- if (cocoon.request.get("submit")) {
+ if (cocoon.request.getParameter("submit")) {
user.removeFromAllGroups();
var testGroups = groupManager.getGroups();
@@ -226,7 +226,7 @@
user.save();
ready = true;
}
- else if (cocoon.request.get("cancel")) {
+ else if (cocoon.request.getParameter("cancel")) {
ready = true;
}
}
@@ -334,14 +334,14 @@
"ldap" : ldap
});
- if (cocoon.request.get("submit")) {
- userId = cocoon.request.get("userid");
- email = cocoon.request.get("email");
- fullName = cocoon.request.get("fullname");
- description = cocoon.request.get("description");
- ldapId = cocoon.request.get("ldapid");
- password = cocoon.request.get("new-password");
- confirmPassword = cocoon.request.get("confirm-password");
+ if (cocoon.request.getParameter("submit")) {
+ userId = cocoon.request.getParameter("userid");
+ email = cocoon.request.getParameter("email");
+ fullName = cocoon.request.getParameter("fullname");
+ description = cocoon.request.getParameter("description");
+ ldapId = cocoon.request.getParameter("ldapid");
+ password = cocoon.request.getParameter("new-password");
+ confirmPassword = cocoon.request.getParameter("confirm-password");
var configDir = userManager.getConfigurationDirectory();
@@ -383,7 +383,7 @@
resolve();
var redirectUri = getRequestUri();
- var userId = cocoon.request.get("user-id");
+ var userId = cocoon.request.getParameter("user-id");
var user;
try {
@@ -400,7 +400,7 @@
"type" : "user"
});
- if (cocoon.request.get("submit")) {
+ if (cocoon.request.getParameter("submit")) {
try {
var userManager = getAccreditableManager().getUserManager();
userManager.remove(user);
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/users.xsp
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/users.xsp?rev=600928&r1=600927&r2=600928&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/users.xsp (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/admin/users/users.xsp Tue Dec 4 05:19:40 2007
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org