diff --git a/inc/sites.inc b/inc/sites.inc index cf8c25ef..0ed6cc00 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -479,11 +479,12 @@ SITEINFO(){ 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"; + 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"; # 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 %-8s %-15s\n" "##) ${msg1}" "${msg2}" "${msg3}" "${msg4}" "${msg5}" "${msg6}" "${msg7}" + printf "%-30s %-10s %-7s %-7s %-7s %-7s %-8s %-15s\n" "##) ${msg1}" "${msg2}" "${msg3}" "${msg4}" "${msg5}" "${msg6}" "${msg7}" "${msg8}" echo -en "${idsST[Reset]}${idsCL[Default]}" DIVIDER false yellow 98 else @@ -505,8 +506,9 @@ SITEINFO(){ [ "$(grep ssl_certificate_key ${sitefile})" != "" ] && ssl='Yes' || ssl='' [ "$(grep include/hsts-support.conf ${sitefile})" != "" ] && hsts='Yes' || hsts='' [ "$(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 @@ -519,7 +521,7 @@ SITEINFO(){ [ ${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" "${ii}) ${site}" "${type}" "${ssl}" "${hsts}" "${wbskt}" "${lock}" "${proxyhost}" + printf "%-30s %-10s %-7s %-7s %-7s %-8s %-15s\n" "${ii}) ${site}" "${type}" "${ssl}" "${hsts}" "${wbskt}" "${explt}" "${lock}" "${proxyhost}" done else @@ -566,18 +568,20 @@ SITEINFO(){ fi [ "$(grep include/hsts-support.conf ${sitefile})" != "" ] && hsts='Yes' || hsts='-' [ "$(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='-' until [ "${edit}" = "c" ]; do - 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) Secured: ${idsST[Bold]}${lock}${idsST[Reset]}" + 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]}" if [ "${type}" == "Proxy" ]; then - echo -e "\033[K${idsCL[Cyan]}7) Proxy Server: ${idsST[Bold]}${server}${idsST[Reset]}" - echo -e "\033[K${idsCL[Cyan]}8) 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]}" @@ -586,7 +590,8 @@ SITEINFO(){ case "${edit}" in 4) [ "${hsts}" == "-" ] && hsts='Yes' || hsts='-';; 5) [ "${wbskt}" == "-" ] && wbskt='Yes' || wbskt='-';; - 6) [ "${lock}" == "-" ] && lock='Yes' || lock='-';; + 6) [ "${explt}" == "-" ] && explt='Yes' || explt='-';; + 7) [ "${lock}" == "-" ] && lock='Yes' || lock='-';; esac echo -e "\033[10A" else