From 2e060eb8019ff5b6b1644cb9f93d25465111440b Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Fri, 8 Jul 2022 22:27:14 +0300 Subject: [PATCH] v6.1.1.0 Change log: https://roxy-wi.org/changelog.py#6_1_1 --- app/funct.py | 2 -- inc/users.js | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/funct.py b/app/funct.py index ac2938d6..b65bc40d 100644 --- a/app/funct.py +++ b/app/funct.py @@ -1386,12 +1386,10 @@ def server_status(stdout): def ssh_command(server_ip, commands, **kwargs): - from shlex import quote ssh = ssh_connect(server_ip) for command in commands: try: - command = quote(command) stdin, stdout, stderr = ssh.exec_command(command, get_pty=True) except Exception as e: logging('localhost', ' ' + str(e), haproxywi=1) diff --git a/inc/users.js b/inc/users.js index 671dccfa..19d91299 100644 --- a/inc/users.js +++ b/inc/users.js @@ -291,7 +291,7 @@ $( function() { if (data.indexOf('error:') != '-1') { toastr.clear(); toastr.error(data); - } else if(data == 'no' || data == '') { + } else if(data == 'no' || data == '' || data.indexOf('No') != '-1') { $('#cur_haproxy_exp_ver').text('HAProxy exporter has been not installed'); } else { $('#cur_haproxy_exp_ver').text(data);