Merge pull request #6387 from viown/remove-auto-port-forward

jellyfin · Dec 21, 2024 · 6e3fdbb · 6e3fdbb
2 parents c36c58e + fb1ef7d
commit 6e3fdbb
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 27 deletions.
diff --git a/src/controllers/dashboard/networking.html b/src/controllers/dashboard/networking.html
@@ -96,14 +96,6 @@ <h2 class="sectionTitle">${TabNetworking}</h2>
                                 <option value="blacklist">${Blacklist}</option>
                             </select>
                         </div>
-
-                        <div class="checkboxContainer checkboxContainer-withDescription fldEnableUpnp hide">
-                            <label>
-                                <input type="checkbox" is="emby-checkbox" id="chkEnableUpnp" />
-                                <span>${LabelEnableAutomaticPortMap}</span>
-                            </label>
-                            <div class="fieldDescription checkboxFieldDescription">${LabelEnableAutomaticPortMapHelp}</div>
-                        </div>
                         <div class="inputContainer fldPublicHttpPort hide">
                             <input is="emby-input" type="number" label="${LabelPublicHttpPort}" id="txtPublicHttpPort" pattern="[0-9]*" required="required" min="1" max="65535" />
                             <div class="fieldDescription">${LabelPublicHttpPortHelp}</div>

diff --git a/src/controllers/dashboard/networking.js b/src/controllers/dashboard/networking.js
@@ -8,8 +8,7 @@ import alert from '../../components/alert';
 function onSubmit(e) {
     const form = this;
     const localAddress = form.querySelector('#txtLocalAddress').value;
-    const enableUpnp = form.querySelector('#chkEnableUpnp').checked;
-    confirmSelections(localAddress, enableUpnp, function () {
+    confirmSelections(localAddress, function () {
         const validationResult = getValidationAlert(form);
 
         if (validationResult) {
@@ -54,7 +53,6 @@ function onSubmit(e) {
                 config.InternalHttpsPort = form.querySelector('#txtHttpsPort').value;
                 config.EnableHttps = form.querySelector('#chkEnableHttps').checked;
                 config.RequireHttps = form.querySelector('#chkRequireHttps').checked;
-                config.EnableUPnP = enableUpnp;
                 config.BaseUrl = form.querySelector('#txtBaseUrl').value;
                 config.EnableRemoteAccess = form.querySelector('#chkRemoteAccess').checked;
                 config.CertificatePath = form.querySelector('#txtCertificatePath').value || null;
@@ -110,8 +108,8 @@ function showAlertText(options) {
     });
 }
 
-function confirmSelections(localAddress, enableUpnp, callback) {
-    if (localAddress || !enableUpnp) {
+function confirmSelections(localAddress, callback) {
+    if (localAddress) {
         showAlertText({
             title: globalize.translate('TitleHostingSettings'),
             text: globalize.translate('SettingsWarning')
@@ -139,7 +137,6 @@ export default function (view) {
         const txtCertificatePath = page.querySelector('#txtCertificatePath');
         txtCertificatePath.value = config.CertificatePath || '';
         page.querySelector('#txtCertPassword').value = config.CertificatePassword || '';
-        page.querySelector('#chkEnableUpnp').checked = config.EnableUPnP;
         triggerChange(page.querySelector('#chkRemoteAccess'));
         page.querySelector('#chkAutodiscovery').checked = config.AutoDiscovery;
         page.querySelector('#chkEnableIP6').checked = config.EnableIPv6;
@@ -154,13 +151,11 @@ export default function (view) {
             view.querySelector('.fldExternalAddressFilterMode').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('.fldPublicHttpPort').classList.add('hide');
             view.querySelector('.fldPublicHttpsPort').classList.add('hide');
-            view.querySelector('.fldEnableUpnp').classList.add('hide');
         }
     });
     view.querySelector('#btnSelectCertPath').addEventListener('click', function () {

diff --git a/src/controllers/wizard/remote/index.html b/src/controllers/wizard/remote/index.html
@@ -11,13 +11,6 @@ <h1>${HeaderConfigureRemoteAccess}</h1>
                     </label>
                     <div class="fieldDescription checkboxFieldDescription">${AllowRemoteAccessHelp}</div>
                 </div>
-                <div class="checkboxContainer checkboxContainer-withDescription">
-                    <label>
-                        <input type="checkbox" is="emby-checkbox" id="chkEnableUpnp" />
-                        <span>${LabelEnableAutomaticPortMap}</span>
-                    </label>
-                    <div class="fieldDescription checkboxFieldDescription">${LabelEnableAutomaticPortMapHelp}</div>
-                </div>
                 <br />
                 <div class="wizardNavigation">
                     <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();">

diff --git a/src/controllers/wizard/remote/index.js b/src/controllers/wizard/remote/index.js
@@ -8,8 +8,7 @@ function save(page) {
     loading.show();
     const apiClient = ApiClient;
     const config = {
-        EnableRemoteAccess: page.querySelector('#chkRemoteAccess').checked,
-        EnableAutomaticPortMapping: page.querySelector('#chkEnableUpnp').checked
+        EnableRemoteAccess: page.querySelector('#chkRemoteAccess').checked
     };
 
     apiClient.ajax({

diff --git a/src/strings/en-us.json b/src/strings/en-us.json
@@ -682,8 +682,6 @@
     "LabelDynamicExternalId": "{0} Id",
     "LabelEnableAudioVbr": "Enable VBR audio encoding",
     "LabelEnableAudioVbrHelp": "Variable bitrate offers better quality to average bitrate ratio, but in some rare cases may cause buffering and compatibility issues.",
-    "LabelEnableAutomaticPortMap": "Enable automatic port mapping",
-    "LabelEnableAutomaticPortMapHelp": "Automatically forward public ports on your router to local ports on your server via UPnP. This may not work with some router models or network configurations. Changes will not apply until after a server restart.",
     "LabelEnableHardwareDecodingFor": "Enable hardware decoding for",
     "LabelEnableHttps": "Enable HTTPS",
     "LabelEnableHttpsHelp": "Listen on the configured HTTPS port. A valid certificate must also be supplied for this to take effect.",