From a4294840aa5cea29f8d5d006fbccf6bbca4f31c0 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Thu, 25 May 2023 17:50:08 -0500
Subject: [PATCH] Update sites.inc

---
 inc/sites.inc | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/inc/sites.inc b/inc/sites.inc
index 0faeb18f..61cc9f45 100755
--- a/inc/sites.inc
+++ b/inc/sites.inc
@@ -499,16 +499,18 @@ VIEWSITEINFO(){
 			[ "$(grep include/websocket-support.conf ${sitefile})" != "" ] && wbskt='Yes' || wbskt=''
 			[ "$(grep include/secure-access.conf ${sitefile})" != "" ] && lock='Yes' || lock=''
 		
-			msg1="${site}"; c=0; spc1=''; spct=$((${cw_spc1}-${#msg1})); until [ $c = ${spct} ]; do spc1="${spc1} "; c=`expr $c + 1`; done
-			msg2="${type}"; c=0; spc2=''; spct=$((${cw_spc2}-${#msg2})); until [ $c = ${spct} ]; do spc2="${spc2} "; c=`expr $c + 1`; done
-			msg3="${ssl}"; c=0; spc3=''; spct=$((${cw_spc3}-${#msg3})); until [ $c = ${spct} ]; do spc3="${spc3} "; c=`expr $c + 1`; done
-			msg4="${hsts}"; c=0; spc4=''; spct=$((${cw_spc4}-${#msg4})); until [ $c = ${spct} ]; do spc4="${spc4} "; c=`expr $c + 1`; done
-			msg5="${wbskt}"; c=0; spc5=''; spct=$((${cw_spc5}-${#msg5})); until [ $c = ${spct} ]; do spc5="${spc5} "; c=`expr $c + 1`; done
-			msg6="${lock}"; c=0; spc6=''; spct=$((${cw_spc6}-${#msg6})); until [ $c = ${spct} ]; do spc6="${spc6} "; c=`expr $c + 1`; done
-			msg7="${proxyhost}";
+			# msg1="${site}"; c=0; spc1=''; spct=$((${cw_spc1}-${#msg1})); until [ $c = ${spct} ]; do spc1="${spc1} "; c=`expr $c + 1`; done
+			# msg2="${type}"; c=0; spc2=''; spct=$((${cw_spc2}-${#msg2})); until [ $c = ${spct} ]; do spc2="${spc2} "; c=`expr $c + 1`; done
+			# msg3="${ssl}"; c=0; spc3=''; spct=$((${cw_spc3}-${#msg3})); until [ $c = ${spct} ]; do spc3="${spc3} "; c=`expr $c + 1`; done
+			# msg4="${hsts}"; c=0; spc4=''; spct=$((${cw_spc4}-${#msg4})); until [ $c = ${spct} ]; do spc4="${spc4} "; c=`expr $c + 1`; done
+			# msg5="${wbskt}"; c=0; spc5=''; spct=$((${cw_spc5}-${#msg5})); until [ $c = ${spct} ]; do spc5="${spc5} "; c=`expr $c + 1`; done
+			# msg6="${lock}"; c=0; spc6=''; spct=$((${cw_spc6}-${#msg6})); until [ $c = ${spct} ]; do spc6="${spc6} "; c=`expr $c + 1`; done
+			# msg7="${proxyhost}";
 			i=`expr $i + 1`
 			[ ${i} -lt 10 ] && ii=" ${i}" || ii=${i}
-			echo -e "${ii}) ${msg1}${spc1}${msg2}${spc2}${msg3}${spc3}${msg4}${spc4}${msg5}${spc5}${msg6}${spc6}${msg7}"
+			# echo -e "${ii}) ${msg1}${spc1}${msg2}${spc2}${msg3}${spc3}${msg4}${spc4}${msg5}${spc5}${msg6}${spc6}${msg7}"
+			
+			awk '{ printf "%-30s %-10s %-7s %-7s %-7s %-8s %-15s\n", "${ii}) ${msg1}", ${msg2}, ${msg3}, ${msg4}, ${msg5}, ${msg6}, ${msg7}}'
 		
 		done