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

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

diff --git a/inc/sites.inc b/inc/sites.inc
index a9305f67..d61f87be 100755
--- a/inc/sites.inc
+++ b/inc/sites.inc
@@ -481,7 +481,7 @@ SITEINFO(){
 					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 Address & Port";
+					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]}"
 					echo -en "${idsST[Bold]}${idsCL[LightCyan]}"
 					printf "%-30s %-10s %-7s %-7s %-7s %-7s %-8s %-15s\n" "##) ${msg1}" "${msg2}" "${msg3}" "${msg4}" "${msg5}" "${msg6}" "${msg7}" "${msg8}"
@@ -492,12 +492,13 @@ SITEINFO(){
 				fi
 				if [ "$(grep include/proxy.conf ${sitefile})" != "" ]; then
 					type='Proxy'
+					scheme=$(grep 'set $forward_scheme' ${sitefile})
 					server=$(grep 'set $server' ${sitefile})
 					server=${server#*\"}; server=${server%\"*}
 					port=$(grep 'set $port' ${sitefile})
 					port=${port##* }; port=${port%;*}
 					c=0; spc7=''; spct=$((${cw_spc7}-${#server})); until [ $c = ${spct} ]; do spc7="${spc7} "; c=`expr $c + 1`; done
-					proxyhost="${server}${spc7}:${port}"
+					proxyhost="${scheme}://${server}:${port}"
 				else
 					type='HTTP'
 					proxyhost=''
@@ -580,8 +581,8 @@ SITEINFO(){
 				echo -e "\033[K${idsCL[Cyan]}6) Exploits Block:  ${idsST[Bold]}${explt}${idsST[Reset]}"
 				echo -e "\033[K${idsCL[Cyan]}7) Secured:         ${idsST[Bold]}${lock}${idsST[Reset]}"
 				if [ "${type}" == "Proxy" ]; then
-					echo -e "\033[K${idsCL[Cyan]}8) Proxy Server:   ${idsST[Bold]}${server}${idsST[Reset]}"
-					echo -e "\033[K${idsCL[Cyan]}9) Proxy Port:     ${idsST[Bold]}${port}${idsST[Reset]}"
+					echo -e "\033[K${idsCL[Cyan]}8) Proxy Server:    ${idsST[Bold]}${server}${idsST[Reset]}"
+					echo -e "\033[K${idsCL[Cyan]}9) Proxy Port:      ${idsST[Bold]}${port}${idsST[Reset]}"
 				fi
 				if [ "${edit}" != "s" ]; then
 					echo -en "\n\033[K${idsCL[LightCyan]}Enter the line number to edit, or (s) to save: ${idsCL[Default]}"