From 43f116fdf3bb434c7b4ecb2fb2d0b19e2ebb1eba Mon Sep 17 00:00:00 2001
From: Pavel Loginov <aidaho@roxy-wi.org>
Date: Fri, 8 Jul 2022 17:40:45 +0300
Subject: [PATCH] v6.1.1.0

Change log: https://roxy-wi.org/changelog.py#6_1_1
---
 app/templates/ajax/config_show.html | 44 +++++++++++++++++++++++++++++
 inc/configshow.js                   |  2 +-
 inc/script.js                       |  2 +-
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/app/templates/ajax/config_show.html b/app/templates/ajax/config_show.html
index 3ba1f9d1..851b3f40 100644
--- a/app/templates/ajax/config_show.html
+++ b/app/templates/ajax/config_show.html
@@ -99,6 +99,50 @@
 					&emsp;&emsp;{{ line }}
 				</span><br />	
 			{% endif %}
+		{% elif service == 'apache' %}
+			{% if i == 0 and "<VirtualHost" not in line %}
+				<span class="param">
+				</span><div>
+				<span class="configLine">
+					<span class="numRow">{{ i }}</span>
+					&emsp;&emsp;{{ line }}
+				</span><br />
+				{% continue %}
+			{% endif %}
+			{%- if "<VirtualHost" in line -%}
+				{% if i > 1 %}
+					</div>
+				{% endif %}
+				<span class="param">{{ line }}
+				</span><div>
+				{% continue %}
+			{% endif %}
+			{% if "<" in line or "</" in line  %}
+				{% if "#" not in line %}
+					<span class="numRow">
+						{{ i }}
+					</span>
+					<span class="paramInSec">
+						&emsp;{{ line }}
+					</span><br />
+					{% continue %}
+				{% endif %}
+			{% endif %}
+			{% if "#" in line %}
+				<span class="numRow">
+					{{ i }}
+				</span>
+				<span class="comment">
+					&emsp;{{ line }}
+				</span><br />
+				{% continue %}
+			{% endif %}
+			{% if line|length > 1 %}
+				<span class="configLine">
+					<span class="numRow">{{ i }}</span>
+					&emsp;&emsp;{{ line }}
+				</span><br />
+			{% endif %}
 		{% elif service == 'keepalived' %}
 			{%- if "global_defs {" in line -%}
 				{% if i > 1 %}
diff --git a/inc/configshow.js b/inc/configshow.js
index ce3e358a..b7902946 100644
--- a/inc/configshow.js
+++ b/inc/configshow.js
@@ -61,7 +61,7 @@ $( function() {
 			data: frm.serialize() + "&save=" + $(this).val(),
 			type: frm.attr('method'),
 			success: function( data ) {
-				data = data.replaceAll('\n', '<br>');
+				data = data.replace(/\n/g, "<br>");
 				if (data.indexOf(service + ': command not found') != '-1')	{
 					try {
 						var service = findGetParameter('service');
diff --git a/inc/script.js b/inc/script.js
index bee90803..9d00c1bf 100644
--- a/inc/script.js
+++ b/inc/script.js
@@ -904,7 +904,7 @@ $( function() {
 	$('#auth').submit(function() {
 		let searchParams = new URLSearchParams(window.location.search)
 		if(searchParams.has('ref')) {
-			window.location = /.*ref=([^&]*).*/.exec(document.location.href)[1];
+			var ref = /.*ref=([^&]*).*/.exec(document.location.href)[1];
 		} else {
 			var ref = "overview.py";
 		}