From c880393c43c987e708d53a30f588b0f46876cac6 Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Thu, 26 Nov 2020 10:18:51 +0600
Subject: [PATCH] v4.5.4.0

Changelog: https://haproxy-wi.org/changelog.py#4_5_4
---
 app/templates/admin.html | 2 +-
 app/users.py             | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/templates/admin.html b/app/templates/admin.html
index 6209d697..e6f28b92 100644
--- a/app/templates/admin.html
+++ b/app/templates/admin.html
@@ -85,7 +85,7 @@
 	</div>
 
 	<div id="openvpn">
-		{% if openvpn != 'package openvpn3-client is not installed' %}
+		{% if openvpn != '' %}
 		<table id="openvpn_table" class="overview">
 			<caption><h3>OpenVPN profiles</h3></caption>
 			<tr class="overviewHead">
diff --git a/app/users.py b/app/users.py
index e1e1a669..70ee584e 100644
--- a/app/users.py
+++ b/app/users.py
@@ -43,15 +43,13 @@ try:
 	openvpn = ''
 
 	stdout, stderr = funct.subprocess_execute("rpm --query openvpn3-client")
-	if stdout[0] != 'package openvpn3-client is not installed':
+	if stdout[0] != 'package openvpn3-client is not installed' and stderr != '/bin/sh: rpm: command not found':
 		cmd = "sudo openvpn3 configs-list |grep -E 'ovpn|(^|[^0-9])[0-9]{4}($|[^0-9])' |grep -v net|awk -F\"    \" '{print $1}'|awk 'ORS=NR%2?\" \":\"\\n\"'"
 		openvpn_configs, stderr = funct.subprocess_execute(cmd)
 		cmd = "sudo openvpn3 sessions-list|grep -E 'Config|Status'|awk -F\":\" '{print $2}'|awk 'ORS=NR%2?\" \":\"\\n\"'| sed 's/^ //g'"
-		cmd = 'echo "client.ovpn  Connection, Client connected"'
 		openvpn_sess, stderr = funct.subprocess_execute(cmd)
 		openvpn = stdout[0]
 
-
 except Exception:
 	pass