diff --git a/inc/sites.inc b/inc/sites.inc index 4cc7caac..6c23a680 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -504,19 +504,20 @@ SITEINFO(){ [ "$(grep include/block-exploits.conf ${sitefile})" != "" ] && explt='Yes' || explt='' [ "$(grep include/secure-access.conf ${sitefile})" != "" ] && lock='Yes' || lock='' - i=`expr $i + 1` - SITELIST[${i}]=${site} + [ ${i} -lt 10 ] && ii=" ${i}" || ii=${i} [ "${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}" - + + SITELIST[${i}]=${site} + i=`expr $i + 1` done else i=0 for sitefile in ${sites[@]}; do site=${sitefile##*/}; site=${site/.conf/} - i=`expr $i + 1` SITELIST[${i}]=${site} + i=`expr $i + 1` done fi @@ -545,6 +546,8 @@ SITEINFO(){ type='Proxy' server=$(grep 'set $server' ${sitefile}) server=${server#*\"}; server=${server%\"*} + scheme=$(grep 'set $forward_scheme' ${sitefile}) + scheme=${scheme##* }; scheme=${scheme%;*} 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 @@ -562,12 +565,13 @@ SITEINFO(){ echo -e "\033[K${idsCL[Cyan]}!) Site Address: ${idsST[Bold]}${site}${idsST[Reset]}" echo -e "\033[K${idsCL[Cyan]}!) Site Type: ${idsST[Bold]}${type}${idsST[Reset]}" echo -e "\033[K${idsCL[Cyan]}!) SSL Secure: ${idsST[Bold]}${ssl}${idsST[Reset]} - ${idsCL[LightCyan]}${SUBJECTNAMES}" - echo -e "\033[K${idsCL[Cyan]}4) HSTS Enabled ${idsST[Bold]}${hsts}${idsST[Reset]}" - echo -e "\033[K${idsCL[Cyan]}5) Web Sockets: ${idsST[Bold]}${wbskt}${idsST[Reset]}" - 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]}" + echo -e "\033[K${idsCL[Cyan]}3) HSTS Enabled ${idsST[Bold]}${hsts}${idsST[Reset]}" + echo -e "\033[K${idsCL[Cyan]}4) Web Sockets: ${idsST[Bold]}${wbskt}${idsST[Reset]}" + echo -e "\033[K${idsCL[Cyan]}5) Exploits Block: ${idsST[Bold]}${explt}${idsST[Reset]}" + echo -e "\033[K${idsCL[Cyan]}6) 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]}7) Proxy Server: ${idsST[Bold]}${server}${idsST[Reset]}" + echo -e "\033[K${idsCL[Cyan]}8) Proxy Scheme: ${idsST[Bold]}${scheme}${idsST[Reset]}" echo -e "\033[K${idsCL[Cyan]}9) Proxy Port: ${idsST[Bold]}${port}${idsST[Reset]}" fi if [ "${edit}" != "s" ]; then