diff --git a/airsonic-main/pom.xml b/airsonic-main/pom.xml index 4d49fd27..f3e2ab44 100755 --- a/airsonic-main/pom.xml +++ b/airsonic-main/pom.xml @@ -595,6 +595,24 @@ org.apache.maven.plugins maven-checkstyle-plugin + + org.apache.maven.plugins + maven-pmd-plugin + + jsp + + /category/jsp/codestyle.xml + /category/jsp/errorprone.xml + + + **/*.jsp + **/*.jspf + + + ${basedir}/src/main/webapp/WEB-INF/jsp + + + org.springframework.boot spring-boot-maven-plugin diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/accessDenied.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/accessDenied.jsp index d000c6a5..7ef30f79 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/accessDenied.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/accessDenied.jsp @@ -8,7 +8,7 @@

- " alt=""/> +

diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp index 954d270f..4f1c826e 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp @@ -4,7 +4,7 @@ <%@ include file="head.jsp" %> <%@ include file="jquery.jsp" %> - + - + + @@ -167,8 +167,8 @@

- " style="margin-right:0.3em"> - "> + + diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp index 2d2b370a..33b2490d 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp @@ -1,16 +1,16 @@ -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> <%--@elvariable id="model" type="java.util.Map"--%> <%@ include file="head.jsp" %> <%@ include file="jquery.jsp" %> - - - - - - + + + + + + @@ -103,12 +103,12 @@ } function toggleStar(mediaFileId, imageId) { - if ($(imageId).attr("src").indexOf("") != -1) { - $(imageId).attr("src", ""); + if ($(imageId).attr("src").indexOf("") != -1) { + $(imageId).attr("src", ""); starService.unstar(mediaFileId); } - else if ($(imageId).attr("src").indexOf("") != -1) { - $(imageId).attr("src", ""); + else if ($(imageId).attr("src").indexOf("") != -1) { + $(imageId).attr("src", ""); starService.star(mediaFileId); } } @@ -153,7 +153,7 @@ } playlistService.appendToPlaylist(playlistId, mediaFileIds, function (){ top.left.updatePlaylists(); - $().toastmessage("showSuccessToast", ""); + $().toastmessage("showSuccessToast", ""); }); } function showAllAlbums() { @@ -163,7 +163,7 @@

- " + @@ -239,27 +239,27 @@ - " style="height:18px;" alt=""> + | - + - + - + - + Google | @@ -292,7 +292,7 @@ - "> +

@@ -460,7 +460,7 @@ - " onclick="showAllAlbums()"> + @@ -480,7 +480,7 @@ - " onclick="showAllAlbums()"> + @@ -498,7 +498,7 @@ -
" style="display: none;"> + diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp index 85b55131..fc212a24 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp @@ -1,3 +1,4 @@ + <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> <%-- ~ This file is part of Airsonic. @@ -18,18 +19,17 @@ ~ Copyright 2014 (C) Sindre Mehus --%> - <%--@elvariable id="model" type="java.util.Map"--%> <%@ include file="head.jsp" %> <%@ include file="jquery.jsp" %> - - - - - + + + + + @@ -164,7 +164,7 @@

- " + @@ -215,7 +215,7 @@ - "> +

@@ -243,7 +243,7 @@ - " onclick="showAllAlbums()"> + @@ -285,7 +285,7 @@ - " onclick="showAllAlbums()"> +
@@ -308,8 +308,8 @@ - " onclick="playSimilar()"> - " onclick="playAllTopSongs()"> + + @@ -320,16 +320,16 @@ - " + - " alt="" title="" + <fmt:message key='common.play'/> - " alt="" title="" + <fmt:message key='common.add'/> - " alt="" title="" + <fmt:message key='main.addnext'/> Rank Title diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/avatarUploadResult.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/avatarUploadResult.jsp index 4b1973b5..49b42f2c 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/avatarUploadResult.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/avatarUploadResult.jsp @@ -7,7 +7,7 @@

- " alt=""/> +

diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/changeCoverArt.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/changeCoverArt.jsp index 4351b380..ac8c1396 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/changeCoverArt.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/changeCoverArt.jsp @@ -3,9 +3,9 @@ <%@ include file="head.jsp" %> <%@ include file="jquery.jsp" %> - - - + + + - - + + @@ -118,8 +118,8 @@

- " style="margin-right:0.3em"> - "> + +

diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp index 06650885..9450659b 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp @@ -21,12 +21,12 @@ <%@ include file="head.jsp" %> <%@ include file="jquery.jsp" %> - + - - + + @@ -47,7 +47,7 @@
"/> + value=""/>

@@ -56,15 +56,15 @@

" /> + value="" />

- " style="margin-right:0.3em"> - "> + +

diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/editTags.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/editTags.jsp index c3816b21..85e1922a 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/editTags.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/editTags.jsp @@ -2,9 +2,9 @@ <%@ include file="head.jsp" %> - - - + + + @@ -159,6 +159,6 @@ -

" onclick="updateTags()"/>

+

\ No newline at end of file diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/error.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/error.jsp index 11c4ae28..1d7383be 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/error.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/error.jsp @@ -12,7 +12,7 @@

- " alt=""/> + Error

diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/externalPlayer.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/externalPlayer.jsp index 1ea047f2..0efc1001 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/externalPlayer.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/externalPlayer.jsp @@ -5,9 +5,9 @@ <%@ include file="head.jsp" %> - - - "> + + + diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/generalDatabaseSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/generalDatabaseSettings.jsp index e69de29b..c4f702cf 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/generalDatabaseSettings.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/generalDatabaseSettings.jsp @@ -0,0 +1 @@ +<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp index 6d65bddf..14332cbd 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp @@ -4,12 +4,12 @@ <%@ include file="head.jsp" %> <%@ include file="jquery.jsp" %> - + - - + + @@ -156,8 +156,8 @@ - " style="margin-right:0.3em"> - "> + + diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/gettingStarted.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/gettingStarted.jsp index d4e83f7c..a3df4877 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/gettingStarted.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/gettingStarted.jsp @@ -1,5 +1,5 @@ -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> <%@ include file="head.jsp" %> @@ -13,7 +13,7 @@

- " alt=""> +

diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp index c0c2c711..381f6ca7 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp @@ -2,18 +2,18 @@ -"/> -"/> -"/> -"/> -" color="#2f7bd9"/> + + + + + -"> -" type="text/css"> + + Airsonic - - + + diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/help.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/help.jsp index 0c4c0b7b..a095eaa5 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/help.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/help.jsp @@ -1,9 +1,9 @@ -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> <%@ include file="head.jsp" %> - + @@ -26,7 +26,7 @@

- " alt=""> +

@@ -39,7 +39,7 @@ ${versionString} – ${buildDateString} ${model.serverInfo} ( / ) - GPL 3.0"> + GPL 3.0 Airsonic website Airsonic on Reddit @@ -49,7 +49,7 @@

- " alt=""> +

diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/home.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/home.jsp index 94e6b631..2830dad8 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/home.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/home.jsp @@ -1,5 +1,5 @@ -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> <%@ include file="head.jsp" %> @@ -33,7 +33,7 @@

- " alt=""> + ${model.welcomeTitle}

@@ -64,7 +64,7 @@ <%@ include file="homePager.jsp" %> -
"> +
${model.welcomeMessage}
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/homePager.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/homePager.jsp index 1df64f14..503da999 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/homePager.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/homePager.jsp @@ -1,3 +1,4 @@ +<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%> @@ -6,7 +7,7 @@ -
; padding-left: 0.5em;padding-right: 0.5em"> +
${fn:escapeXml(model.musicFolder.name)}
@@ -39,11 +40,11 @@ - " alt=""> + - " alt=""> + @@ -77,7 +78,7 @@ - " alt="Shuffle" style="height:16px;"> + Shuffle diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/importPlaylist.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/importPlaylist.jsp index 4d8aedfa..8ac49761 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/importPlaylist.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/importPlaylist.jsp @@ -1,5 +1,5 @@ -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> <%@ include file="head.jsp" %> @@ -31,7 +31,7 @@
- "/> +
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/include.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/include.jsp index a906c72f..5d4bc8a2 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/include.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/include.jsp @@ -1,4 +1,4 @@ -<%@ page session="false"%> +<%@ page session="false" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/index.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/index.jsp index 0c6f4e56..0295d076 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/index.jsp @@ -1,5 +1,5 @@ -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> <%@ include file="head.jsp" %> diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp index b702ee53..364ae02a 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp @@ -39,17 +39,17 @@ - "/> - "/> - "/> + + + - " style="margin-right:0.3em"> - "> + + diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/javaJukeboxPlayerControlBar.jspf b/airsonic-main/src/main/webapp/WEB-INF/jsp/javaJukeboxPlayerControlBar.jspf index 4a0af380..9e7b31fc 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/javaJukeboxPlayerControlBar.jspf +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/javaJukeboxPlayerControlBar.jspf @@ -1,3 +1,4 @@ +<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
@@ -11,8 +12,8 @@ diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp index 0157242f..f6904492 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp @@ -4,7 +4,7 @@ <%@ include file="head.jsp" %> <%@ include file="jquery.jsp" %> - + - + + @@ -207,8 +207,8 @@
- Start" onclick="onJavaJukeboxStart()" style="cursor:pointer"> - Pause" onclick="onJavaJukeboxStop()" style="cursor:pointer; display:none"> + Start + @@ -20,7 +21,7 @@ - " alt=""> +
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/jquery.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/jquery.jsp index 080e7cd7..40f79a65 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/jquery.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/jquery.jsp @@ -1,5 +1,6 @@ -" type="text/css"> -" type="text/css" > +<%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> + + - + diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp index fa218716..bf32c962 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp @@ -1,11 +1,11 @@ -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> <%@ include file="head.jsp" %> <%@ include file="jquery.jsp" %> - - - + + + - - + + + - - + + + - - + + @@ -138,8 +138,8 @@ <%--

--%>

- " style="margin-right:0.3em"> - "> + +

diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/notFound.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/notFound.jsp index 2f3b53d2..b56f7c10 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/notFound.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/notFound.jsp @@ -8,7 +8,7 @@

- " alt=""/> +

diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/passwordSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/passwordSettings.jsp index 3c4b6701..aa59976a 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/passwordSettings.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/passwordSettings.jsp @@ -37,8 +37,8 @@
- " style="margin-right:0.3em"> - "> + +

- " style="margin-right:0.3em"/> - "> + +

@@ -247,7 +247,7 @@ - "/> + diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/playButtons.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playButtons.jsp index 96770848..bd606fcd 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/playButtons.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/playButtons.jsp @@ -18,11 +18,11 @@ PARAMETERS - " alt="" style="cursor:pointer;height:18px;" + - " alt="" style="cursor:pointer;height:18px;" + @@ -37,16 +37,16 @@ PARAMETERS - " alt="" - title=""> + <fmt:message key='common.play'/> - " alt="" style="cursor:pointer; height:18px;" - onclick="${param.onPlay}; return false;" title=""> + <fmt:message key='common.play'/> - " alt="" style="cursor:pointer; height:18px;" - onclick="top.playQueue.onPlay(${param.id}); return false;" title=""> + <fmt:message key='common.play'/> @@ -54,17 +54,17 @@ PARAMETERS - " alt="" - onclick="top.playQueue.onAdd(${param.id}); $().toastmessage('showSuccessToast', ''); return false;" - style="cursor:pointer; height:18px;" title=""> + <fmt:message key='main.addlast'/> - " alt="" - onclick="top.playQueue.onAddNext(${param.id}); $().toastmessage('showSuccessToast', ''); return false;" - style="cursor:pointer; height:18px;" title=""> + <fmt:message key='main.addnext'/> @@ -74,7 +74,7 @@ PARAMETERS - " alt="" - title="" > + <fmt:message key='common.download'/> diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp index 6142d7da..1b37f4ce 100644 --- a/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp +++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp @@ -1,16 +1,16 @@ -<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%> <%@ include file="head.jsp" %> <%@ include file="jquery.jsp" %> - - - - - - - - + + + + + + + +