diff --git a/inc/sites.inc b/inc/sites.inc index b6307418..70534ecd 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -530,7 +530,7 @@ NEWPROXYSITE_CREATE(){ SITEINFO(){ # start=`date +%s` - dl=110 + dl=105 EDIT=0; SEARCH=0 while [ $# -gt 0 ]; do case "${1}" in @@ -781,15 +781,15 @@ EDITSITE(){ editc=0 until [ "${editc^}" = "C" ]; do - echo -e "\033[K${idsCL[White]}0) Site Enabled: ${idsCL[Cyan]}${idsST[Bold]}${LIVE}${idsST[Reset]}" - echo -e "\033[K${idsCL[White]}1) Site Address(es): ${idsCL[Cyan]}${idsST[Bold]}${SERVERNAMES//,/, }${idsST[Reset]}" - echo -e "\033[K${idsCL[White]}2) Site Type: ${idsCL[Cyan]}${idsST[Bold]}${SITE_TYPE}${idsST[Reset]}" - echo -en "\033[K${idsCL[White]}3) SSL Secure: ${idsCL[Cyan]}${idsST[Bold]}${SSL}${idsST[Reset]}" + echo -e "\033[K${idsCL[White]}E) Site Enabled: ${idsCL[Cyan]}${idsST[Bold]}${LIVE}${idsST[Reset]}" + echo -e "\033[K${idsCL[White]}0) Site Address(es): ${idsCL[Cyan]}${idsST[Bold]}${SERVERNAMES//,/, }${idsST[Reset]}" + echo -e "\033[K${idsCL[White]}1) Site Type: ${idsCL[Cyan]}${idsST[Bold]}${SITE_TYPE}${idsST[Reset]}" + echo -en "\033[K${idsCL[White]}2) SSL Secure: ${idsCL[Cyan]}${idsST[Bold]}${SSL}${idsST[Reset]}" [ "${SUBJECTNAMES}" != "" ] && echo -e " ${idsCL[Cyan]}[SSL Names: ${idsCL[Yellow]}${SUBJECTNAMES}${idsCL[Cyan]}; expires ${idsCL[Yellow]}$(date -d @${CERTEXPIRE} '+%m-%d-%Y')${idsCL[Cyan]}]" || echo - echo -e "\033[K${idsCL[White]}4) HSTS Enabled: ${idsCL[Cyan]}${idsST[Bold]}${HSTS}${idsST[Reset]}" - echo -e "\033[K${idsCL[White]}5) Web Sockets: ${idsCL[Cyan]}${idsST[Bold]}${WEBSOCKET}${idsST[Reset]}" - echo -e "\033[K${idsCL[White]}6) Exploits Block: ${idsCL[Cyan]}${idsST[Bold]}${EXPLOITS}${idsST[Reset]}" - echo -e "\033[K${idsCL[White]}7) Secured Access: ${idsCL[Cyan]}${idsST[Bold]}${SECURE}${idsST[Reset]}" + echo -e "\033[K${idsCL[White]}3) HSTS Enabled: ${idsCL[Cyan]}${idsST[Bold]}${HSTS}${idsST[Reset]}" + echo -e "\033[K${idsCL[White]}4) Web Sockets: ${idsCL[Cyan]}${idsST[Bold]}${WEBSOCKET}${idsST[Reset]}" + echo -e "\033[K${idsCL[White]}5) Exploits Block: ${idsCL[Cyan]}${idsST[Bold]}${EXPLOITS}${idsST[Reset]}" + echo -e "\033[K${idsCL[White]}6) Secured Access: ${idsCL[Cyan]}${idsST[Bold]}${SECURE}${idsST[Reset]}" if [ "${SITE_TYPE}" == "Proxy" ]; then echo -e "\033[K${idsCL[White]}7) Proxy Address: ${idsCL[Cyan]}${idsST[Bold]}${PROXYHOST}${idsST[Reset]}" echo -e "\033[K${idsCL[White]}8) Proxy Scheme: ${idsCL[Cyan]}${idsST[Bold]}${PROXYSCHEME}${idsST[Reset]}" @@ -834,18 +834,18 @@ EDITSITE(){ 7) echo -e "\033[K\n\033[K" echo -en "\033[KEnter new Proxy Address: " read -i "${PROXYHOST}" -e PROXYHOST - echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A" + echo -e "\033[6A"; for (( c=1; c<=6; c++ )); do echo -e "\033[K"; done; echo -e "\033[6A" ;; 8) [ "${PROXYSCHEME}" == "http" ] && PROXYSCHEME='https' || PROXYSCHEME='http';; 9) echo -e "\033[K\n\033[K" echo -en "\033[KEnter new Proxy Port: " read -i "${PROXYPORT}" -e PROXYPORT - echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A" + echo -e "\033[6A"; for (( c=1; c<=6; c++ )); do echo -e "\033[K"; done; echo -e "\033[6A" ;; [Cc]) echo -e "\r\033[K\n\r\033[K\n\r\033[K" - echo -e "\033[16A"; for (( c=1; c<=16; c++ )); do echo -e "\r\033[K"; done; echo -e "\033[16A" + echo -e "\033[17A"; for (( c=1; c<=17; c++ )); do echo -e "\r\033[K"; done; echo -e "\033[17A" echo -e "\n\n\n\n\n\n\n\n" ;; [Dd]) @@ -862,7 +862,7 @@ EDITSITE(){ ;; *) [ "${delconfirm}" != "" ] && echo - echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A" + echo -e "\033[6A"; for (( c=1; c<=6; c++ )); do echo -e "\033[K"; done; echo -e "\033[6A" ;; esac ;; @@ -873,16 +873,16 @@ EDITSITE(){ *) ;; esac - [ "${editc}" == "" ] && echo -e "\033[13A" || echo -e "\033[12A" + [ "${editc}" == "" ] && echo -e "\033[14A" || echo -e "\033[13A" else - for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[6A" + for (( c=1; c<=6; c++ )); do echo -e "\033[K"; done; echo -e "\033[7A" echo -en "\n\033[K${idsCL[LightCyan]}Confirm changes (Y/n): ${idsCL[Default]}" read -n 1 confirm case "${confirm}" in [Nn]) editc=C echo -e "\r\033[K\n\r\033[K\n\r\033[K" - echo -e "\033[13A"; for (( c=1; c<=13; c++ )); do echo -e "\r\033[K"; done; echo -e "\033[17A" + echo -e "\033[14A"; for (( c=1; c<=14; c++ )); do echo -e "\r\033[K"; done; echo -e "\033[18A" ;; *) [ "${confirm}" != "" ] && echo @@ -918,7 +918,7 @@ EDITSITE(){ *) editc=C echo -e "\r\033[K\n\r\033[K\n\r\033[K" - echo -e "\033[17A"; for (( c=1; c<=17; c++ )); do echo -e "\r\033[K"; done; echo -e "\033[20A" + echo -e "\033[18A"; for (( c=1; c<=18; c++ )); do echo -e "\r\033[K"; done; echo -e "\033[21A" [ "${SEARCH}" != "0" ] && SITEINFO -edit -search ${SEARCH} || LISTCERTS -edit exit 0 ;;