From 0c84921df54c2c9d08edf51232c3faa3555d43e7 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Tue, 28 Apr 2020 16:33:30 +0200
Subject: [PATCH] v4.2.3.0

Changelog: https://haproxy-wi.org/changelog.py#4_2_3
---
 app/options.py         | 24 +++++++++++++++---------
 app/templates/add.html |  2 ++
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/options.py b/app/options.py
index ec682411..c0cca24c 100644
--- a/app/options.py
+++ b/app/options.py
@@ -1225,12 +1225,19 @@ if form.getvalue('bwlists_save'):
 	
 	path = sql.get_setting('haproxy_dir')+"/"+color
 	servers = []
-	servers.append(serv)
+	
+	if serv != 'all':	
+		servers.append(serv)
 
-	MASTERS = sql.is_master(serv)
-	for master in MASTERS:
-		if master[0] != None:
-			servers.append(master[0])
+		MASTERS = sql.is_master(serv)
+		for master in MASTERS:
+			if master[0] != None:
+				servers.append(master[0])
+	else:
+		server = sql.get_dick_permit()
+		for s in server:
+			servers.append(s[2])
+			
 	for serv in servers:
 		funct.ssh_command(serv, ["sudo mkdir "+path])
 		funct.ssh_command(serv, ["sudo chown $(whoami) "+path])
@@ -1307,10 +1314,10 @@ if form.getvalue('newuser') is not None:
 	email = form.getvalue('newemail')
 	password = form.getvalue('newpassword')
 	role = form.getvalue('newrole')
-	group = form.getvalue('newgroupuser')
 	new_user = form.getvalue('newusername')	
 	page = form.getvalue('page')	
 	activeuser = form.getvalue('activeuser')	
+	group = form.getvalue('newgroupuser')	
 	role_id = sql.get_role_id_by_name(role)
 	
 	if funct.check_group(group, role_id):
@@ -1343,10 +1350,10 @@ if form.getvalue('userdel') is not None:
 if form.getvalue('updateuser') is not None:
 	email = form.getvalue('email')
 	role = form.getvalue('role')
-	group = form.getvalue('usergroup')
 	new_user = form.getvalue('updateuser')	
 	id = form.getvalue('id')	
 	activeuser = form.getvalue('activeuser')	
+	group = form.getvalue('usergroup')	
 	role_id = sql.get_role_id_by_name(role)
 	
 	if funct.check_group(group, role_id):			
@@ -1621,5 +1628,4 @@ if form.getvalue('updatesettings') is not None:
 	val = form.getvalue('val')
 	if sql.update_setting(settings, val):
 		funct.logging('value '+val, ' changed settings '+settings, haproxywi=1, login=1)
-		print("Ok")
-	
+		print("Ok")
\ No newline at end of file
diff --git a/app/templates/add.html b/app/templates/add.html
index 3ff63308..ee21ef85 100644
--- a/app/templates/add.html
+++ b/app/templates/add.html
@@ -758,6 +758,7 @@ h3 {
 				<td class="padding10 first-collumn">
 					<select required name="serv-black-list" id="serv-black-list">
 						<option disabled selected>Choose server</option>
+						<option value="all">ALL</option>
 							{% for select in selects %}
 								<option value="{{ select.2 }}">{{ select.1 }}</option>
 							{% endfor %}	
@@ -786,6 +787,7 @@ h3 {
 				<td class="padding10 first-collumn">
 					<select required name="serv-white-list" id="serv-white-list">
 						<option disabled selected>Choose server</option>
+						<option value="all">ALL</option>
 							{% for select in selects %}
 								<option value="{{ select.2 }}">{{ select.1 }}</option>
 							{% endfor %}