From c6c5ca2193d2f94cab7dea433435aad592d6212c Mon Sep 17 00:00:00 2001
From: Aidaho12 <buffoon2001@mail.ru>
Date: Mon, 27 Aug 2018 17:28:29 +0600
Subject: [PATCH] v3.2.2

Improved Adds pages
---
 app/add.py              | 17 +++++------
 app/funct.py            |  4 ++-
 app/templates/add.html  | 68 +++++++++++++++++++++++++++++++----------
 app/templates/base.html |  2 +-
 inc/awesome.css         |  6 ++++
 inc/script.js           | 30 ++++++++++++------
 inc/style.css           |  6 ++++
 7 files changed, 96 insertions(+), 37 deletions(-)

diff --git a/app/add.py b/app/add.py
index c22e5bba..b15bdbc4 100644
--- a/app/add.py
+++ b/app/add.py
@@ -142,16 +142,15 @@ if form.getvalue('mode') is not None:
 		options_split += cookie
 		if form.getvalue('dynamic'):
 			options_split += "    dynamic-cookie-key " + form.getvalue('dynamic-cookie-key')+"\n"
-		
+			
+	servers_split = ""	
 	if form.getvalue('servers') is not None:	
-		servers = form.getvalue('servers')
-		i = servers.split("\n")
-		servers_split = ""
-		for j in i:	
-			j = j.strip('\t\n\r')
-			servers_split += "    server " + j + check + "\n"
-	else:
-		servers_split = ""
+		servers = form.getlist('servers')
+		server_port = form.getlist('server_port')
+		i = 0
+		for server in servers:
+			servers_split += "    server test " + server +":"+server_port[i]+ check + "\n"
+			i += 1
 		
 	compression = form.getvalue("compression")
 	cache = form.getvalue("cache")
diff --git a/app/funct.py b/app/funct.py
index c6840b8c..fa7a0ee8 100644
--- a/app/funct.py
+++ b/app/funct.py
@@ -456,7 +456,9 @@ def ssh_command(serv, commands, **kwargs):
 		else:
 			return stdout.read().decode(encoding='UTF-8')
 			
-		print("<div class='alert alert-warning'>"+stderr.read().decode(encoding='UTF-8')+"</div>")
+		for line in stderr.read().decode(encoding='UTF-8'):
+			if line:
+				print("<div class='alert alert-warning'>"+line+"</div>")
 	try:	
 		ssh.close()
 	except:
diff --git a/app/templates/add.html b/app/templates/add.html
index e788c0ad..865c4b84 100644
--- a/app/templates/add.html
+++ b/app/templates/add.html
@@ -42,7 +42,11 @@
 				<div class="tooltip tooltipTop">IP for bind listner, <b>if empty will be assignet on all IPs</b>. Start typing ip, or press down.<br>If you use <b>VRRP keep in blank</b>. If you assign an IP, the slave will not start</div>
 			</td>
 		</tr>
-		<tr>
+		<tr class="advance-show">
+			<td class="addName">Advanced:</td>
+			<td class="addOption"><a href="#" title="Show Advanced settings">Show Advanced settings</a></td>
+		</tr>
+		<tr class="advance">
 			<td class="addName">Mode: </td>
 			<td class="addOption">
 				<select required name="mode" id="listen-mode-select">
@@ -60,7 +64,7 @@
 				</div>
 			</td>
 		</tr>
-		<tr>
+		<tr class="advance">
 			<td class="addName">Balance: </td>
 			<td class="addOption">
 				<select required name="balance">
@@ -72,7 +76,7 @@
 				</select>
 			</td>
 		</tr>
-		<tr>
+		<tr class="advance">
 			<td class="addName"><span title="Cache support start 1.8 and latter">Web acceleration(?):</span></td>
 			<td class="addOption">
 				<span class="controlgroup">	
@@ -82,7 +86,7 @@
 				</span>
 			</td>
 		</tr>
-		<tr>
+		<tr class="advance">
 			<td class="addName"><span title="Web application firewall">WAF(?):</span></td>
 			<td class="addOption">
 				<span class="controlgroup">
@@ -97,7 +101,7 @@
 				</div>
 			</td>
 		</tr>
-		<tr>
+		<tr class="advance">
 			<td class="addName">Optinons:</td>
 			<td class="addOption">
 				<span class="controlgroup">				
