org.apache.cxf
cxf-rt-transports-http
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/NetworkService.java b/libresonic-main/src/main/java/org/libresonic/player/service/NetworkService.java
index f4f61f21..279923c3 100644
--- a/libresonic-main/src/main/java/org/libresonic/player/service/NetworkService.java
+++ b/libresonic-main/src/main/java/org/libresonic/player/service/NetworkService.java
@@ -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);
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties
index 0deade45..541847f6 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties
@@ -427,6 +427,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
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/networkSettings.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/networkSettings.jsp
index d5de8078..ba80531a 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/networkSettings.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/networkSettings.jsp
@@ -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 @@
- http://.libresonic.org
+ http://.libresonic.org ()
@@ -100,4 +100,4 @@