MightyPork
/
airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'airsonic/pr/938'

Browse Source
master
Andrew DeMaria 7 years ago
parent 570abe69d5 2f9046d6b4
commit cd45717256
No known key found for this signature in database
GPG Key ID: 0A3F5E91F8364EDF
3 changed files with 6 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      airsonic-main/src/main/webapp/WEB-INF/jsp/avatarUploadResult.jsp
  2. 4
      airsonic-main/src/main/webapp/WEB-INF/jsp/login.jsp
  3. 4
      airsonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp

2
airsonic-main/src/main/webapp/WEB-INF/jsp/avatarUploadResult.jsp
Unescape View File

@ -14,7 +14,7 @@
<c:choose> <c:choose>
<c:when test="${empty model.error}"> <c:when test="${empty model.error}">
<p> <p>
<fmt:message key="avataruploadresult.success"><fmt:param value="${model.avatar.name}"/></fmt:message> <fmt:message key="avataruploadresult.success"><fmt:param value="${fn:escapeXml(model.avatar.name)}"/></fmt:message>
<sub:url value="avatar.view" var="avatarUrl"> <sub:url value="avatar.view" var="avatarUrl">
<sub:param name="username" value="${model.username}"/> <sub:param name="username" value="${model.username}"/>
<sub:param name="forceCustom" value="true"/> <sub:param name="forceCustom" value="true"/>

4
airsonic-main/src/main/webapp/WEB-INF/jsp/login.jsp
Unescape View File

@ -10,7 +10,7 @@
</script> </script>
</head> </head>
<body style="min-width:550px" class="mainframe bgcolor1" onload="document.getElementById('j_username').focus()"> <body style="min-width:550px" class="mainframe bgcolor1">
<form action="<c:url value="/login"/>" method="POST"> <form action="<c:url value="/login"/>" method="POST">
<sec:csrfInput /> <sec:csrfInput />
@ -21,7 +21,7 @@
<div class="loginmessagetop"><sub:wiki text="${model.loginMessage}"/></div> <div class="loginmessagetop"><sub:wiki text="${model.loginMessage}"/></div>
<input type="text" id="j_username" name="j_username" tabindex="1" placeholder="<fmt:message key="login.username"/>"> <input type="text" autofocus id="j_username" name="j_username" tabindex="1" placeholder="<fmt:message key="login.username"/>">
<input type="password" name="j_password" tabindex="2" placeholder="<fmt:message key="login.password"/>"> <input type="password" name="j_password" tabindex="2" placeholder="<fmt:message key="login.password"/>">

4
airsonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp
Unescape View File

@ -5,7 +5,7 @@
<head> <head>
<%@ include file="head.jsp" %> <%@ include file="head.jsp" %>
</head> </head>
<body class="mainframe bgcolor1" onload="document.getElementById('usernameOrEmail').focus()"> <body class="mainframe bgcolor1">
<form action="recover.view" method="POST"> <form action="recover.view" method="POST">
<sec:csrfInput /> <sec:csrfInput />
@ -17,7 +17,7 @@
<p style="padding-top: 1em; padding-bottom: 0.5em"><fmt:message key="recover.text"/></p> <p style="padding-top: 1em; padding-bottom: 0.5em"><fmt:message key="recover.text"/></p>
<c:if test="${empty model.sentTo}"> <c:if test="${empty model.sentTo}">
<input type="text" id="usernameOrEmail" name="usernameOrEmail" style="width:18em;margin-right: 1em"> <input type="text" id="usernameOrEmail" autofocus name="usernameOrEmail" style="width:18em;margin-right: 1em">
<input name="submit" type="submit" value="<fmt:message key="recover.send"/>"> <input name="submit" type="submit" value="<fmt:message key="recover.send"/>">
</c:if> </c:if>

Write Preview
Loading…
Cancel
Save