@@ -153,7 +157,19 @@
 		<tr>
 			<td class="addName">Servers:</td>
 			<td class="addOption">
-				<textarea name="servers" required title="Backend servers" cols=80 rows=3 placeholder="hostname ip:port"></textarea>
+				<span id="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 IP" size=1 placeholder="yyy" class="form-control">
+					<br />
+					<input name="servers" title="Backend port" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control">:
+					<input name="server_port" title="Backend port" size=1 placeholder="yyy" class="form-control">
+					<br />
+					<input name="servers" title="Backend port" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control">:
+					<input name="server_port" title="Backend port" size=1 placeholder="yyy" class="form-control">
+				</span>
+				<span>
+					<a class="add-server" id="add-server" title="Add backend server" style="cursor: pointer;"></a>
+				</span>
 				<div>
 					<label for="controlgroup-listen-show" style="margin-top: 5px;" title="Change default check">Cusmot check params</label>
 					<input type="checkbox" id="controlgroup-listen-show" name="default-check" value="1">
@@ -223,7 +239,11 @@
 				<div class="tooltip tooltipTop">IP for bind listner, <b>if empty will be assignet on all IPs</b>. Start typing ip, or press down.<br>If you use <b>VRRP keep in blank</b>. If you assign an IP, the slave will not start</div>
 			</td>
 		</tr>
-		<tr>
+		<tr class="advance-show">
+			<td class="addName">Advanced:</td>
+			<td class="addOption"><a href="#" title="Show Advanced settings">Show Advanced settings</a></td>
+		</tr>
+		<tr class="advance">
 			<td class="addName">Mode: </td>
 			<td class="addOption">
 				<select required name="mode" id="frontend-mode-select">
@@ -240,7 +260,7 @@
 				</div>				
 			</td>
 		</tr>
-		<tr>
+		<tr class="advance">
 			<td class="addName"><span title="Cache support start 1.8 and latter">Web acceleration(?):</span></td>
 			<td class="addOption">
 				<span class="controlgroup">	
@@ -250,7 +270,7 @@
 				</span>	
 			</td>
 		</tr>
-		<tr>
+		<tr class="advance">
 			<td class="addName"><span title="Web application firewall">WAF(?):</span></td>
 			<td class="addOption">
 				<span class="controlgroup">
@@ -264,7 +284,7 @@
 				</div>
 			</td>
 		</tr>
-		<tr>
+		<tr class="advance">
 			<td class="addName">Optinons:</td>
 			<td class="addOption">
 				<span class="controlgroup">
@@ -332,7 +352,11 @@
 				<input type="text" name="new_backend" id="new_backend" required title="Name backend"  placeholder="web_80" class="form-control">
 			</td>
 		</tr>
-		<tr>
+		<tr class="advance-show">
+			<td class="addName">Advanced:</td>
+			<td class="addOption"><a href="#" title="Show Advanced settings">Show Advanced settings</a></td>
+		</tr>
+		<tr class="advance">
 			<td class="addName">Mode: </td>
 			<td class="addOption">
 				<select required name="mode" id="backend-mode-select">
@@ -350,7 +374,7 @@
 				</div>				
 			</td>
 		</tr>
-		<tr>
+		<tr class="advance">
 			<td class="addName">Balance: </td>
 			<td class="addOption">
 				<select required name="balance">
@@ -362,7 +386,7 @@
 				</select>
 			</td>
 		</tr>
-		<tr>
+		<tr class="advance">
 			<td class="addName"><span title="Cache support start 1.8 and latter">Web acceleration(?):</span></td>
 			<td class="addOption">
 				<span class="controlgroup">
@@ -372,7 +396,7 @@
 				</span>
 			</td>
 		</tr>
-		<tr>
+		<tr class="advance">
 			<td class="addName">Optinons:</td>
 			<td class="addOption">
 				<span class="controlgroup">					
@@ -387,8 +411,8 @@
 					</select>	
 					<label for="cookie2" title="Enable Redispatch">Set cookie</label><input type="checkbox" id="cookie2" name="cookie" value="1">				
 					<label for="options-backend-show" title="Set options manualy">Set options</label><input type="checkbox" id="options-backend-show">
-					<br>
 				</span>
+				<br>
 				<span id="cookie_div2" style="display: none;">
 					<input type="text" placeholder="name" name="cookie_name" id="cookie_name2" class="form-control"><br><br>
 					<input type="text" placeholder="domain" name="cookie_domain" class="form-control"><br><br>
