diff --git a/src/controllers/dashboard/networking.html b/src/controllers/dashboard/networking.html index c210be8905..8a9f26e8d9 100644 --- a/src/controllers/dashboard/networking.html +++ b/src/controllers/dashboard/networking.html @@ -105,15 +105,8 @@
${LabelEnableAutomaticPortMapHelp}
-
- -
${LabelCreateHttpPortMapHelp}
-
-
- +
+
${LabelPublicHttpPortHelp}
@@ -159,36 +152,6 @@
${LabelPublishedServerUriHelp}
-
- -
${LabelUDPPortRangeHelp}
-
-
- -
${LabelHDHomerunPortRangeHelp}
-
- - -
-

${HeaderDebugging}

-
- -
${LabelEnableSSDPTracingHelp}
-
-
- -
${LabelSSDPTracingFilterHelp}
-
-
- -
${LabelAutoDiscoveryTracingHelp}
-
diff --git a/src/controllers/dashboard/networking.js b/src/controllers/dashboard/networking.js index 57a8a51b53..8ad957ab5f 100644 --- a/src/controllers/dashboard/networking.js +++ b/src/controllers/dashboard/networking.js @@ -48,10 +48,10 @@ function onSubmit(e) { }); config.IsRemoteIPFilterBlacklist = form.querySelector('#selectExternalAddressFilterMode').value === 'blacklist'; - config.PublicPort = form.querySelector('#txtPublicPort').value; + config.PublicHttpPort = form.querySelector('#txtPublicHttpPort').value; config.PublicHttpsPort = form.querySelector('#txtPublicHttpsPort').value; - config.HttpServerPortNumber = form.querySelector('#txtPortNumber').value; - config.HttpsPortNumber = form.querySelector('#txtHttpsPort').value; + config.InternalHttpPort = form.querySelector('#txtPortNumber').value; + config.InternalHttpsPort = form.querySelector('#txtHttpsPort').value; config.EnableHttps = form.querySelector('#chkEnableHttps').checked; config.RequireHttps = form.querySelector('#chkRequireHttps').checked; config.EnableUPnP = enableUpnp; @@ -59,16 +59,9 @@ function onSubmit(e) { config.EnableRemoteAccess = form.querySelector('#chkRemoteAccess').checked; config.CertificatePath = form.querySelector('#txtCertificatePath').value || null; config.CertificatePassword = form.querySelector('#txtCertPassword').value || null; - config.UPnPCreateHttpPortMap = form.querySelector('#chkCreateHttpPortMap').checked; config.AutoDiscovery = form.querySelector('#chkAutodiscovery').checked; - config.AutoDiscoveryTracing = form.querySelector('#chkAutodiscoveryTracing').checked; - config.EnableIPV6 = form.querySelector('#chkEnableIP6').checked; - config.EnableIPV4 = form.querySelector('#chkEnableIP4').checked; - config.UPnPCreateHttpPortMap = form.querySelector('#chkCreateHttpPortMap').checked; - config.UDPPortRange = form.querySelector('#txtUDPPortRange').value; - config.HDHomerunPortRange = form.querySelector('#txtHDHomerunPortRange').value; - config.EnableSSDPTracing = form.querySelector('#chkEnableSSDPTracing').checked; - config.SSDPTracingFilter = form.querySelector('#txtSSDPTracingFilter').value; + config.EnableIPv6 = form.querySelector('#chkEnableIP6').checked; + config.EnableIPv4 = form.querySelector('#chkEnableIP4').checked; ApiClient.updateNamedConfiguration('network', config).then(Dashboard.processServerConfigurationUpdateResult, Dashboard.processErrorResponse); }); }); @@ -83,7 +76,7 @@ function triggerChange(select) { } function getValidationAlert(form) { - if (form.querySelector('#txtPublicPort').value === form.querySelector('#txtPublicHttpsPort').value) { + if (form.querySelector('#txtPublicHttpPort').value === form.querySelector('#txtPublicHttpsPort').value) { return 'The public http and https ports must be different.'; } @@ -131,8 +124,8 @@ function confirmSelections(localAddress, enableUpnp, callback) { export default function (view) { function loadPage(page, config) { - page.querySelector('#txtPortNumber').value = config.HttpServerPortNumber; - page.querySelector('#txtPublicPort').value = config.PublicPort; + page.querySelector('#txtPortNumber').value = config.InternalHttpPort; + page.querySelector('#txtPublicHttpPort').value = config.PublicHttpPort; page.querySelector('#txtPublicHttpsPort').value = config.PublicHttpsPort; page.querySelector('#txtLocalAddress').value = (config.LocalNetworkAddresses || []).join(', '); page.querySelector('#txtLanNetworks').value = (config.LocalNetworkSubnets || []).join(', '); @@ -140,7 +133,7 @@ export default function (view) { page.querySelector('#txtExternalAddressFilter').value = (config.RemoteIPFilter || []).join(', '); page.querySelector('#selectExternalAddressFilterMode').value = config.IsRemoteIPFilterBlacklist ? 'blacklist' : 'whitelist'; page.querySelector('#chkRemoteAccess').checked = config.EnableRemoteAccess == null || config.EnableRemoteAccess; - page.querySelector('#txtHttpsPort').value = config.HttpsPortNumber; + page.querySelector('#txtHttpsPort').value = config.InternalHttpsPort; page.querySelector('#chkEnableHttps').checked = config.EnableHttps; page.querySelector('#chkRequireHttps').checked = config.RequireHttps; page.querySelector('#txtBaseUrl').value = config.BaseUrl || ''; @@ -149,16 +142,9 @@ export default function (view) { page.querySelector('#txtCertPassword').value = config.CertificatePassword || ''; page.querySelector('#chkEnableUpnp').checked = config.EnableUPnP; triggerChange(page.querySelector('#chkRemoteAccess')); - page.querySelector('#chkCreateHttpPortMap').checked = config.UPnPCreateHttpPortMap; page.querySelector('#chkAutodiscovery').checked = config.AutoDiscovery; - page.querySelector('#chkAutodiscoveryTracing').checked = config.AutoDiscoveryTracing; - page.querySelector('#chkEnableIP6').checked = config.EnableIPV6; - page.querySelector('#chkEnableIP4').checked = config.EnableIPV4; - page.querySelector('#chkCreateHttpPortMap').checked = config.UPnPCreateHttpPortMap; - page.querySelector('#txtUDPPortRange').value = config.UDPPortRange || ''; - page.querySelector('#txtHDHomerunPortRange').checked = config.HDHomerunPortRange || ''; - page.querySelector('#chkEnableSSDPTracing').checked = config.EnableSSDPTracing; - page.querySelector('#txtSSDPTracingFilter').value = config.SSDPTracingFilter || ''; + page.querySelector('#chkEnableIP6').checked = config.EnableIPv6; + page.querySelector('#chkEnableIP4').checked = config.EnableIPv4; page.querySelector('#txtPublishedServer').value = (config.PublishedServerUriBySubnet || []).join(', '); loading.hide(); } @@ -167,13 +153,13 @@ export default function (view) { if (this.checked) { view.querySelector('.fldExternalAddressFilter').classList.remove('hide'); view.querySelector('.fldExternalAddressFilterMode').classList.remove('hide'); - view.querySelector('.fldPublicPort').classList.remove('hide'); + view.querySelector('.fldPublicHttpPort').classList.remove('hide'); view.querySelector('.fldPublicHttpsPort').classList.remove('hide'); view.querySelector('.fldEnableUpnp').classList.remove('hide'); } else { view.querySelector('.fldExternalAddressFilter').classList.add('hide'); view.querySelector('.fldExternalAddressFilterMode').classList.add('hide'); - view.querySelector('.fldPublicPort').classList.add('hide'); + view.querySelector('.fldPublicHttpPort').classList.add('hide'); view.querySelector('.fldPublicHttpsPort').classList.add('hide'); view.querySelector('.fldEnableUpnp').classList.add('hide'); } diff --git a/src/strings/en-us.json b/src/strings/en-us.json index 1a3fdc47ab..eb4578f3f1 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -349,7 +349,6 @@ "HeaderContinueReading": "Continue Reading", "HeaderCustomDlnaProfiles": "Custom Profiles", "HeaderDateIssued": "Date Issued", - "HeaderDebugging": "Debugging and Tracing", "HeaderDefaultRecordingSettings": "Default Recording Settings", "HeaderDeleteDevice": "Delete Device", "HeaderDeleteDevices": "Delete All Devices", @@ -559,8 +558,6 @@ "LabelAuthProvider": "Authentication Provider", "LabelAutomaticallyAddToCollection": "Automatically add to collection", "LabelAutomaticallyAddToCollectionHelp": "When at least 2 movies have the same collection name, they will be automatically added to the collection.", - "LabelAutoDiscoveryTracing": "Enable Auto Discovery tracing.", - "LabelAutoDiscoveryTracingHelp": "When enabled, packets received on the auto discovery port will be logged.", "LabelAutomaticallyRefreshInternetMetadataEvery": "Automatically refresh metadata from the internet", "LabelAutomaticDiscovery": "Enable Auto Discovery", "LabelAutomaticDiscoveryHelp": "Allow applications to automatically detect Jellyfin by using UDP port 7359.", @@ -668,8 +665,6 @@ "LabelEnableRealtimeMonitorHelp": "Changes to files will be processed immediately on supported file systems.", "LabelEnableSingleImageInDidlLimit": "Limit to single embedded image", "LabelEnableSingleImageInDidlLimitHelp": "Some devices will not render properly if multiple images are embedded within DIDL.", - "LabelEnableSSDPTracing": "Enable SSDP Tracing", - "LabelEnableSSDPTracingHelp": "Enable details SSDP network tracing to be logged.
WARNING: This will cause serious performance degradation.", "LabelEncoderPreset": "Encoding preset", "LabelEndDate": "End date", "LabelEpisodeNumber": "Episode number", @@ -694,8 +689,6 @@ "LabelHardwareAccelerationType": "Hardware acceleration", "LabelHardwareAccelerationTypeHelp": "Hardware acceleration requires additional configuration.", "LabelHardwareEncoding": "Hardware encoding", - "LabelHDHomerunPortRange": "HDHomeRun port range", - "LabelHDHomerunPortRangeHelp": "Restricts the HDHomeRun UDP port range to this value. (Default is 1024 - 645535).", "LabelHomeNetworkQuality": "Home network quality", "LabelHomeScreenSectionValue": "Home screen section {0}", "LabelHttpsPort": "Local HTTPS port number", @@ -887,8 +880,6 @@ "LabelSource": "Source", "LabelSpecialSeasonsDisplayName": "Special season display name", "LabelSportsCategories": "Sports categories", - "LabelSSDPTracingFilter": "SSDP Filter", - "LabelSSDPTracingFilterHelp": "Optional IP address upon which to filter the logged SSDP traffic.", "LabelStable": "Stable", "LabelStartWhenPossible": "Start when possible", "LabelStatus": "Status", @@ -971,8 +962,6 @@ "LabelType": "Type", "LabelTypeMetadataDownloaders": "Metadata downloaders ({0})", "LabelTypeText": "Text", - "LabelUDPPortRange": "UDP Communication Range", - "LabelUDPPortRangeHelp": "Restrict Jellyfin to use this port range when making UDP connections. (Default is 1024 - 645535).
Note: Certain function require fixed ports that may be outside of this range.", "LabelUnstable": "Unstable", "LabelUser": "User", "LabelUserAgent": "User agent",