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

v3.4.4.4 

Del deprecated html module
pull/145/head
Pavel Loginov 2019-06-30 12:21:52 +03:00
parent 42a683ce0b
commit c83eb3989a
13 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/add.py
View File

@ -1,5 +1,4 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import html
import cgi import cgi
import os import os
import funct import funct
@ -55,7 +54,7 @@ if form.getvalue('mode') is not None:
ssl = "" ssl = ""
ssl_check = "" ssl_check = ""
if form.getvalue('balance') is not None: if form.getvalue('balance') is not None:
balance = " balance " + form.getvalue('balance') + "\n" balance = " balance " + form.getvalue('balance') + "\n"
if form.getvalue('ip') is not None: if form.getvalue('ip') is not None:
@ -118,23 +117,28 @@ if form.getvalue('mode') is not None:
if form.getvalue('cookie'): if form.getvalue('cookie'):
cookie = " cookie "+form.getvalue('cookie_name') cookie = " cookie "+form.getvalue('cookie_name')
rewrite = ""
prefix = ""
nocache = ""
postonly = ""
dynamic = ""
if form.getvalue('cookie_domain'): if form.getvalue('cookie_domain'):
cookie += " domain "+form.getvalue('cookie_domain') cookie += " domain "+form.getvalue('cookie_domain')
if form.getvalue('rewrite'): if form.getvalue('rewrite'):
rewrite = form.getvalue('rewrite') rewrite = form.getvalue('rewrite')
else:
rewrite = ""
if form.getvalue('prefix'): if form.getvalue('prefix'):
prefix = form.getvalue('prefix') prefix = form.getvalue('prefix')
else:
prefix = ""
if form.getvalue('nocache'): if form.getvalue('nocache'):
nocache = form.getvalue('nocache') nocache = form.getvalue('nocache')
else:
nocache = ""
if form.getvalue('postonly'): if form.getvalue('postonly'):
postonly = form.getvalue('postonly') postonly = form.getvalue('postonly')
else:
postonly = ""
if form.getvalue('dynamic'): if form.getvalue('dynamic'):
dynamic = form.getvalue('dynamic') dynamic = form.getvalue('dynamic')
else:
dynamic = ""
cookie += " "+rewrite+" "+prefix+" "+nocache+" "+postonly+" "+dynamic+"\n" cookie += " "+rewrite+" "+prefix+" "+nocache+" "+postonly+" "+dynamic+"\n"
options_split += cookie options_split += cookie
if form.getvalue('dynamic'): if form.getvalue('dynamic'):

1
app/config.py
View File

@ -1,5 +1,4 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import html
import cgi import cgi
import os import os
import http.cookies import http.cookies

1
app/create_db.py
View File

@ -1,6 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import cgi import cgi
import html
import os import os
import sys import sys
import funct import funct

2
app/delver.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import html, http.cookies import http.cookies
import cgi import cgi
import os import os
import funct, sql import funct, sql

2
app/ha.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import html, http.cookies import http.cookies
import cgi import cgi
import os import os
import funct, sql import funct, sql

2
app/ihap.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import html, http.cookies import http.cookies
import cgi import cgi
import os import os
import funct, sql import funct, sql

1
app/login.py
View File

@ -2,7 +2,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import cgi import cgi
import html
import os import os
import sys import sys
import funct import funct

2
app/logs.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import html
import cgi import cgi
import funct import funct
import sql import sql

7
app/options.py
View File

@ -1,6 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# -*- coding: utf-8 -*-" # -*- coding: utf-8 -*-"
import html
import cgi import cgi
import os, sys import os, sys
import funct import funct
@ -337,7 +336,7 @@ if serv is not None and act == "configShow":
env = Environment(loader=FileSystemLoader('templates/ajax'),extensions=['jinja2.ext.loopcontrols']) env = Environment(loader=FileSystemLoader('templates/ajax'),extensions=['jinja2.ext.loopcontrols'])
template = env.get_template('config_show.html') template = env.get_template('config_show.html')
template = template.render(conf=conf, view=form.getvalue('view'), serv=serv, configver=form.getvalue('configver')) template = template.render(conf=conf, view=form.getvalue('view'), serv=serv, configver=form.getvalue('configver'), role=funct.is_admin(level=2))
print(template) print(template)
if form.getvalue('configver') is None: if form.getvalue('configver') is None:
@ -460,7 +459,7 @@ if form.getvalue('metrics'):
x_max = df.index.max() + pd.Timedelta(minutes=1) x_max = df.index.max() + pd.Timedelta(minutes=1)
p[serv] = figure( p[serv] = figure(
tools="pan,box_zoom,reset,xwheel_zoom", tools="pan,box_zoom,reset,xwheel_zoom",
title=metric[0][0], title=metric[0][0],
x_axis_type="datetime", y_axis_label='Connections', x_axis_type="datetime", y_axis_label='Connections',
x_range = (x_max.timestamp()*1000-60*100000, x_max.timestamp()*1000) x_range = (x_max.timestamp()*1000-60*100000, x_max.timestamp()*1000)
@ -645,4 +644,4 @@ if form.getvalue('get_ldap_email'):
except: except:
print('error: user not found') print('error: user not found')
finally: finally:
l.unbind() l.unbind()

2
app/servers.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import html, http import http
import cgi import cgi
import sys import sys
import os import os

1
app/settings.py
View File

@ -1,5 +1,4 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import html
import cgi import cgi
import os import os
import funct import funct

2
app/templates/base.html
View File

@ -115,7 +115,7 @@
</ul> </ul>
</nav> </nav>
<div class="copyright-menu"> <div class="copyright-menu">
<a href="https://github.com/aidaho12/haproxy-wi/" title="Github repo" target="_blank" style="color: #fff">HAproxy-WI v3.4.4.3</a> <a href="https://github.com/aidaho12/haproxy-wi/" title="Github repo" target="_blank" style="color: #fff">HAproxy-WI v3.4.4.4</a>
<br> <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> <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> </div>

2
app/viewsttats.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import html, http.cookies, os import http.cookies, os
import cgi import cgi
import funct import funct
import sql import sql