@@ -428,7 +452,19 @@
 		<tr>
 			<td class="addName">Servers:</td>
 			<td class="addOption">
-				<textarea name="servers" title="Backend servers" required cols=80 rows=3 placeholder="hostname ip:port"></textarea>
+				<span id="servers2">
+					<input name="servers" required title="Backend IP" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control">:
+					<input name="server_port" required title="Backend IP" size=1 placeholder="yyy" class="form-control">
+					<br />
+					<input name="servers" title="Backend port" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control">:
+					<input name="server_port" title="Backend port" size=1 placeholder="yyy" class="form-control">
+					<br />
+					<input name="servers" title="Backend port" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control">:
+					<input name="server_port" title="Backend port" size=1 placeholder="yyy" class="form-control">
+				</span>
+				<span>
+					<a class="add-server" id="add-server2" title="Add backend server" style="cursor: pointer;"></a>
+				</span>
 				<div>
 					<label for="controlgroup-backend-show" style="margin-top: 5px;" title="Change default check"	>Cusmot check params</label>
 					<input type="checkbox" id="controlgroup-backend-show" name="default-check">
diff --git a/app/templates/base.html b/app/templates/base.html
index 1ab749c7..d2d0dbe3 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -102,7 +102,7 @@
 					</ul>
 				</nav>
 				<div class="copyright-menu">
-					HAproxy-WI v3.2
+					HAproxy-WI v3.2.2
 					<br>
 					<a href="https://www.patreon.com/haproxy_wi" title="Donate" target="_blank" style="color: #fff; margin-left: 30px; color: red;" class="patreon">  Patreon</a>
 				</div>
diff --git a/inc/awesome.css b/inc/awesome.css
index db193f59..c7a80273 100644
--- a/inc/awesome.css
+++ b/inc/awesome.css
@@ -158,3 +158,9 @@
 	font-family: "Font Awesome 5 Solid";
 	content: "\f00c";
 }
+.add-server::before {
+	display: none;
+	font-family: "Font Awesome 5 Solid";
+	content: "\f067";
+	width:3px;
+}
\ No newline at end of file
diff --git a/inc/script.js b/inc/script.js
index 4bf96ca2..f4168cf5 100644
--- a/inc/script.js
+++ b/inc/script.js
@@ -1198,7 +1198,17 @@ $( function() {
 			}
 		} );
 	});
-
+	var add_server_var = '<br /><input name="servers" title="Backend port" size=14 placeholder="xxx.xxx.xxx.xxx" class="form-control">: <input name="server_port" title="Backend port" size=1 placeholder="yyy" class="form-control">'
+	$('#add-server').click(function() {
+		$('#servers').append(add_server_var);		
+	});
+	$('#add-server2').click(function() {
+		$('#servers2').append(add_server_var);		
+	});
+	$('.advance-show').click(function() {
+		$('.advance-show').fadeOut();
+		$('.advance').fadeIn();
+	});
 	$('#auth').submit(function() {
 		$('.alert-danger').remove();
 		let searchParams = new URLSearchParams(window.location.search)
@@ -1216,18 +1226,18 @@ $( function() {
 			type: "GET",
 			success: function( data ) {
 				if (data.indexOf('ok') != '-1') {
-					 $( "#dialog-confirm" ).dialog({
-						  resizable: false,
-						  height: "auto",
-						  width: 400,
-						  modal: true,
-						  title: "Support the project!",
-						  buttons: {
-							"Ok": function() {
+					$( "#dialog-confirm" ).dialog({
+						resizable: false,
+						height: "auto",
+						width: 400,
+						modal: true,
+						title: "Support the project!",
+						buttons: {
+						"Ok": function() {
 								window.location.replace(ref);
 							}
 						  }
-						});
+					});
 				} else {
 					$('.alert-danger').remove();
 					$("#ajax").html(data);					
diff --git a/inc/style.css b/inc/style.css
index 7acdd373..34ee44e9 100644
--- a/inc/style.css
+++ b/inc/style.css
@@ -247,6 +247,12 @@ pre {
 	border-bottom: 1px solid #ddd;
 	padding: 15px;
 }
+.advance {
+	display: none;
+}
+.advance-show  a{
+	color: #9d9d9d !important;
+}
 .addButton {
 	padding-top: 15px;
 	padding-left: 15px;