From a51fc775893e7ab0d38caf5958461520d3651a20 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 25 May 2023 18:03:46 -0500 Subject: [PATCH] Update sites.inc --- inc/sites.inc | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/inc/sites.inc b/inc/sites.inc index 861c56ef..2b8371c1 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -470,14 +470,17 @@ VIEWSITEINFO(){ if (( i % 12 == 0 )) || [ $i = 0 ]; then DIVIDER false yellow 94 - 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="LOCK"; c=0; spc6=''; spct=$((${cw_spc6}-${#msg6})); until [ $c = ${spct} ]; do spc6="${spc6} "; c=`expr $c + 1`; done + 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="LOCK"; # c=0; spc6=''; spct=$((${cw_spc6}-${#msg6})); until [ $c = ${spct} ]; do spc6="${spc6} "; c=`expr $c + 1`; done msg7="Proxy Address & Port"; - echo -e " ${idsST[Bold]}${idsCL[LightCyan]}${msg1}${spc1}${msg2}${spc2}${msg3}${spc3}${msg4}${spc4}${msg5}${spc5}${msg6}${spc6}${msg7}${idsST[Reset]}${idsCL[Default]}" + # echo -e " ${idsST[Bold]}${idsCL[LightCyan]}${msg1}${spc1}${msg2}${spc2}${msg3}${spc3}${msg4}${spc4}${msg5}${spc5}${msg6}${spc6}${msg7}${idsST[Reset]}${idsCL[Default]}" + echo -e "${idsST[Bold]}${idsCL[LightCyan]}" + printf "%-30s %-10s %-7s %-7s %-7s %-8s %-15s\n" "${ii}) ${msg1}" "${msg2}" "${msg3}" "${msg4}" "${msg5}" "${msg6}" "${msg7}" + echo -e "${idsST[Reset]}${idsCL[Default]}" DIVIDER false yellow 94 else DIVIDER false darkGray 94 @@ -511,7 +514,7 @@ VIEWSITEINFO(){ [ ${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 %-8s %-15s\n" "${idsCL[LightCyan]}${ii}) ${site}" "${type}" "${ssl}" "${hsts}" "${wbskt}" "${lock}" "${proxyhost}" + printf "%-30s %-10s %-7s %-7s %-7s %-8s %-15s\n" "${ii}) ${site}" "${type}" "${ssl}" "${hsts}" "${wbskt}" "${lock}" "${proxyhost}" done