From 722604b3255171ade16e36ba5c37da90422e1432 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <aidaho@roxy-wi.org>
Date: Sun, 9 Oct 2022 14:40:36 +0300
Subject: [PATCH] v6.2.1.0

Changelog: https://roxy-wi.org/changelog#6_2_1
---
 app/templates/include/add_nginx_servers.html | 24 ++++++++++++++++++++
 inc/users.js                                 |  6 ++---
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 app/templates/include/add_nginx_servers.html

diff --git a/app/templates/include/add_nginx_servers.html b/app/templates/include/add_nginx_servers.html
new file mode 100644
index 00000000..af6f56e7
--- /dev/null
+++ b/app/templates/include/add_nginx_servers.html
@@ -0,0 +1,24 @@
+<style>
+	.send_proxy_label {
+		padding: 3px !important;
+	}
+</style>
+<span name="add_servers">
+	<input name="servers" required title="Backend IP" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control">:
+	<input name="server_port" required title="Backend port" size=8 placeholder="yyy" class="form-control add_server_number" type="number">
+	<span name="max_fails">max_fails:</span> <input name="max_fails" required title="By default, the number of unsuccessful attempts is set to 1" size=8 class="form-control add_server_number" value="1" type="number">
+	<span name="fail_timeout">fail_timeout:</span>  <input name="fail_timeout" required title="By default, the number of unsuccessful attempts is set to 1s" size=8 value="1" class="form-control add_server_number" type="number">s
+	<br />
+	<input name="servers" title="Backend IP" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control second-server"><span class="second-server">:</span>
+	<input name="server_port" title="Backend port" size=8 placeholder="yyy" class="form-control second-server add_server_number" type="number">
+	<span name="max_fails">max_fails:</span> <input name="max_fails" required title="By default, the number of unsuccessful attempts is set to 1" size=8 class="form-control add_server_number" value="1" type="number">
+	<span name="fail_timeout">fail_timeout:</span>  <input name="fail_timeout" required title="By default, the number of unsuccessful attempts is set to 1" size=8 value="1" class="form-control add_server_number" type="number">s
+	<br />
+	<input name="servers" title="Backend IP" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control second-server"><span class="second-server">:</span>
+	<input name="server_port" title="Backend port" size=3 placeholder="yyy" class="form-control second-server add_server_number" type="number">
+	<span name="max_fails">max_fails:</span> <input name="max_fails" required title="By default, the number of unsuccessful attempts is set to 1" size=8 class="form-control add_server_number" value="1" type="number">
+	<span name="fail_timeout">fail_timeout:</span>  <input name="fail_timeout" required title="By default, the number of unsuccessful attempts is set to 1" size=8 value="1" class="form-control add_server_number" type="number">s
+</span>
+<span>
+	<a class="link add-server backend_server" name="add-server-input" title="Add upstream" style="cursor: pointer;"></a>
+</span>
\ No newline at end of file
diff --git a/inc/users.js b/inc/users.js
index 8926cedf..3a0349ac 100644
--- a/inc/users.js
+++ b/inc/users.js
@@ -780,7 +780,7 @@ $( function() {
 				} else if (data.indexOf('success:') != '-1' ){
 					toastr.clear();
 					toastr.success(data);
-					$( "#geoipserv" ).trigger( "selectmenuchange" );
+					$( "#geoip_service" ).trigger( "selectmenuchange" );
 				} else if (data.indexOf('Info') != '-1' ){
 					toastr.clear();
 					toastr.info(data);
@@ -2849,10 +2849,10 @@ function checkGeoipInstallation() {
 		success: function( data ) {
 			data = data.replace(/^\s+|\s+$/g,'');
 			if(data.indexOf('No such file or directory') != '-1') {
-				$('#cur_geoip').text('GeoLite2 has not installed');
+				$('#cur_geoip').text('<b style="color: var(--green-color)">Not installed</b>');
 				$('#geoip_install').show();
 			} else {
-				$('#cur_geoip').text('GeoLite2 has already installed');
+				$('#cur_geoip').text('<b style="color: var(--red-color)">Installed<b>');
 				$('#geoip_install').hide();
 			}
 		}