From 873062d23afb6a3f3b0dca25906ba9b771189963 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Fri, 24 Sep 2021 11:09:46 +0600
Subject: [PATCH] v5.2.6.0

Changelog: https://haproxy-wi.org/changelog.py#5_2_6
---
 app/config.py                                | 10 +++-------
 app/templates/ajax/show_compare_configs.html |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/config.py b/app/config.py
index c34559c2..d15ae4a9 100644
--- a/app/config.py
+++ b/app/config.py
@@ -53,19 +53,19 @@ if serv is not None and form.getvalue('open') is not None:
 	if service == 'keepalived':
 		error = funct.get_config(serv, cfg, keepalived=1)
 		try:
-			funct.logging(serv, " Keepalived config has opened for ")
+			funct.logging(serv, " Keepalived config has been opened for ")
 		except Exception:
 			pass
 	elif service == 'nginx':
 		error = funct.get_config(serv, cfg, nginx=1)
 		try:
-			funct.logging(serv, " Nginx config has opened ")
+			funct.logging(serv, " Nginx config has been opened ")
 		except Exception:
 			pass
 	else:
 		error = funct.get_config(serv, cfg)
 		try:
-			funct.logging(serv, " HAProxy config has opened ")
+			funct.logging(serv, " HAProxy config has been opened ")
 		except Exception:
 			pass
 	
@@ -81,10 +81,6 @@ if serv is not None and form.getvalue('open') is not None:
 if serv is not None and form.getvalue('config') is not None:
 	import sys
 	funct.check_is_server_in_group(serv)
-	try:
-		funct.logging(serv, "config.py edited config")
-	except Exception:
-		pass
 
 	config = form.getvalue('config')
 	oldcfg = form.getvalue('oldconfig')
diff --git a/app/templates/ajax/show_compare_configs.html b/app/templates/ajax/show_compare_configs.html
index 95f84ed6..4bfed058 100644
--- a/app/templates/ajax/show_compare_configs.html
+++ b/app/templates/ajax/show_compare_configs.html
@@ -4,7 +4,7 @@
 		<h4>Comparing config files</h4>
 		<p>
 			<select autofocus required name="left" id="left">
-				<option disabled selected>Select an older</option>
+				<option disabled selected>Select an older config</option>
 				{% for file in return_files %}
 					{% if file == left %}
 						<option value="{{ file }}" selected>{{ file.split('-', maxsplit=1)[1] }}</option>
@@ -15,7 +15,7 @@
 			</select>
 
 			<select autofocus required name="right" id="right">
-				<option disabled selected>Select a newer</option>
+				<option disabled selected>Select a newer config</option>
 				{% for file in return_files %}				
 					<option value="{{ file }}">{{ file.split('-', maxsplit=1)[1] }}</option>
 				{% endfor %}