Skip to content

JSPWIKI-1275 #502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spyhunter99 wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −8
Open

JSPWIKI-1275 #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions jspwiki-war/src/main/webapp/templates/210/EditGroupContent.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<fmt:message key="editgroup.savehelp"><fmt:param><%=name%></fmt:param></fmt:message>
</div>
<input type="submit" name="ok" value="<fmt:message key="editgroup.submit.save"/>" />
<input type="hidden" name="group" value="<%=name%>" />
<input type="hidden" name="group" value="<%= TextUtil.replaceEntities(name) %>" />
<input type="hidden" name="action" value="save" />
</form>

Expand All @@ -118,7 +118,7 @@
method="POST" accept-charset="UTF-8">
<wiki:CsrfProtection/>
<input type="submit" name="ok" value="<fmt:message key="actions.deletegroup"/>" />
<input type="hidden" name="group" value="${param.group}" />
<input type="hidden" name="group" value="${ TextUtil.replaceEntities (param.group) }" />
</form>
</wiki:Permission>

Expand Down
6 changes: 3 additions & 3 deletions jspwiki-war/src/main/webapp/templates/210/GroupContent.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@
<wiki:Permission permission="createGroups">
<fmt:message key="group.createsuggestion">
<fmt:param><wiki:Link jsp="NewGroup.jsp">
<wiki:Param name="group" value="<%=name%>" />
<wiki:Param name="group" value="<%=name%>" />
<wiki:Param name="group" value="<%=TextUtil.replaceEntities(name)%>" />
<wiki:Param name="group" value="<%=TextUtil.replaceEntities(name)%>" />
<fmt:message key="group.createit"/>
</wiki:Link>
</fmt:param>
Expand Down Expand Up @@ -156,7 +156,7 @@
method="POST" accept-charset="UTF-8">
<wiki:CsrfProtection/>
<input type="submit" name="ok" value="<fmt:message key="actions.deletegroup"/>" />
<input type="hidden" name="group" value="${param.group}" />
<input type="hidden" name="group" value="${TextUtil.replaceEntities(param.group)}" />
</form>
</wiki:Permission>

Expand Down
2 changes: 1 addition & 1 deletion jspwiki-war/src/main/webapp/templates/210/NewGroupContent.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<!-- Name -->
<tr>
<th scope="row"><label><fmt:message key="newgroup.name"/></label></th>
<td><input type="text" name="group" size="30" value="<%=name%>" />
<td><input type="text" name="group" size="30" value="<%=TextUtil.replaceEntities(name)%>" />
<div class="formhelp">
<fmt:message key="newgroup.name.description"/>
</div>
Expand Down
3 changes: 2 additions & 1 deletion jspwiki-war/src/main/webapp/templates/default/EditGroupContent.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<%@ page import="org.apache.logging.log4j.LogManager" %>
<%@ page import="org.apache.wiki.api.core.*" %>
<%@ page import="org.apache.wiki.auth.authorize.Group" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page import="org.apache.wiki.util.comparators.PrincipalComparator" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
Expand Down Expand Up @@ -63,7 +64,7 @@
id="editGroup"
method="POST" accept-charset="UTF-8">

<input type="hidden" name="group" value="${name}" />
<input type="hidden" name="group" value="${ TextUtil.replaceEntities(name) }" />
<wiki:CsrfProtection/>

<div class="form-group">
Expand Down
3 changes: 2 additions & 1 deletion jspwiki-war/src/main/webapp/templates/default/GroupTab.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<%@ page import="org.apache.wiki.auth.authorize.GroupManager" %>
<%@ page import="org.apache.wiki.preferences.Preferences" %>
<%@ page import="org.apache.wiki.util.comparators.PrincipalComparator" %>
<%@ page import="org.apache.wiki.util.TextUtil" %>
<%@ page errorPage="/Error.jsp" %>
<%@ taglib uri="http://jspwiki.apache.org/tags" prefix="wiki" %>
<%@ taglib prefix="c" uri="jakarta.tags.core" %>
Expand Down Expand Up @@ -102,7 +103,7 @@
class="hidden"
name="deleteGroupForm" id="deleteGroupForm"
method="POST" accept-charset="UTF-8">
<input type="hidden" name="group" value="${group.name}" />
<input type="hidden" name="group" value="${ TextUtil.replaceEntities(group.name)}" />
<wiki:CsrfProtection/>
<input type="submit" name="ok"
data-modal="+ .modal"
Expand Down
Loading