github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v4.2.3.0 

Changelog: https://haproxy-wi.org/changelog.py#4_2_3
pull/227/head
Pavel Loginov 2020-04-28 16:33:30 +02:00
parent bb7c0fd84c
commit 0c84921df5
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/options.py
View File

@ -1225,12 +1225,19 @@ if form.getvalue('bwlists_save'):
path = sql.get_setting('haproxy_dir')+"/"+color path = sql.get_setting('haproxy_dir')+"/"+color
servers = [] servers = []
if serv != 'all':
servers.append(serv) servers.append(serv)
MASTERS = sql.is_master(serv) MASTERS = sql.is_master(serv)
for master in MASTERS: for master in MASTERS:
if master[0] != None: if master[0] != None:
servers.append(master[0]) servers.append(master[0])
else:
server = sql.get_dick_permit()
for s in server:
servers.append(s[2])
for serv in servers: for serv in servers:
funct.ssh_command(serv, ["sudo mkdir "+path]) funct.ssh_command(serv, ["sudo mkdir "+path])
funct.ssh_command(serv, ["sudo chown $(whoami) "+path]) funct.ssh_command(serv, ["sudo chown $(whoami) "+path])
@ -1307,10 +1314,10 @@ if form.getvalue('newuser') is not None:
email = form.getvalue('newemail') email = form.getvalue('newemail')
password = form.getvalue('newpassword') password = form.getvalue('newpassword')
role = form.getvalue('newrole') role = form.getvalue('newrole')
group = form.getvalue('newgroupuser')
new_user = form.getvalue('newusername') new_user = form.getvalue('newusername')
page = form.getvalue('page') page = form.getvalue('page')
activeuser = form.getvalue('activeuser') activeuser = form.getvalue('activeuser')
group = form.getvalue('newgroupuser')
role_id = sql.get_role_id_by_name(role) role_id = sql.get_role_id_by_name(role)
if funct.check_group(group, role_id): 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: if form.getvalue('updateuser') is not None:
email = form.getvalue('email') email = form.getvalue('email')
role = form.getvalue('role') role = form.getvalue('role')
group = form.getvalue('usergroup')
new_user = form.getvalue('updateuser') new_user = form.getvalue('updateuser')
id = form.getvalue('id') id = form.getvalue('id')
activeuser = form.getvalue('activeuser') activeuser = form.getvalue('activeuser')
group = form.getvalue('usergroup')
role_id = sql.get_role_id_by_name(role) role_id = sql.get_role_id_by_name(role)
if funct.check_group(group, role_id): if funct.check_group(group, role_id):
@ -1622,4 +1629,3 @@ if form.getvalue('updatesettings') is not None:
if sql.update_setting(settings, val): if sql.update_setting(settings, val):
funct.logging('value '+val, ' changed settings '+settings, haproxywi=1, login=1) funct.logging('value '+val, ' changed settings '+settings, haproxywi=1, login=1)
print("Ok") print("Ok")

2
app/templates/add.html
View File

@ -758,6 +758,7 @@ h3 {
<td class="padding10 first-collumn"> <td class="padding10 first-collumn">
<select required name="serv-black-list" id="serv-black-list"> <select required name="serv-black-list" id="serv-black-list">
<option disabled selected>Choose server</option> <option disabled selected>Choose server</option>
<option value="all">ALL</option>
{% for select in selects %} {% for select in selects %}
<option value="{{ select.2 }}">{{ select.1 }}</option> <option value="{{ select.2 }}">{{ select.1 }}</option>
{% endfor %} {% endfor %}
@ -786,6 +787,7 @@ h3 {
<td class="padding10 first-collumn"> <td class="padding10 first-collumn">
<select required name="serv-white-list" id="serv-white-list"> <select required name="serv-white-list" id="serv-white-list">
<option disabled selected>Choose server</option> <option disabled selected>Choose server</option>
<option value="all">ALL</option>
{% for select in selects %} {% for select in selects %}
<option value="{{ select.2 }}">{{ select.1 }}</option> <option value="{{ select.2 }}">{{ select.1 }}</option>
{% endfor %} {% endfor %}