diff --git a/lib/webin b/lib/webin index f5837d6..ab7fbd9 100644 --- a/lib/webin +++ b/lib/webin @@ -1033,59 +1033,6 @@ database_import() { } -ext_db_save() { - if [[ $external_db_save == "purge" || -n $purge ]]; then - conf_delete external-dbu -commented - conf_delete external-dbp -commented - conf_delete external-dbh -commented - conf_delete external-dbx -commented - echo "${gre}External DB data successfully removed!${end}" - else - if [[ $external_db_save == "true" ]]; then - read -p "${blu} Host: ${end}" host - read -p "${blu} User: ${end}" user - read -p "${blu} Password: ${end}" pass - - if [[ -z $host || -z $user || -z $pass || $user =~ [:]+ || $pass =~ [:]+ ]]; then - echo "${red}[ERROR] Invalid data for External Database!${end}" - exit 1 - fi - else - # Prevent errors - if [[ ${#external_db_save} -lt 2 ]]; then - echo "${red}[ERROR] Invalid data for External Database!${end}" - exit 1 - fi - - local dbdata=${external_db_save:1:-1} - local user=$(echo "${dbdata}" | cut -d',' -f 1 -s) - local pass=$(echo "${dbdata}" | cut -d',' -f 2 -s) - local host=$(echo "${dbdata}" | cut -d',' -f 3 -s) - - if [[ $(echo "${external_db_save}" | cut -c-1) != "[" || $(echo "${external_db_save}" | rev | cut -c-1) != "]" || -z $host || -z $user || -z $pass || $user =~ [:]+ || $pass =~ [:]+ ]]; then - echo "${red}[ERROR] Invalid data for External Database!${end}" - exit 1 - fi - fi - - - is_url $host -split - if [[ -z $url_path && $(is_url $host) =~ ^(http|https|ip|true)$ && -n $url_host && -n $url_port ]]; then - conf_write external-dbh $url_host - conf_write external-dbx $url_port - else - echo "${red}[ERROR] Invalid database host/port!${end}" - exit 1 - fi - - conf_write external-dbu $user - conf_write external-dbp $pass - - echo "${gre}External DB data successfully saved!${end}" - fi -} - - http_header_custom() { if ! [[ $custom_headers =~ ^(reload|remove)$ ]]; then echo "${red}[ERROR] Please, enter a valid option Custom Headers!${end}" diff --git a/usr/httpauth b/usr/httpauth index af4daa5..d405575 100644 --- a/usr/httpauth +++ b/usr/httpauth @@ -131,14 +131,6 @@ elif [[ -n $wp_admin ]]; then echo "${gre}WordPress Admin HTTP Authentication for${blu} $domain$subfolder ${gre}is already disabled! ${end}" nginx_not="true" # Nginx-Reload not-needed. fi - elif [[ $wp_admin == "on" ]]; then - conf_write wp-admin-auth true - echo "${gre}WordPress Admin HTTP Authentication has been enabled! (global)${end}" - nginx_not="true" # Nginx-Reload not-needed. - elif [[ $wp_admin == "off" ]]; then - conf_write wp-admin-auth false - echo "${gre}WordPress Admin HTTP Authentication has been disabled! (global)${end}" - nginx_not="true" # Nginx-Reload not-needed. else echo "${red}[ERROR] Invalid value for wp-admin! ${end}" exit 1 diff --git a/usr/webinoly b/usr/webinoly index cc44e93..e79216b 100644 --- a/usr/webinoly +++ b/usr/webinoly @@ -2,7 +2,7 @@ # Webinoly Server Manager Plugin # Syntax: webinoly