From f8ffdb1ef6d690f2a31f6832e47fff2122c37fb6 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <aidaho@roxy-wi.org>
Date: Mon, 25 Jul 2022 10:12:47 +0300
Subject: [PATCH] v6.1.2.0

Change log: https://roxy-wi.org/changelog.py#6_1_2
---
 app/funct.py | 4 +++-
 inc/add.js   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/funct.py b/app/funct.py
index e10dce63..72578bdc 100644
--- a/app/funct.py
+++ b/app/funct.py
@@ -1265,7 +1265,7 @@ def show_finding_in_config(stdout: str, **kwargs) -> str:
 def show_haproxy_log(serv, rows=10, waf='0', grep=None, hour='00', minut='00', hour1='24', minut1='00', service='haproxy', **kwargs):
 	import sql
 	exgrep = form.getvalue('exgrep')
-	log_file = checkAjaxInput(form.getvalue('file'))
+	log_file = form.getvalue('file')
 	date = checkAjaxInput(hour) + ':' + checkAjaxInput(minut)
 	date1 = checkAjaxInput(hour1) + ':' + checkAjaxInput(minut1)
 	rows = checkAjaxInput(rows)
@@ -1282,6 +1282,8 @@ def show_haproxy_log(serv, rows=10, waf='0', grep=None, hour='00', minut='00', h
 	else:
 		exgrep_act = ''
 
+	log_file = checkAjaxInput(log_file) if log_file is not None else log_file
+
 	if service in ('nginx', 'haproxy', 'apache', 'keepalived'):
 		syslog_server_enable = sql.get_setting('syslog_server_enable')
 		if syslog_server_enable is None or syslog_server_enable == 0:
diff --git a/inc/add.js b/inc/add.js
index 85d6e733..50d9d1bc 100644
--- a/inc/add.js
+++ b/inc/add.js
@@ -881,7 +881,7 @@ $( function() {
 	
 	$( "#path-cert-listen" ).autocomplete({
 		source: function( request, response ) {
-			if(!checkIsServerFiled('#serv2')) return false;
+			if(!checkIsServerFiled('#serv')) return false;
 			$.ajax( {
 				url: "options.py",
 				data: {