From 53dbe258a555f5c877ca85b8df615601034c8bcf Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Tue, 17 Oct 2023 11:57:14 +1000
Subject: [PATCH 1/5] Fix CI compose project name not allowing dots

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 862b2470..7fafb084 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 		IMAGE                      = 'nginx-proxy-manager'
 		BUILD_VERSION              = getVersion()
 		MAJOR_VERSION              = '2'
-		BRANCH_LOWER               = "${BRANCH_NAME.toLowerCase().replaceAll('/', '-')}"
+		BRANCH_LOWER               = "${BRANCH_NAME.toLowerCase().replaceAll('/', '-').replaceAll('.', '-')}"
 		COMPOSE_PROJECT_NAME       = "npm_${BRANCH_LOWER}_${BUILD_NUMBER}"
 		COMPOSE_FILE               = 'docker/docker-compose.ci.yml'
 		COMPOSE_INTERACTIVE_NO_CLI = 1

From 134902d1272576c79e5e38550eb1469a012e8d43 Mon Sep 17 00:00:00 2001
From: chishin <pro@xxgzs.org>
Date: Sun, 29 Oct 2023 10:43:57 +0800
Subject: [PATCH 2/5] Add a default-site-description string

---
 frontend/js/i18n/messages.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/js/i18n/messages.json b/frontend/js/i18n/messages.json
index d77351d6..44b638a3 100644
--- a/frontend/js/i18n/messages.json
+++ b/frontend/js/i18n/messages.json
@@ -285,6 +285,7 @@
     "settings": {
       "title": "Settings",
       "default-site": "Default Site",
+      "default-site-description": "What to show when Nginx is hit with an unknown Host",
       "default-site-congratulations": "Congratulations Page",
       "default-site-404": "404 Page",
       "default-site-444": "No Response (444)",

From 940d06cac90de7f39e0a1cafce4bba4ecbaafa08 Mon Sep 17 00:00:00 2001
From: chishin <pro@xxgzs.org>
Date: Sun, 29 Oct 2023 10:50:45 +0800
Subject: [PATCH 3/5] Replace the 'default-site' variable 'description' with
 the 'i18n' configuration

---
 frontend/js/app/settings/default-site/main.ejs | 2 +-
 frontend/js/app/settings/list/item.ejs         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/js/app/settings/default-site/main.ejs b/frontend/js/app/settings/default-site/main.ejs
index f1c4ccf6..d74ac0bd 100644
--- a/frontend/js/app/settings/default-site/main.ejs
+++ b/frontend/js/app/settings/default-site/main.ejs
@@ -8,7 +8,7 @@
             <div class="row">
                 <div class="col-sm-12 col-md-12">
                     <div class="form-group">
-                        <div class="form-label"><%- description %></div>
+                        <div class="form-label"><%- i18n('settings', 'default-site-description') %></div>
                         <div class="custom-controls-stacked">
                             <label class="custom-control custom-radio">
                                 <input class="custom-control-input" name="value" value="congratulations" type="radio" required <%- value === 'congratulations' ? 'checked' : '' %>>
diff --git a/frontend/js/app/settings/list/item.ejs b/frontend/js/app/settings/list/item.ejs
index 4f81b450..1623c4dc 100644
--- a/frontend/js/app/settings/list/item.ejs
+++ b/frontend/js/app/settings/list/item.ejs
@@ -1,7 +1,7 @@
 <td>
-    <div><%- name %></div>
+    <div><%- i18n('settings', 'default-site') %></div>
     <div class="small text-muted">
-        <%- description %>
+        <%- i18n('settings', 'default-site-description') %>
     </div>
 </td>
 <td>

From e24181936fb2bd8d5080827961f4480bfa7e66ee Mon Sep 17 00:00:00 2001
From: AngusC222 <137439262+AngusC222@users.noreply.github.com>
Date: Wed, 8 Nov 2023 12:09:36 +0000
Subject: [PATCH 4/5] min/max ports added

---
 frontend/js/app/nginx/stream/form.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/js/app/nginx/stream/form.ejs b/frontend/js/app/nginx/stream/form.ejs
index eb80c373..1fc4f134 100644
--- a/frontend/js/app/nginx/stream/form.ejs
+++ b/frontend/js/app/nginx/stream/form.ejs
@@ -9,7 +9,7 @@
                 <div class="col-sm-12 col-md-12">
                     <div class="form-group">
                         <label class="form-label"><%- i18n('streams', 'incoming-port') %> <span class="form-required">*</span></label>
-                        <input name="incoming_port" type="number" class="form-control text-monospace" placeholder="eg: 8080" value="<%- incoming_port %>" required>
+                        <input name="incoming_port" type="number" class="form-control text-monospace" placeholder="eg: 8080" min="1" max="65535" value="<%- incoming_port %>" required>
                     </div>
                 </div>
                 <div class="col-sm-8 col-md-8">
@@ -21,7 +21,7 @@
                 <div class="col-sm-4 col-md-4">
                     <div class="form-group">
                         <label class="form-label"><%- i18n('streams', 'forwarding-port') %> <span class="form-required">*</span></label>
-                        <input name="forwarding_port" type="number" class="form-control text-monospace" placeholder="eg: 80" value="<%- forwarding_port %>" required>
+                        <input name="forwarding_port" type="number" class="form-control text-monospace" placeholder="eg: 80" min="1" max="65535" value="<%- forwarding_port %>" required>
                     </div>
                 </div>
                 <div class="col-sm-6 col-md-6">

From edb81ecce06252df1816d7ea66509122b1d774a9 Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Thu, 9 Nov 2023 07:35:24 +1000
Subject: [PATCH 5/5] Fix CI branch names being incorrectly replaced

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7fafb084..ca32bcc5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 		IMAGE                      = 'nginx-proxy-manager'
 		BUILD_VERSION              = getVersion()
 		MAJOR_VERSION              = '2'
-		BRANCH_LOWER               = "${BRANCH_NAME.toLowerCase().replaceAll('/', '-').replaceAll('.', '-')}"
+		BRANCH_LOWER               = "${BRANCH_NAME.toLowerCase().replaceAll('\\\\', '-').replaceAll('/', '-').replaceAll('\\.', '-')}"
 		COMPOSE_PROJECT_NAME       = "npm_${BRANCH_LOWER}_${BUILD_NUMBER}"
 		COMPOSE_FILE               = 'docker/docker-compose.ci.yml'
 		COMPOSE_INTERACTIVE_NO_CLI = 1