This is an automated email from the ASF dual-hosted git repository.
brushed pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new 5b80451 2.11.0-M5-git-13 : fixes of bugs reported by sonarcloud.
5b80451 is described below
commit 5b80451457e990611bd7c8941be84b5f1d2426cf
Author: brushed <[email protected]>
AuthorDate: Sat Aug 24 11:34:53 2019 +0200
2.11.0-M5-git-13 : fixes of bugs reported by sonarcloud.
---
.../main/webapp/templates/210/AttachmentTab.jsp | 16 +++----
.../main/webapp/templates/210/EditGroupContent.jsp | 10 ++--
.../src/main/webapp/templates/210/EditTemplate.jsp | 8 ++--
.../src/main/webapp/templates/210/GroupContent.jsp | 12 ++---
.../src/main/webapp/templates/210/GroupTab.jsp | 56 +++++++++++-----------
.../main/webapp/templates/210/NewGroupContent.jsp | 6 +--
.../main/webapp/templates/210/UploadTemplate.jsp | 6 +--
.../src/main/webapp/templates/210/ViewTemplate.jsp | 6 +--
.../main/webapp/templates/210/WorkflowContent.jsp | 30 ++++++------
.../main/webapp/templates/default/AJAXSearch.jsp | 4 +-
.../webapp/templates/default/AttachmentTab.jsp | 16 +++----
.../src/main/webapp/templates/default/GroupTab.jsp | 14 +++---
.../main/webapp/templates/default/InfoContent.jsp | 32 ++++++-------
.../webapp/templates/default/PreferencesTab.jsp | 6 +--
.../webapp/templates/default/WorkflowContent.jsp | 20 ++++----
15 files changed, 121 insertions(+), 121 deletions(-)
diff --git a/jspwiki-war/src/main/webapp/templates/210/AttachmentTab.jsp
b/jspwiki-war/src/main/webapp/templates/210/AttachmentTab.jsp
index a1c9e05..4f28e8a 100644
--- a/jspwiki-war/src/main/webapp/templates/210/AttachmentTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/AttachmentTab.jsp
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags"; prefix="wiki" %>
@@ -98,13 +98,13 @@
<div class="zebra-table"><div class="slimbox-img sortable">
<table class="wikitable">
<tr>
- <th><fmt:message key="info.attachment.type"/></th>
- <th><fmt:message key="info.attachment.name"/></th>
- <th><fmt:message key="info.size"/></th>
- <th><fmt:message key="info.version"/></th>
- <th><fmt:message key="info.date"/></th>
- <th><fmt:message key="info.author"/></th>
- <wiki:Permission permission="delete"><th><fmt:message
key="info.actions"/></th></wiki:Permission>
+ <th scope="col"><fmt:message key="info.attachment.type"/></th>
+ <th scope="col"><fmt:message key="info.attachment.name"/></th>
+ <th scope="col"><fmt:message key="info.size"/></th>
+ <th scope="col"><fmt:message key="info.version"/></th>
+ <th scope="col"><fmt:message key="info.date"/></th>
+ <th scope="col"><fmt:message key="info.author"/></th>
+ <wiki:Permission permission="delete"><th scope="col"><fmt:message
key="info.actions"/></th></wiki:Permission>
<th class="changenote"><fmt:message key="info.changenote"/></th>
</tr>
diff --git a/jspwiki-war/src/main/webapp/templates/210/EditGroupContent.jsp
b/jspwiki-war/src/main/webapp/templates/210/EditGroupContent.jsp
index 372ec1c..7335f31 100644
--- a/jspwiki-war/src/main/webapp/templates/210/EditGroupContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/EditGroupContent.jsp
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags"; prefix="wiki" %>
@@ -89,11 +89,11 @@
<table class="wikitable">
<tr>
- <th><fmt:message key="group.name"/></th>
+ <th scope="col"><fmt:message key="group.name"/></th>
<td><%=name%></td>
</tr>
<tr>
- <th><label><fmt:message key="group.members"/></label></th>
+ <th scope="col"><label><fmt:message key="group.members"/></label></th>
<td>
<textarea id="members" name="members" rows="10"
cols="30"><%=TextUtil.replaceEntities(s.toString())%></textarea>
<div class="formhelp"><fmt:message key="editgroup.memberlist"/></div>
@@ -108,11 +108,11 @@
<input type="hidden" name="action" value="save" />
</form>
- <wiki:Permission permission="deleteGroup">
+ <wiki:Permission permission="deleteGroup">
<form action="<wiki:Link format='url' jsp='DeleteGroup.jsp'/>"
class="wikiform"
id="deleteGroup"
- onsubmit="return( confirm('<fmt:message
key="grp.deletegroup.confirm"/>')
+ onsubmit="return( confirm('<fmt:message
key="grp.deletegroup.confirm"/>')
&& Wiki.submitOnce(this) );"
method="POST" accept-charset="UTF-8">
<input type="submit" name="ok" value="<fmt:message
key="actions.deletegroup"/>" />
diff --git a/jspwiki-war/src/main/webapp/templates/210/EditTemplate.jsp
b/jspwiki-war/src/main/webapp/templates/210/EditTemplate.jsp
index d8bf3a5..38d399d 100644
--- a/jspwiki-war/src/main/webapp/templates/210/EditTemplate.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/EditTemplate.jsp
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags"; prefix="wiki" %>
@@ -23,7 +23,7 @@
<fmt:setBundle basename="templates.default"/>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html id="top" xmlns="http://www.w3.org/1999/xhtml";
xmlns:jspwiki="http://jspwiki.apache.org";>
+<html lang="en" id="top" xmlns="http://www.w3.org/1999/xhtml";
xmlns:jspwiki="http://jspwiki.apache.org";>
<head>
<title>
@@ -58,10 +58,10 @@
<wiki:Include page="PageActionsBottom.jsp"/>
</div>
- <wiki:Include page="Favorites.jsp"/>
+ <wiki:Include page="Favorites.jsp"/>
<div class="clearbox"></div>
- </div>
+ </div>
<wiki:Include page="Footer.jsp" />
diff --git a/jspwiki-war/src/main/webapp/templates/210/GroupContent.jsp
b/jspwiki-war/src/main/webapp/templates/210/GroupContent.jsp
index 901d5f5..35b4bfc 100644
--- a/jspwiki-war/src/main/webapp/templates/210/GroupContent.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/GroupContent.jsp
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags"; prefix="wiki" %>
@@ -61,7 +61,7 @@
modifier = group.getModifier();
if ( group.getLastModified() != null )
{
- modified = Preferences.renderDate(WikiContext.findContext( pageContext
), group.getLastModified(),Preferences.TimeFormat.DATETIME) ;
+ modified = Preferences.renderDate(WikiContext.findContext( pageContext
), group.getLastModified(),Preferences.TimeFormat.DATETIME) ;
}
}
name = TextUtil.replaceEntities(name);
@@ -102,7 +102,7 @@
%>
<table class="wikitable">
<tr>
- <th><fmt:message key="group.name"/></th>
+ <th scope="col"><fmt:message key="group.name"/></th>
<td>
<fmt:message key="group.groupintro">
<fmt:param><em><%=name%></em></fmt:param>
@@ -111,7 +111,7 @@
</tr>
<!-- Members -->
<tr>
- <th><fmt:message key="group.members"/>
+ <th scope="col"><fmt:message key="group.members"/>
</th>
<td><%
for ( int i = 0; i < members.length; i++ )
@@ -146,11 +146,11 @@
}
%>
- <wiki:Permission permission="deleteGroup">
+ <wiki:Permission permission="deleteGroup">
<form action="<wiki:Link format='url' jsp='DeleteGroup.jsp'/>"
class="wikiform"
id="deleteGroup"
- onsubmit="return( confirm('<fmt:message
key="grp.deletegroup.confirm"/>')
+ onsubmit="return( confirm('<fmt:message
key="grp.deletegroup.confirm"/>')
&& Wiki.submitOnce(this) );"
method="POST" accept-charset="UTF-8">
<input type="submit" name="ok" value="<fmt:message
key="actions.deletegroup"/>" />
diff --git a/jspwiki-war/src/main/webapp/templates/210/GroupTab.jsp
b/jspwiki-war/src/main/webapp/templates/210/GroupTab.jsp
index b74fc6e..d6fc9a4 100644
--- a/jspwiki-war/src/main/webapp/templates/210/GroupTab.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/GroupTab.jsp
@@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
- under the License.
+ under the License.
--%>
<%@ taglib uri="http://jspwiki.apache.org/tags"; prefix="wiki" %>
@@ -40,30 +40,30 @@
java.util.Arrays.sort( m, new PrincipalComparator() );
String delim = "\", \"";
-
+
StringBuffer ss = new StringBuffer();
MessageFormat mf = null;
Object[] args = null;
-
+
ss.append( "WikiGroup.putGroup( \"" );
-
+
ss.append( name );
ss.append( delim );
-
+
for( int j=0; j < m.length; j++ ) { ss.append(
m[j].getName().trim()+"\\n" ); }
-
+
ss.append( delim );
mf = new MessageFormat(LocaleSupport.getLocalizedMessage(pageContext,
"grp.createdon") );
args = new Object[]{(group.getCreated()==null) ? "" :
Preferences.renderDate(WikiContext.findContext( pageContext ),
group.getCreated(),Preferences.TimeFormat.DATETIME), group.getCreator()};
ss.append( mf.format( args ) );
-
+
mf = new MessageFormat(LocaleSupport.getLocalizedMessage(pageContext,
"grp.lastmodified") );
args = new Object[]{(group.getLastModified()==null) ? "" :
Preferences.renderDate(WikiContext.findContext( pageContext ),
group.getLastModified(),Preferences.TimeFormat.DATETIME), group.getModifier()};
ss.append( mf.format( args ) );
-
+
ss.append( "\", " );
ss.append( ( cursor ) ? "true" : "false" );
-
+
ss.append( ");\n" );
@@ -75,24 +75,24 @@
<table id='wikigroups' class='wikitable' >
<tr>
- <th><fmt:message key="group.name" /></th>
- <th><fmt:message key="group.members" /></th>
+ <th scope="col"><fmt:message key="group.name" /></th>
+ <th scope="col"><fmt:message key="group.members" /></th>
</tr>
<tr>
<td id="groupnames" rowspan="2">
- <div id="grouptemplate"
- style="display:none; "
+ <div id="grouptemplate"
+ style="display:none; "
title='<fmt:message key="grp.groupnames.title"/>'
onclick="WikiGroup.toggle(); WikiGroup.onMouseOverGroup(this);"
onmouseover="WikiGroup.onMouseOverGroup(this);" ></div>
<wiki:Permission permission="createGroups">
- <div id="groupfield"
+ <div id="groupfield"
onmouseover="WikiGroup.onMouseOverGroup(this);" >
- <input type="text" size="30"
+ <input type="text" size="30"
id="newgroup"
value='<fmt:message key="grp.newgroupname"/>'
- onblur="if( this.value == '' ) { this.value = this.defaultValue; };
"
+ onblur="if( this.value == '' ) { this.value = this.defaultValue; };
"
onfocus="if( this.value == this.defaultValue ) { this.value = '';
WikiGroup.onClickNew(); }; "/>
</div>
</wiki:Permission>
@@ -102,39 +102,39 @@
<textarea rows="8" cols="30" disabled="disabled"
name="membersfield" id="membersfield" ></textarea>
</div>
- <form action="<wiki:Link format='url' jsp='Group.jsp'/>"
- id="groupForm"
+ <form action="<wiki:Link format='url' jsp='Group.jsp'/>"
+ id="groupForm"
method="post" accept-charset="<wiki:ContentEncoding />" >
<div>
<input type="hidden" name="group" value="" />
<input type="hidden" name="members" value="" />
<input type="hidden" name="action" value="save" />
<input type="button" disabled="disabled"
- name="saveButton" id="saveButton"
- value='<fmt:message key="grp.savegroup"/>'
+ name="saveButton" id="saveButton"
+ value='<fmt:message key="grp.savegroup"/>'
onclick="WikiGroup.onSubmit( this.form, '<wiki:Link format='url'
jsp='EditGroup.jsp' />' );" /></div>
<wiki:Permission permission="createGroups">
<div>
- <input type="button" disabled="disabled"
+ <input type="button" disabled="disabled"
name="createButton" id="createButton"
- value='<fmt:message key="grp.savenewgroup"/>'
+ value='<fmt:message key="grp.savenewgroup"/>'
style="display:none; "
onclick="WikiGroup.onSubmitNew( this.form, '<wiki:Link format='url'
jsp='NewGroup.jsp' />' );" /></div>
</wiki:Permission>
<div>
<input type="button" disabled="disabled"
- name="cancelButton" id="cancelButton"
- value='<fmt:message key="grp.cancel"/>'
+ name="cancelButton" id="cancelButton"
+ value='<fmt:message key="grp.cancel"/>'
onclick="WikiGroup.toggle();" /></div>
<wiki:Permission permission="deleteGroup">
<div>
- <input type="button" disabled="disabled"
+ <input type="button" disabled="disabled"
name="deleteButton" id="deleteButton"
- value='<fmt:message key="grp.deletegroup"/>'
- onclick="confirm( '<fmt:message key="grp.deletegroup.confirm"/>' )
+ value='<fmt:message key="grp.deletegroup"/>'
+ onclick="confirm( '<fmt:message key="grp.deletegroup.confirm"/>' )
&& WikiGroup.onSubmit( this.form, '<wiki:Link format='url'
jsp='DeleteGroup.jsp' />' );" /></div>
</wiki:Permission>
</form>
@@ -155,7 +155,7 @@
<%
String groupname = request.getParameter( "group" );
%>
-
+
<script type="text/javascript">//<