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

---
 inc/sites.inc | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/inc/sites.inc b/inc/sites.inc
index 8b67c1e2..b64fc9a7 100755
--- a/inc/sites.inc
+++ b/inc/sites.inc
@@ -475,17 +475,9 @@ SITEINFO(){
 				site=${sitefile##*/}; site=${site/.conf/}
 				if (( i % 12 == 0 )) || [ $i = 0 ]; then
 					DIVIDER false yellow ${dl}
-					msg1="Site Address"; # 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="EXPLT"; # c=0; spc5=''; spct=$((${cw_spc5}-${#msg5})); until [ $c = ${spct} ]; do spc5="${spc5} "; c=`expr $c + 1`; done
-					msg7="LOCK"; # c=0; spc6=''; spct=$((${cw_spc6}-${#msg6})); until [ $c = ${spct} ]; do spc6="${spc6} "; c=`expr $c + 1`; done
-					msg8="Proxy Connection";
-					# echo -e "    ${idsST[Bold]}${idsCL[LightCyan]}${msg1}${spc1}${msg2}${spc2}${msg3}${spc3}${msg4}${spc4}${msg5}${spc5}${msg6}${spc6}${msg7}${idsST[Reset]}${idsCL[Default]}"
+					[ "${1}" == "edit" ] && msg1='##) Site Address' || msg1='Site Address'
 					echo -en "${idsST[Bold]}${idsCL[LightCyan]}"
-					printf "%-30s %-10s %-7s %-7s %-7s %-7s %-8s %-15s\n" "##) ${msg1}" "${msg2}" "${msg3}" "${msg4}" "${msg5}" "${msg6}" "${msg7}" "${msg8}"
+					printf "%-30s %-10s %-7s %-7s %-7s %-7s %-8s %-15s\n" "${msg1}" "Type" "SSL" "HSTS" "WBSKT" "EXPLT" "LOCK" "Proxy Connection"
 					echo -en "${idsST[Reset]}${idsCL[Default]}"
 					DIVIDER false yellow ${dl}
 				else
@@ -511,20 +503,12 @@ SITEINFO(){
 				[ "$(grep include/websocket-support.conf ${sitefile})" != "" ] && wbskt='Yes' || wbskt=''
 				[ "$(grep include/block-exploits.conf ${sitefile})" != "" ] && explt='Yes' || explt=''
 				[ "$(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}";
+				
 				i=`expr $i + 1`
 				SITELIST[${i}]=${site}
 				[ ${i} -lt 10 ] && ii=" ${i}" || ii=${i}
-				# echo -e "${ii}) ${msg1}${spc1}${msg2}${spc2}${msg3}${spc3}${msg4}${spc4}${msg5}${spc5}${msg6}${spc6}${msg7}"
-			
-				printf "%-30s %-10s %-7s %-7s %-7s %-7s %-8s %-15s\n" "${ii}) ${site}" "${type}" "${ssl}" "${hsts}" "${wbskt}" "${explt}" "${lock}" "${proxyhost}"
+				[ "${1}" == "edit" ] && msg1='${ii}) ${site}' || msg1='${site}'
+				printf "%-30s %-10s %-7s %-7s %-7s %-7s %-8s %-15s\n" "${msg1}" "${type}" "${ssl}" "${hsts}" "${wbskt}" "${explt}" "${lock}" "${proxyhost}"
 		
 			done
 		else