From 3c5b6e772c1cf7957d00695bdc6cb5e96dd0e020 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Wed, 6 Jan 2021 10:33:33 +0600
Subject: [PATCH] v4.5.7.0

Changelog: https://haproxy-wi.org/changelog.py#4_5_7
---
 app/add.py                    |  2 +-
 app/metrics.py                | 13 ++++++++-----
 app/templates/add.html        | 12 ++++++------
 app/templates/hapservers.html |  2 +-
 app/templates/metrics.html    |  3 +--
 inc/add.js                    | 13 ++-----------
 6 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/app/add.py b/app/add.py
index 818f74e9..4a2008d1 100644
--- a/app/add.py
+++ b/app/add.py
@@ -32,7 +32,7 @@ if form.getvalue('mode') is None and form.getvalue('new_userlist') is None:
 	if not os.path.exists(dir+"/"+user_group):
 		os.makedirs(dir+"/"+user_group)
 	if not os.path.exists(white_dir):
-		os.makedirs(dir)
+		os.makedirs(white_dir)
 	if not os.path.exists(black_dir):
 		os.makedirs(black_dir)
 
diff --git a/app/metrics.py b/app/metrics.py
index 57c3d60e..61ebcc9e 100644
--- a/app/metrics.py
+++ b/app/metrics.py
@@ -12,11 +12,14 @@ try:
 	user, user_id, role, token, servers = funct.get_users_params()
 	cmd = "rpm --query haproxy-wi-metrics-* |awk -F\"metrics\" '{print $2}' |awk -F\".noa\" '{print $1}' |sed 's/-//1' |sed 's/-/./'"
 	service_ver, stderr = funct.subprocess_execute(cmd)
+	services = '0'
 
-	if service_ver == '* is not installed':
-		servers = ''
-	else:
-		servers = sql.select_servers_metrics(user_id.value)
+	if not stderr:
+		if service_ver[0] == '* is not installed':
+			servers = ''
+		else:
+			servers = sql.select_servers_metrics(user_id.value)
+			services = '1'
 except Exception:
 	pass
 
@@ -27,6 +30,6 @@ template = template.render(h2=1, title="Metrics",
 							user=user,
 							servers=servers,
 							versions=funct.versions(),
-							services=service_ver[0],
+							services=services,
 							token=token)
 print(template)
diff --git a/app/templates/add.html b/app/templates/add.html
index 6788bbd7..fff2646e 100644
--- a/app/templates/add.html
+++ b/app/templates/add.html
@@ -81,11 +81,11 @@
 						{% set values = {'http':'http','tcp':'tcp'} %}
 						{{ select('listen-mode-select', name='mode', values=values, selected='http', required='required', class='force_close') }}
 						<span id="https-listen-span">
-							<label for="https-listen" style="margin-top: 5px;" title="Enable ssl">SSL?</label>
+							<label for="https-listen" style="margin-top: 5px;" title="Enable SSL Offloading">SSL Offloading</label>
 							<input type="checkbox" id="https-listen" name="ssl" value="https" >
 						</span>
 						<div id="https-hide-listen" style="display: none;">
-							<br /><span class="tooltip tooltipTop">Enter name to pem file, or press down:</span><br />
+							<br /><span class="tooltip tooltipTop">Enter name of pem file, or press the "down" button:</span><br />
 							{{ input('path-cert-listen', name="cert", placeholder="some_cert.pem", size='39') }}<br />
 							<label for="ssl-check-listen" style="margin-top: 5px;">Disable ssl verify on servers?</label><input type="checkbox" id="ssl-check-listen" name="ssl-check" value="ssl-check" checked>
 						</div>
@@ -147,7 +147,7 @@
 						<span class="controlgroup">
 							{{ checkbox('compression', title='Enable Compression', value='1', desc='Compression') }}
 							{{ checkbox('cache', title='Enable cache', value='2', desc='Cache') }}
-							{{ checkbox('ssl_offloading', title='Enable SSL Offloading', desc='SSL Offloading') }}
+							{{ checkbox('ssl_offloading', title='Enable redirect from HTTP to HTTPS', desc='HTTP->HTTPS') }}
 						</span>
 					</td>
 				</tr>
