From 40fa9c06efef791e440fa495efe6dbedf659490d Mon Sep 17 00:00:00 2001
From: Pavel Loginov <buffoon2001@mail.ru>
Date: Mon, 23 Aug 2021 16:25:00 +0600
Subject: [PATCH] v5.2.4.0

Changelog: https://haproxy-wi.org/changelog.py#5_2_4
---
 app/options.py |  6 +++---
 app/sql.py     | 24 +++++++++++++++++-------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/options.py b/app/options.py
index 2aa935e2..9cf96e52 100644
--- a/app/options.py
+++ b/app/options.py
@@ -2279,13 +2279,13 @@ if form.getvalue('newsmon') is not None:
         print('SMON error: Cannot be HTTP with 443 port')
         sys.exit()
 
-    if sql.insert_smon(server, port, enable, http, uri, body, group, desc, telegram, user_group):
+    last_id = sql.insert_smon(server, port, enable, http, uri, body, group, desc, telegram, user_group)
+    if last_id:
         from jinja2 import Environment, FileSystemLoader
-
         env = Environment(loader=FileSystemLoader('templates'), autoescape=True)
         template = env.get_template('ajax/show_new_smon.html')
         template = template.render(
-            smon=sql.select_smon(user_group, ip=server, port=port, proto=http, uri=uri, body=body),
+            smon=sql.select_smon_by_id(last_id),
             telegrams=sql.get_user_telegram_by_group(user_group))
         print(template)
         funct.logging('SMON', ' Has been add a new server ' + server + ' to SMON ', haproxywi=1, login=1)
diff --git a/app/sql.py b/app/sql.py
index 12dabfb2..e79bf917 100644
--- a/app/sql.py
+++ b/app/sql.py
@@ -1936,13 +1936,13 @@ def insert_smon(server, port, enable, proto, uri, body, group, desc, telegram, u
 		http = ''
 
 	try:
-		SMON.insert(ip=server, port=port, en=enable, desc=desc, group=group, http=http, body=body,
+		last_id = SMON.insert(ip=server, port=port, en=enable, desc=desc, group=group, http=http, body=body,
 					telegram_channel_id=telegram, user_group=user_group, status='3').execute()
 	except Exception as e:
 		out_error(e)
 		return False
 	else:
-		return True
+		return last_id
 
 
 def select_smon(user_group, **kwargs):
@@ -1958,11 +1958,6 @@ def select_smon(user_group, **kwargs):
 		else:
 			user_group = "where user_group='%s'" % user_group
 
-	if kwargs.get('body') is None:
-		body = ''
-	else:
-		body = kwargs.get('body')
-
 	if kwargs.get('ip'):
 		try:
 			http = kwargs.get('proto')+':'+kwargs.get('uri')
@@ -1976,6 +1971,21 @@ def select_smon(user_group, **kwargs):
 		%s order by `group`""" % user_group
 	else:
 		sql = """select * from `smon` %s """ % user_group
+
+	try:
+		cursor.execute(sql)
+	except Exception as e:
+		out_error(e)
+	else:
+		return cursor.fetchall()
+
+
+def select_smon_by_id(last_id):
+	cursor = conn.cursor()
+
+	sql = """select id, ip, port, en, http, body, telegram_channel_id, `desc`, `group`, user_group 
+	from `smon` where id = {} """.format(last_id)
+
 	try:
 		cursor.execute(sql)
 	except Exception as e: