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

Merge Pull Request #93 into develop

Browse Source
This commit is contained in:
Eugene E. Kashpureff Jr
2016-06-11 13:50:00 +00:00
parent 6bf5bebecd 950133b30a
commit 7dbb7ff735
4 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libresonic-main/src/main/java/org/libresonic/player/service/NetworkService.java
+11
View File
@@ -100,6 +100,17 @@ public class NetworkService {
* @param test Whether to test that the redirection works.
*/
public synchronized void initUrlRedirection(boolean test) {
if (true) {
// This feature isn't currently supported, since it's a public service of subsonic.org
// Display a warning message for now
boolean enabled = settingsService.isUrlRedirectionEnabled() && settingsService.getUrlRedirectType() == UrlRedirectType.NORMAL;
if (enabled) {
LOG.warn("The URL redirection service is currently not enabled!");
}
return;
}
urlRedirectionStatus.setText("Idle");
if (urlRedirectionFuture != null) {
urlRedirectionFuture.cancel(true);
libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties
+2
View File
@@ -435,6 +435,8 @@ networksettings.urlredirectionenabled = Access your server over the Internet usi
networksettings.status = Status:
networksettings.normalurl = Use
networksettings.customurl = Use custom URL (advanced)
networksettings.urlRedirectDisabled = Feature not currently available
# transcodingSettings.jsp
transcodingsettings.name = Name
libresonic-main/src/main/webapp/WEB-INF/jsp/networkSettings.jsp
+3 -3
View File
@@ -30,7 +30,7 @@
var custom = $("#urlRedirectTypeCustom").is(":checked");
$("#urlRedirectFrom").prop("disabled", !urlRedirectionEnabled || !normal);
$("#urlRedirectCustomUrl").prop("disabled", !urlRedirectionEnabled || !custom);
$("#urlRedirectCustomUrl").prop("disabled", !urlRedirectionEnabled || !custom);
$("#urlRedirectTypeNormal").prop("disabled", !urlRedirectionEnabled);
$("#urlRedirectTypeCustom").prop("disabled", !urlRedirectionEnabled);
}
@@ -75,7 +75,7 @@
<p>
<form:radiobutton id="urlRedirectTypeNormal" path="urlRedirectType" value="NORMAL" onclick="enableUrlRedirectionFields()"/>
<label for="urlRedirectTypeNormal"><fmt:message key="networksettings.normalurl"/></label>
http://<form:input id="urlRedirectFrom" path="urlRedirectFrom" size="16" cssStyle="margin-left:0.25em"/>.libresonic.org
http://<form:input id="urlRedirectFrom" path="urlRedirectFrom" size="16" cssStyle="margin-left:0.25em"/>.libresonic.org (<fmt:message key="networksettings.urlRedirectDisabled"/>)
</p>
<p>
@@ -100,4 +100,4 @@
</form:form>
</body>
</html>
</html>