@@ -312,11 +312,11 @@
 					{% set values = {'http':'http','tcp':'tcp'} %}
 					{{ select('frontend-mode-select', name='mode', values=values, selected='http', required='required', class='force_close') }}
 					<span id="https-frontend-span">
-						<label for="https-frontend" style="margin-top: 5px;">SSL?</label>
+						<label for="https-frontend" style="margin-top: 5px;" title="Enable SSL Offloading">SSL Offloading</label>
 						<input type="checkbox" id="https-frontend" name="ssl" value="https">
 					</span>
 					<div id="https-hide-frontend" style="display: none;">
-						<br /><span class="tooltip tooltipTop">Enter name to pem file, or press down:</span><br />
+						<br /><span class="tooltip tooltipTop">Enter name of pem file, or press the "down" button:</span><br />
 						{{ input('path-cert-frontend', name="cert", placeholder="some_cert.pem", size='39') }}
 					</div>
 				</td>
@@ -359,7 +359,7 @@
 					<span class="controlgroup">
 						{{ checkbox('compression2', name="compression", title='Enable Compression', value='1', desc='Compression') }}
 						{{ checkbox('cache2', name="cache", title='Enable cache', value='2', desc='Cache') }}
-						{{ checkbox('ssl_offloading1', title='Enable SSL Offloading', desc='SSL Offloading') }}
+						{{ checkbox('ssl_offloading1', title='Enable redirect from HTTP to HTTPS', desc='HTTP->HTTPS') }}
 					</span>
 				</td>
 			</tr>
diff --git a/app/templates/hapservers.html b/app/templates/hapservers.html
index 5988c74d..f2fc06b6 100644
--- a/app/templates/hapservers.html
+++ b/app/templates/hapservers.html
@@ -52,7 +52,7 @@
 			}
 		});
 		{% for s in services %}
-			{% if s.1 == '* is not installed' %}
+			{% if s.1 == '* is not installed' or s.1 == '' %}
 				{% if s.0 == 'checker_haproxy' %}
 					$(':regex(id, alert)').checkboxradio('disable');
 				{% elif s.0 == 'keep_alive' %}
diff --git a/app/templates/metrics.html b/app/templates/metrics.html
index 6678fa0e..21c1884b 100644
--- a/app/templates/metrics.html
+++ b/app/templates/metrics.html
@@ -16,8 +16,7 @@ th, tr, td {
 <link href="/inc/chart.min.css" rel="stylesheet">
 <script src="/inc/metrics.js"></script>
 <script src="/inc/chart.min.js"></script>
-
-{% if services == '* is not installed' %}
+{% if services == '0' %}
 <center>
 	<br />
 	<h3>You do not have installed Metrics service.
diff --git a/inc/add.js b/inc/add.js
index 8bea0ee4..ddbade4b 100644
--- a/inc/add.js
+++ b/inc/add.js
@@ -956,24 +956,15 @@ $( function() {
 	});
 	$( "#create-ssl-listen" ).on( "click", function() {
 		resetProxySettings();
-		createSsl(1, 'listen'); 
-		$('#ssl_offloading').prop( "checked", true );
-		$('#ssl_offloading').checkboxradio("refresh")
-		$("#optionsInput").append(ssl_offloading_var)
+		createSsl(1, 'listen');
 	});
 	$( "#create-ssl-frontend" ).on( "click", function() {
 		resetProxySettings();
-		createSsl(2, 'frontend');	
-		$('#ssl_offloading1').prop( "checked", true );
-		$('#ssl_offloading1').checkboxradio("refresh")	
-		$("#optionsInput1").append(ssl_offloading_var)		
+		createSsl(2, 'frontend');		
 	});
 	$( "#create-ssl-backend" ).on( "click", function() {
 		resetProxySettings();
 		createSsl(3, 'backend');	
-		$('#ssl_offloading2').prop( "checked", true );
-		$('#ssl_offloading2').checkboxradio("refresh");
-		$("#optionsInput2").append(ssl_offloading_var);
 	});
 	$( "#create-https-listen" ).on( "click", function() {
 		resetProxySettings();