From f0e4aab834e1261c337914275dfbbc37cef89d82 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 24 May 2023 23:07:20 -0500
Subject: [PATCH] Update sites.inc

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

diff --git a/inc/sites.inc b/inc/sites.inc
index 74cf79ec..d961700d 100755
--- a/inc/sites.inc
+++ b/inc/sites.inc
@@ -453,7 +453,7 @@ VIEWSITEINFO(){
 		site=${sitefile##*/}; site=${site/.conf/}
 		
 		if (( i % 12 == 0 )) || [ $i = 0 ]; then
-			DIVIDER false yellow 80
+			DIVIDER false yellow 90
 			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
@@ -462,18 +462,29 @@ VIEWSITEINFO(){
 			msg6="LOCK"; c=0; spc6=''; spct=$((${cw_spc6}-${#msg6})); until [ $c = ${spct} ]; do spc6="${spc6} "; c=`expr $c + 1`; done
 			msg7="Proxy Host";
 			echo -e "${idsST[Bold]}${idsCL[LightCyan]}${msg1}${spc1}${msg2}${spc2}${msg3}${spc3}${msg4}${spc4}${msg5}${spc5}${msg6}${spc6}${msg7}${idsST[Reset]}${idsCL[Default]}"
-			DIVIDER false yellow 80
+			DIVIDER false yellow 90
 		else
-			DIVIDER false darkGray 80
+			DIVIDER false darkGray 90
 		fi
 		
 		
-		[ "$(grep include/proxy.conf ${sitefile})" != "" ] && type='Proxy' || type='HTTP'
+		if [ "$(grep include/proxy.conf ${sitefile})" != "" ]; then
+			type='Proxy'
+			server=$(grep 'set $server' ${sitefile})
+			server=${server#*\"}; server=${server%\"*}
+			port=$(grep 'set $port' ${sitefile})
+			port=${port##* }; port=${port%;*}
+			proxyhost="${server} : ${port}"
+		else
+			type='HTTP'
+		fi
 		[ "$(grep ssl_certificate ${sitefile})" != "" ] && ssl='Yes' || ssl=''
 		[ "$(grep include/hsts-support.conf ${sitefile})" != "" ] && hsts='Yes' || hsts=''
 		[ "$(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
@@ -486,6 +497,8 @@ VIEWSITEINFO(){
 		
 		i=`expr $i + 1`
 	done
+	
+	echo
 }