getdnsconf

2025-12-26 21:52:09 +08:00 · 2019-07-16 18:31:33 +08:00
48 changed files with 185 additions and 2879 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: acmesh
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -5,7 +5,7 @@
 如何调试 https://github.com/Neilpang/acme.sh/wiki/How-to-debug-acme.sh

 If it is a bug report:
- make sure you are able to repro it on the latest released version.
+- make sure you are able to repro it on the latest released version. 
 You can install the latest version by: `acme.sh --upgrade`

 - Search the existing issues.
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,11 +28,11 @@ script:
  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then shellcheck -V ; fi
  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then shellcheck -e SC2181 **/*.sh && echo "shellcheck OK" ; fi
  - cd ..
-  - git clone --depth 1 https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest
+  - git clone https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest
  - if [ "$TRAVIS_OS_NAME" = "linux" -a "$NGROK_TOKEN" ]; then sudo TEST_LOCAL="$TEST_LOCAL" NGROK_TOKEN="$NGROK_TOKEN" ./rundocker.sh testplat ubuntu:latest ; fi
  - if [ "$TRAVIS_OS_NAME" = "osx" -a "$NGROK_TOKEN" ]; then sudo TEST_LOCAL="$TEST_LOCAL" NGROK_TOKEN="$NGROK_TOKEN" ACME_OPENSSL_BIN="$ACME_OPENSSL_BIN" ./letest.sh ; fi

 matrix:
  fast_finish: true
-
-
+  
+  
--- a/1
+++ b/1
@@ -3,7 +3,6 @@ FROM alpine:3.10
 RUN apk update -f \
  && apk --no-cache add -f \
  openssl \
-  openssh-client \
  coreutils \
  bind-tools \
  curl \
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # An ACME Shell script: acme.sh [![Build Status](https://travis-ci.org/Neilpang/acme.sh.svg?branch=master)](https://travis-ci.org/Neilpang/acme.sh)

-<a href="https://opencollective.com/acmesh" alt="Financial Contributors on Open Collective"><img src="https://opencollective.com/acmesh/all/badge.svg?label=financial+contributors" /></a> [![Join the chat at https://gitter.im/acme-sh/Lobby](https://badges.gitter.im/acme-sh/Lobby.svg)](https://gitter.im/acme-sh/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join the chat at https://gitter.im/acme-sh/Lobby](https://badges.gitter.im/acme-sh/Lobby.svg)](https://gitter.im/acme-sh/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 - An ACME protocol client written purely in Shell (Unix shell) language.
 - Full ACME protocol implementation.
 - Support ACME v1 and ACME v2
@@ -451,36 +451,6 @@ TODO:
 2. ACME protocol: https://github.com/ietf-wg-acme/acme


-## Contributors
-
-### Code Contributors
-
-This project exists thanks to all the people who contribute. [[Contribute](CONTRIBUTING.md)].
-<a href="https://github.com/Neilpang/acme.sh/graphs/contributors"><img src="https://opencollective.com/acmesh/contributors.svg?width=890&button=false" /></a>
-
-### Financial Contributors
-
-Become a financial contributor and help us sustain our community. [[Contribute](https://opencollective.com/acmesh/contribute)]
-
-#### Individuals
-
-<a href="https://opencollective.com/acmesh"><img src="https://opencollective.com/acmesh/individuals.svg?width=890"></a>
-
-#### Organizations
-
-Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/acmesh/contribute)]
-
-<a href="https://opencollective.com/acmesh/organization/0/website"><img src="https://opencollective.com/acmesh/organization/0/avatar.svg"></a>
-<a href="https://opencollective.com/acmesh/organization/1/website"><img src="https://opencollective.com/acmesh/organization/1/avatar.svg"></a>
-<a href="https://opencollective.com/acmesh/organization/2/website"><img src="https://opencollective.com/acmesh/organization/2/avatar.svg"></a>
-<a href="https://opencollective.com/acmesh/organization/3/website"><img src="https://opencollective.com/acmesh/organization/3/avatar.svg"></a>
-<a href="https://opencollective.com/acmesh/organization/4/website"><img src="https://opencollective.com/acmesh/organization/4/avatar.svg"></a>
-<a href="https://opencollective.com/acmesh/organization/5/website"><img src="https://opencollective.com/acmesh/organization/5/avatar.svg"></a>
-<a href="https://opencollective.com/acmesh/organization/6/website"><img src="https://opencollective.com/acmesh/organization/6/avatar.svg"></a>
-<a href="https://opencollective.com/acmesh/organization/7/website"><img src="https://opencollective.com/acmesh/organization/7/avatar.svg"></a>
-<a href="https://opencollective.com/acmesh/organization/8/website"><img src="https://opencollective.com/acmesh/organization/8/avatar.svg"></a>
-<a href="https://opencollective.com/acmesh/organization/9/website"><img src="https://opencollective.com/acmesh/organization/9/avatar.svg"></a>
-
 # 19. License & Others

 License is GPLv3
--- a/acme.sh
+++ b/acme.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh

-VER=2.8.4
+VER=2.8.2

 PROJECT_NAME="acme.sh"

@@ -90,9 +90,6 @@ DEBUG_LEVEL_3=3
 DEBUG_LEVEL_DEFAULT=$DEBUG_LEVEL_1
 DEBUG_LEVEL_NONE=0

-DOH_CLOUDFLARE=1
-DOH_GOOGLE=2
-
 HIDDEN_VALUE="[hidden](please add '--output-insecure' to see this value)"

 SYSLOG_ERROR="user.error"
@@ -138,8 +135,6 @@ _DNS_MANUAL_WIKI="https://github.com/Neilpang/acme.sh/wiki/dns-manual-mode"

 _NOTIFY_WIKI="https://github.com/Neilpang/acme.sh/wiki/notify"

-_SUDO_WIKI="https://github.com/Neilpang/acme.sh/wiki/sudo"
-
 _DNS_MANUAL_ERR="The dns manual mode can not renew automatically, you must issue it again manually. You'd better use the other modes instead."

 _DNS_MANUAL_WARN="It seems that you are using dns manual mode. please take care: $_DNS_MANUAL_ERR"
@@ -153,7 +148,7 @@ fi

 __green() {
  if [ "${__INTERACTIVE}${ACME_NO_COLOR:-0}" = "10" -o "${ACME_FORCE_COLOR}" = "1" ]; then
-    printf '\33[1;32m%b\33[0m' "$1"
+    printf '\033[1;31;32m%b\033[0m' "$1"
    return
  fi
  printf -- "%b" "$1"
@@ -161,7 +156,7 @@ __green() {

 __red() {
  if [ "${__INTERACTIVE}${ACME_NO_COLOR:-0}" = "10" -o "${ACME_FORCE_COLOR}" = "1" ]; then
-    printf '\33[1;31m%b\33[0m' "$1"
+    printf '\033[1;31;40m%b\033[0m' "$1"
    return
  fi
  printf -- "%b" "$1"
@@ -178,7 +173,7 @@ _printargs() {
    printf -- "%s" "$1='$2'"
  fi
  printf "\n"
-  # return the saved exit status
+  # return the saved exit status 
  return "$_exitstatus"
 }

@@ -265,37 +260,6 @@ _usage() {
  printf "\n" >&2
 }

-__debug_bash_helper() {
-  # At this point only do for --debug 3
-  if [ "${DEBUG:-$DEBUG_LEVEL_NONE}" -lt "$DEBUG_LEVEL_3" ]; then
-    return
-  fi
-  # Return extra debug info when running with bash, otherwise return empty
-  # string.
-  if [ -z "${BASH_VERSION}" ]; then
-    return
-  fi
-  # We are a bash shell at this point, return the filename, function name, and
-  # line number as a string
-  _dbh_saveIFS=$IFS
-  IFS=" "
-  # Must use eval or syntax error happens under dash. The eval should use
-  # single quotes as older versions of busybox had a bug with double quotes and
-  # eval.
-  # Use 'caller 1' as we want one level up the stack as we should be called
-  # by one of the _debug* functions
-  eval '_dbh_called=($(caller 1))'
-  IFS=$_dbh_saveIFS
-  eval '_dbh_file=${_dbh_called[2]}'
-  if [ -n "${_script_home}" ]; then
-    # Trim off the _script_home directory name
-    eval '_dbh_file=${_dbh_file#$_script_home/}'
-  fi
-  eval '_dbh_function=${_dbh_called[1]}'
-  eval '_dbh_lineno=${_dbh_called[0]}'
-  printf "%-40s " "$_dbh_file:${_dbh_function}:${_dbh_lineno}"
-}
-
 _debug() {
  if [ "${LOG_LEVEL:-$DEFAULT_LOG_LEVEL}" -ge "$LOG_LEVEL_1" ]; then
    _log "$@"
@@ -304,8 +268,7 @@ _debug() {
    _syslog "$SYSLOG_DEBUG" "$@"
  fi
  if [ "${DEBUG:-$DEBUG_LEVEL_NONE}" -ge "$DEBUG_LEVEL_1" ]; then
-    _bash_debug=$(__debug_bash_helper)
-    _printargs "${_bash_debug}$@" >&2
+    _printargs "$@" >&2
  fi
 }

@@ -338,8 +301,7 @@ _debug2() {
    _syslog "$SYSLOG_DEBUG" "$@"
  fi
  if [ "${DEBUG:-$DEBUG_LEVEL_NONE}" -ge "$DEBUG_LEVEL_2" ]; then
-    _bash_debug=$(__debug_bash_helper)
-    _printargs "${_bash_debug}$@" >&2
+    _printargs "$@" >&2
  fi
 }

@@ -371,8 +333,7 @@ _debug3() {
    _syslog "$SYSLOG_DEBUG" "$@"
  fi
  if [ "${DEBUG:-$DEBUG_LEVEL_NONE}" -ge "$DEBUG_LEVEL_3" ]; then
-    _bash_debug=$(__debug_bash_helper)
-    _printargs "${_bash_debug}$@" >&2
+    _printargs "$@" >&2
  fi
 }

@@ -1734,37 +1695,18 @@ _post() {
    if [ "$HTTPS_INSECURE" ]; then
      _CURL="$_CURL --insecure  "
    fi
-    if [ "$httpmethod" = "HEAD" ]; then
-      _CURL="$_CURL -I  "
-    fi
    _debug "_CURL" "$_CURL"
    if [ "$needbase64" ]; then
-      if [ "$body" ]; then
-        if [ "$_postContentType" ]; then
-          response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "Content-Type: $_postContentType" -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url" | _base64)"
-        else
-          response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url" | _base64)"
-        fi
+      if [ "$_postContentType" ]; then
+        response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "Content-Type: $_postContentType" -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url" | _base64)"
      else
-        if [ "$_postContentType" ]; then
-          response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "Content-Type: $_postContentType" -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" "$_post_url" | _base64)"
-        else
-          response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" "$_post_url" | _base64)"
-        fi
+        response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url" | _base64)"
      fi
    else
-      if [ "$body" ]; then
-        if [ "$_postContentType" ]; then
-          response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "Content-Type: $_postContentType" -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url")"
-        else
-          response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url")"
-        fi
+      if [ "$_postContentType" ]; then
+        response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "Content-Type: $_postContentType" -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url")"
      else
-        if [ "$_postContentType" ]; then
-          response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "Content-Type: $_postContentType" -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" "$_post_url")"
-        else
-          response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" "$_post_url")"
-        fi
+        response="$($_CURL --user-agent "$USER_AGENT" -X $httpmethod -H "$_H1" -H "$_H2" -H "$_H3" -H "$_H4" -H "$_H5" --data "$body" "$_post_url")"
      fi
    fi
    _ret="$?"
@@ -1780,9 +1722,6 @@ _post() {
    if [ "$HTTPS_INSECURE" ]; then
      _WGET="$_WGET --no-check-certificate "
    fi
-    if [ "$httpmethod" = "HEAD" ]; then
-      _WGET="$_WGET --read-timeout=3.0  --tries=2  "
-    fi
    _debug "_WGET" "$_WGET"
    if [ "$needbase64" ]; then
      if [ "$httpmethod" = "POST" ]; then
@@ -1805,12 +1744,6 @@ _post() {
        else
          response="$($_WGET -S -O - --user-agent="$USER_AGENT" --header "$_H5" --header "$_H4" --header "$_H3" --header "$_H2" --header "$_H1" --post-data="$body" "$_post_url" 2>"$HTTP_HEADER")"
        fi
-      elif [ "$httpmethod" = "HEAD" ]; then
-        if [ "$_postContentType" ]; then
-          response="$($_WGET --spider -S -O - --user-agent="$USER_AGENT" --header "$_H5" --header "$_H4" --header "$_H3" --header "$_H2" --header "$_H1" --header "Content-Type: $_postContentType" --post-data="$body" "$_post_url" 2>"$HTTP_HEADER")"
-        else
-          response="$($_WGET --spider -S -O - --user-agent="$USER_AGENT" --header "$_H5" --header "$_H4" --header "$_H3" --header "$_H2" --header "$_H1" --post-data="$body" "$_post_url" 2>"$HTTP_HEADER")"
-        fi
      else
        if [ "$_postContentType" ]; then
          response="$($_WGET -S -O - --user-agent="$USER_AGENT" --header "$_H5" --header "$_H4" --header "$_H3" --header "$_H2" --header "$_H1" --header "Content-Type: $_postContentType" --method $httpmethod --body-data="$body" "$_post_url" 2>"$HTTP_HEADER")"
@@ -1943,7 +1876,7 @@ _send_signed_request() {
      if [ "$ACME_NEW_NONCE" ]; then
        _debug2 "Get nonce with HEAD. ACME_NEW_NONCE" "$ACME_NEW_NONCE"
        nonceurl="$ACME_NEW_NONCE"
-        if _post "" "$nonceurl" "" "HEAD" "$__request_conent_type" >/dev/null; then
+        if _post "" "$nonceurl" "" "HEAD" "$__request_conent_type"; then
          _headers="$(cat "$HTTP_HEADER")"
          _debug2 _headers "$_headers"
          _CACHED_NONCE="$(echo "$_headers" | grep -i "Replay-Nonce:" | _head_n 1 | tr -d "\r\n " | cut -d ':' -f 2)"
@@ -2019,7 +1952,7 @@ _send_signed_request() {
    _debug code "$code"

    _debug2 original "$response"
-    if echo "$responseHeaders" | grep -i "Content-Type: *application/json" >/dev/null 2>&1; then
+    if echo "$responseHeaders" | grep -i "Content-Type: application/json" >/dev/null 2>&1; then
      response="$(echo "$response" | _normalizeJson)"
    fi
    _debug2 response "$response"
@@ -2040,10 +1973,8 @@ _send_signed_request() {
        continue
      fi
    fi
-    return 0
+    break
  done
-  _info "Giving up sending to CA server after $MAX_REQUEST_RETRY_TIMES retries."
-  return 1

 }

@@ -2169,6 +2100,26 @@ _getdeployconf() {
  eval "export $_rac_key=$_saved"
 }

+#key
+_getdnsapiconf() {
+  _rac_key="$1"
+  _rac_value="$(eval echo \$"$_rac_key")"
+  if [ "$_rac_value" ]; then
+    if _startswith "$_rac_value" '"' && _endswith "$_rac_value" '"'; then
+      _debug2 "trim quotation marks"
+      eval "export $_rac_key=$_rac_value"
+    fi
+    return 0 # do nothing
+  fi
+  _saved=$(_readaccountconf_mutable "$_rac_key")
+  eval "export $_rac_key=$_saved"
+}
+
+#key  value base64encode
+_savednsapiconf() {
+  _saveaccountconf_mutable "$@"
+}
+
 #_saveaccountconf  key  value  base64encode
 _saveaccountconf() {
  _save_conf "$ACCOUNT_CONF_PATH" "$@"
@@ -2866,11 +2817,6 @@ _setNginx() {
      _debug NGINX_CONF "$NGINX_CONF"
      NGINX_CONF="$(echo "$NGINX_CONF" | cut -d = -f 2)"
      _debug NGINX_CONF "$NGINX_CONF"
-      if [ -z "$NGINX_CONF" ]; then
-        _err "Can not find nginx conf."
-        NGINX_CONF=""
-        return 1
-      fi
      if [ ! -f "$NGINX_CONF" ]; then
        _err "'$NGINX_CONF' doesn't exist."
        NGINX_CONF=""
@@ -3109,13 +3055,11 @@ _clearupdns() {
    d=$(_getfield "$entry" 1)
    txtdomain=$(_getfield "$entry" 2)
    aliasDomain=$(_getfield "$entry" 3)
-    _currentRoot=$(_getfield "$entry" 4)
    txt=$(_getfield "$entry" 5)
    d_api=$(_getfield "$entry" 6)
    _debug "d" "$d"
    _debug "txtdomain" "$txtdomain"
    _debug "aliasDomain" "$aliasDomain"
-    _debug "_currentRoot" "$_currentRoot"
    _debug "txt" "$txt"
    _debug "d_api" "$d_api"
    if [ "$d_api" = "$txt" ]; then
@@ -3339,11 +3283,6 @@ _on_issue_success() {
  if [ "$_chk_post_hook" ]; then
    _info "Run post hook:'$_chk_post_hook'"
    if ! (
-      export CERT_PATH
-      export CERT_KEY_PATH
-      export CA_CERT_PATH
-      export CERT_FULLCHAIN_PATH
-      export Le_Domain="$_main_domain"
      cd "$DOMAIN_PATH" && eval "$_chk_post_hook"
    ); then
      _err "Error when run post hook."
@@ -3355,11 +3294,6 @@ _on_issue_success() {
  if [ "$IS_RENEW" ] && [ "$_chk_renew_hook" ]; then
    _info "Run renew hook:'$_chk_renew_hook'"
    if ! (
-      export CERT_PATH
-      export CERT_KEY_PATH
-      export CA_CERT_PATH
-      export CERT_FULLCHAIN_PATH
-      export Le_Domain="$_main_domain"
      cd "$DOMAIN_PATH" && eval "$_chk_renew_hook"
    ); then
      _err "Error when run renew hook."
@@ -3367,7 +3301,7 @@ _on_issue_success() {
    fi
  fi

-  if _hasfield "$Le_Webroot" "$W_DNS" && [ -z "$FORCE_DNS_MANUAL" ]; then
+  if _hasfield "$Le_Webroot" "$W_DNS"; then
    _err "$_DNS_MANUAL_WARN"
  fi

@@ -3447,7 +3381,7 @@ _regAccount() {
  fi

  _debug2 responseHeaders "$responseHeaders"
-  _accUri="$(echo "$responseHeaders" | grep -i "^Location:" | _head_n 1 | cut -d ':' -f 2- | tr -d "\r\n ")"
+  _accUri="$(echo "$responseHeaders" | grep -i "^Location:" | _head_n 1 | cut -d ' ' -f 2 | tr -d "\r\n")"
  _debug "_accUri" "$_accUri"
  if [ -z "$_accUri" ]; then
    _err "Can not find account id url."
@@ -3675,7 +3609,7 @@ __trigger_validation() {
 }

 #endpoint  domain type
-_ns_lookup_impl() {
+_ns_lookup() {
  _ns_ep="$1"
  _ns_domain="$2"
  _ns_type="$3"
@@ -3699,7 +3633,7 @@ _ns_lookup_cf() {
  _cf_ld="$1"
  _cf_ld_type="$2"
  _cf_ep="https://cloudflare-dns.com/dns-query"
-  _ns_lookup_impl "$_cf_ep" "$_cf_ld" "$_cf_ld_type"
+  _ns_lookup "$_cf_ep" "$_cf_ld" "$_cf_ld_type"
 }

 #domain, type
@@ -3707,49 +3641,11 @@ _ns_purge_cf() {
  _cf_d="$1"
  _cf_d_type="$2"
  _debug "Cloudflare purge $_cf_d_type record for domain $_cf_d"
-  _cf_purl="https://cloudflare-dns.com/api/v1/purge?domain=$_cf_d&type=$_cf_d_type"
+  _cf_purl="https://1.0.0.1/api/v1/purge?domain=$_cf_d&type=$_cf_d_type"
  response="$(_post "" "$_cf_purl")"
  _debug2 response "$response"
 }

-#checks if cf server is available
-_ns_is_available_cf() {
-  if _get "https://cloudflare-dns.com" >/dev/null 2>&1; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-#domain, type
-_ns_lookup_google() {
-  _cf_ld="$1"
-  _cf_ld_type="$2"
-  _cf_ep="https://dns.google/resolve"
-  _ns_lookup_impl "$_cf_ep" "$_cf_ld" "$_cf_ld_type"
-}
-
-#domain, type
-_ns_lookup() {
-  if [ -z "$DOH_USE" ]; then
-    _debug "Detect dns server first."
-    if _ns_is_available_cf; then
-      _debug "Use cloudflare doh server"
-      export DOH_USE=$DOH_CLOUDFLARE
-    else
-      _debug "Use google doh server"
-      export DOH_USE=$DOH_GOOGLE
-    fi
-  fi
-
-  if [ "$DOH_USE" = "$DOH_CLOUDFLARE" ] || [ -z "$DOH_USE" ]; then
-    _ns_lookup_cf "$@"
-  else
-    _ns_lookup_google "$@"
-  fi
-
-}
-
 #txtdomain, alias, txt
 __check_txt() {
  _c_txtdomain="$1"
@@ -3758,7 +3654,7 @@ __check_txt() {
  _debug "_c_txtdomain" "$_c_txtdomain"
  _debug "_c_aliasdomain" "$_c_aliasdomain"
  _debug "_c_txt" "$_c_txt"
-  _answers="$(_ns_lookup "$_c_aliasdomain" TXT)"
+  _answers="$(_ns_lookup_cf "$_c_aliasdomain" TXT)"
  _contains "$_answers" "$_c_txt"

 }
@@ -3767,13 +3663,7 @@ __check_txt() {
 __purge_txt() {
  _p_txtdomain="$1"
  _debug _p_txtdomain "$_p_txtdomain"
-  if [ "$DOH_USE" = "$DOH_CLOUDFLARE" ] || [ -z "$DOH_USE" ]; then
-    _ns_purge_cf "$_p_txtdomain" "TXT"
-  else
-    _debug "no purge api for google dns api, just sleep 5 secs"
-    _sleep 5
-  fi
-
+  _ns_purge_cf "$_p_txtdomain" "TXT"
 }

 #wait and check each dns entries
@@ -3810,22 +3700,20 @@ _check_dns_entries() {
      fi
      _left=1
      _info "Not valid yet, let's wait 10 seconds and check next one."
+      _sleep 10
      __purge_txt "$txtdomain"
      if [ "$txtdomain" != "$aliasDomain" ]; then
        __purge_txt "$aliasDomain"
      fi
-      _sleep 10
    done
    if [ "$_left" ]; then
      _info "Let's wait 10 seconds and check again".
      _sleep 10
    else
      _info "All success, let's return"
-      return 0
+      break
    fi
  done
-  _info "Timed out waiting for DNS."
-  return 1

 }

@@ -4006,7 +3894,7 @@ issue() {
        _on_issue_err "$_post_hook"
        return 1
      fi
-      Le_LinkOrder="$(echo "$responseHeaders" | grep -i '^Location.*$' | _tail_n 1 | tr -d "\r\n" | cut -d ":" -f 2-)"
+      Le_LinkOrder="$(echo "$responseHeaders" | grep -i '^Location.*$' | _tail_n 1 | tr -d "\r\n" | cut -d " " -f 2)"
      _debug Le_LinkOrder "$Le_LinkOrder"
      Le_OrderFinalize="$(echo "$response" | _egrep_o '"finalize" *: *"[^"]*"' | cut -d '"' -f 4)"
      _debug Le_OrderFinalize "$Le_OrderFinalize"
@@ -4085,18 +3973,7 @@ $_authorizations_map"
      fi

      if [ "$ACME_VERSION" = "2" ]; then
-        _idn_d="$(_idn "$d")"
-        _candindates="$(echo "$_authorizations_map" | grep -i "^$_idn_d,")"
-        _debug2 _candindates "$_candindates"
-        if [ "$(echo "$_candindates" | wc -l)" -gt 1 ]; then
-          for _can in $_candindates; do
-            if _startswith "$(echo "$_can" | tr '.' '|')" "$(echo "$_idn_d" | tr '.' '|'),"; then
-              _candindates="$_can"
-              break
-            fi
-          done
-        fi
-        response="$(echo "$_candindates" | sed "s/$_idn_d,//")"
+        response="$(echo "$_authorizations_map" | grep "^$(_idn "$d")," | sed "s/$d,//")"
        _debug2 "response" "$response"
        if [ -z "$response" ]; then
          _err "get to authz error."
@@ -4521,7 +4398,7 @@ $_authorizations_map"
      return 1
    fi
    if [ -z "$Le_LinkOrder" ]; then
-      Le_LinkOrder="$(echo "$responseHeaders" | grep -i '^Location.*$' | _tail_n 1 | tr -d "\r\n" | cut -d ":" -f 2-)"
+      Le_LinkOrder="$(echo "$responseHeaders" | grep -i '^Location.*$' | _tail_n 1 | tr -d "\r\n" | cut -d " " -f 2)"
    fi

    _savedomainconf "Le_LinkOrder" "$Le_LinkOrder"
@@ -5070,14 +4947,18 @@ list() {
  if [ "$_raw" ]; then
    printf "%s\n" "Main_Domain${_sep}KeyLength${_sep}SAN_Domains${_sep}Created${_sep}Renew"
    for di in "${CERT_HOME}"/*.*/; do
+      if ! [ -d "$di" ]; then
+        _debug "Not directory, skip: $di"
+        continue
+      fi
      d=$(basename "$di")
      _debug d "$d"
      (
        if _endswith "$d" "$ECC_SUFFIX"; then
-          _isEcc="ecc"
+          _isEcc=$(echo "$d" | cut -d "$ECC_SEP" -f 2)
          d=$(echo "$d" | cut -d "$ECC_SEP" -f 1)
        fi
-        DOMAIN_CONF="$di/$d.conf"
+        _initpath "$d" "$_isEcc"
        if [ -f "$DOMAIN_CONF" ]; then
          . "$DOMAIN_CONF"
          printf "%s\n" "$Le_Domain${_sep}\"$Le_Keylength\"${_sep}$Le_Alt${_sep}$Le_CertCreateTimeStr${_sep}$Le_NextRenewTimeStr"
@@ -5572,7 +5453,7 @@ _deactivate() {
      return 1
    fi

-    authzUri="$(echo "$responseHeaders" | grep "^Location:" | _head_n 1 | cut -d ':' -f 2- | tr -d "\r\n")"
+    authzUri="$(echo "$responseHeaders" | grep "^Location:" | _head_n 1 | cut -d ' ' -f 2 | tr -d "\r\n")"
    _debug "authzUri" "$authzUri"
    if [ "$code" ] && [ ! "$code" = '201' ]; then
      _err "new-authz error: $response"
@@ -6069,12 +5950,8 @@ _send_notify() {
  _send_err=0
  for _n_hook in $(echo "$_nhooks" | tr ',' " "); do
    _n_hook_file="$(_findHook "" $_SUB_FOLDER_NOTIFY "$_n_hook")"
-    _info "Sending via: $_n_hook"
-    _debug "Found $_n_hook_file for $_n_hook"
-    if [ -z "$_n_hook_file" ]; then
-      _err "Can not find the hook file for $_n_hook"
-      continue
-    fi
+    _info "Found $_n_hook_file"
+
    if ! (
      if ! . "$_n_hook_file"; then
        _err "Load file $_n_hook_file error. Please check your api file and try again."
@@ -6108,8 +5985,8 @@ _send_notify() {
 _set_notify_hook() {
  _nhooks="$1"

-  _test_subject="Hello, this is a notification from $PROJECT_NAME"
-  _test_content="If you receive this message, your notification works."
+  _test_subject="Hello, this is notification from $PROJECT_NAME"
+  _test_content="If you receive this email, your notification works."

  _send_notify "$_test_subject" "$_test_content" "$_nhooks" 0

@@ -6264,7 +6141,7 @@ Parameters:
  --branch, -b                      Only valid for '--upgrade' command, specifies the branch name to upgrade to.

  --notify-level  0|1|2|3           Set the notification level:  Default value is $NOTIFY_LEVEL_DEFAULT.
-                                     0: disabled, no notification will be sent.
+                                     0: disabled, no notification will be sent. 
                                     1: send notifications only when there is an error.
                                     2: send notifications when a cert is successfully renewed, or there is an error.
                                     3: send notifications when a cert is skipped, renewed, or error.
@@ -6303,7 +6180,6 @@ _installOnline() {
    chmod +x $PROJECT_ENTRY
    if ./$PROJECT_ENTRY install "$_nocron" "" "$_noprofile"; then
      _info "Install success!"
-      _saveaccountconf "UPGRADE_HASH" "$(_getMasterHash)"
    fi

    cd ..
@@ -6313,15 +6189,9 @@ _installOnline() {
  )
 }

-_getMasterHash() {
-  _hash_url="https://api.github.com/repos/Neilpang/acme.sh/git/refs/heads/master"
-  _get $_hash_url | tr -d "\r\n" | tr '{},' '\n' | grep '"sha":' | cut -d '"' -f 4
-}
-
 upgrade() {
  if (
    _initpath
-    [ -z "$FORCE" ] && [ "$(_getMasterHash)" = "$(_readaccountconf "UPGRADE_HASH")" ] && _info "Already uptodate!" && exit 0
    export LE_WORKING_DIR
    cd "$LE_WORKING_DIR"
    _installOnline "nocron" "noprofile"
@@ -6367,23 +6237,6 @@ _processAccountConf() {

 }

-_checkSudo() {
-  if [ "$SUDO_GID" ] && [ "$SUDO_COMMAND" ] && [ "$SUDO_USER" ] && [ "$SUDO_UID" ]; then
-    if [ "$SUDO_USER" = "root" ] && [ "$SUDO_UID" = "0" ]; then
-      #it's root using sudo, no matter it's using sudo or not, just fine
-      return 0
-    fi
-    if [ "$SUDO_COMMAND" = "/bin/su" ] || [ "$SUDO_COMMAND" = "/bin/bash" ]; then
-      #it's a normal user doing "sudo su", or `sudo -i` or `sudo -s`
-      #fine
-      return 0
-    fi
-    #otherwise
-    return 1
-  fi
-  return 0
-}
-
 _process() {
  _CMD=""
  _domain=""
@@ -6635,10 +6488,6 @@ _process() {
        ;;
      --nginx)
        wvalue="$NGINX"
-        if [ "$2" ] && ! _startswith "$2" "-"; then
-          wvalue="$NGINX$2"
-          shift
-        fi
        if [ -z "$_webroot" ]; then
          _webroot="$wvalue"
        else
@@ -6916,14 +6765,6 @@ _process() {
  done

  if [ "${_CMD}" != "install" ]; then
-    if [ "$__INTERACTIVE" ] && ! _checkSudo; then
-      if [ -z "$FORCE" ]; then
-        #Use "echo" here, instead of _info. it's too early
-        echo "It seems that you are using sudo, please read this link first:"
-        echo "$_SUDO_WIKI"
-        return 1
-      fi
-    fi
    __initHome
    if [ "$_log" ]; then
      if [ -z "$_logfile" ]; then
@@ -6966,7 +6807,7 @@ _process() {
      _debug "Using server: $_server"
    fi
  fi
-  _debug "Running cmd: ${_CMD}"
+
  case "${_CMD}" in
    install) install "$_nocron" "$_confighome" "$_noprofile" ;;
    uninstall) uninstall "$_nocron" ;;
--- a/deploy/docker.sh
+++ b/deploy/docker.sh
@@ -126,7 +126,6 @@ docker_deploy() {
  fi

  if [ "$DEPLOY_DOCKER_CONTAINER_RELOAD_CMD" ]; then
-    _info "Reloading: $DEPLOY_DOCKER_CONTAINER_RELOAD_CMD"
    if ! _docker_exec "$_cid" "$DEPLOY_DOCKER_CONTAINER_RELOAD_CMD"; then
      return 1
    fi
@@ -224,8 +223,7 @@ _docker_cp() {
    _debug2 "_frompath" "$_frompath"
    _toname="$(basename "$_to")"
    _debug2 "_toname" "$_toname"
-    _debug2 "_from" "$_from"
-    if ! tar --transform="s,$(printf "%s" "$_frompath" | tr '*' .),$_toname," -cz "$_from" 2>/dev/null | _curl_unix_sock "$_DOCKER_SOCK" PUT "/containers/$_dcid/archive?noOverwriteDirNonDir=1&path=$(printf "%s" "$_dir" | _url_encode)" '@-' "Content-Type: application/octet-stream"; then
+    if ! tar --transform="s,$_frompath,$_toname," -cz "$_from" 2>/dev/null | _curl_unix_sock "$_DOCKER_SOCK" PUT "/containers/$_dcid/archive?noOverwriteDirNonDir=1&path=$(printf "%s" "$_dir" | _url_encode)" '@-' "Content-Type: application/octet-stream"; then
      _err "copy error"
      return 1
    fi
--- a/deploy/gcore_cdn.sh
+++ b/deploy/gcore_cdn.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env sh

 # Here is the script to deploy the cert to G-Core CDN service (https://gcorelabs.com/ru/) using the G-Core Labs API (https://docs.gcorelabs.com/cdn/).
+# Uses command line curl for send requests and jq for parse responses.
 # Returns 0 when success.
 #
 # Written by temoffey <temofffey@gmail.com>
@@ -77,15 +78,15 @@ gcore_cdn_deploy() {
  _debug _regex "$_regex"
  _resource=$(echo "$_response" | sed 's/},{/},\n{/g' | _egrep_o "$_regex")
  _debug _resource "$_resource"
-  _regex=".*\"id\":\([0-9]*\).*\"rules\".*$"
+  _regex=".*\"id\":\([0-9]*\),.*$"
  _debug _regex "$_regex"
  _resourceId=$(echo "$_resource" | sed -n "s/$_regex/\1/p")
  _debug _resourceId "$_resourceId"
-  _regex=".*\"sslData\":\([0-9]*\).*$"
+  _regex=".*\"sslData\":\([0-9]*\)}.*$"
  _debug _regex "$_regex"
  _sslDataOld=$(echo "$_resource" | sed -n "s/$_regex/\1/p")
  _debug _sslDataOld "$_sslDataOld"
-  _regex=".*\"originGroup\":\([0-9]*\).*$"
+  _regex=".*\"originGroup\":\([0-9]*\),.*$"
  _debug _regex "$_regex"
  _originGroup=$(echo "$_resource" | sed -n "s/$_regex/\1/p")
  _debug _originGroup "$_originGroup"
@@ -101,7 +102,7 @@ gcore_cdn_deploy() {
  _debug _request "$_request"
  _response=$(_post "$_request" "https://api.gcdn.co/sslData")
  _debug _response "$_response"
-  _regex=".*\"id\":\([0-9]*\).*$"
+  _regex=".*\"id\":\([0-9]*\),.*$"
  _debug _regex "$_regex"
  _sslDataAdd=$(echo "$_response" | sed -n "s/$_regex/\1/p")
  _debug _sslDataAdd "$_sslDataAdd"
@@ -116,7 +117,7 @@ gcore_cdn_deploy() {
  _debug _request "$_request"
  _response=$(_post "$_request" "https://api.gcdn.co/resources/$_resourceId" '' "PUT")
  _debug _response "$_response"
-  _regex=".*\"sslData\":\([0-9]*\).*$"
+  _regex=".*\"sslData\":\([0-9]*\)}.*$"
  _debug _regex "$_regex"
  _sslDataNew=$(echo "$_response" | sed -n "s/$_regex/\1/p")
  _debug _sslDataNew "$_sslDataNew"
--- a/deploy/qiniu.sh
+++ b/deploy/qiniu.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh

-# Script to create certificate to qiniu.com
+# Script to create certificate to qiniu.com 
 #
 # This deployment required following variables
 # export QINIU_AK="QINIUACCESSKEY"
--- a/deploy/routeros.sh
+++ b/deploy/routeros.sh
@@ -85,19 +85,19 @@ routeros_deploy() {
  scp "$_ckey" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.key"
  _info "Trying to push cert '$_cfullchain' to router"
  scp "$_cfullchain" "$ROUTER_OS_USERNAME@$ROUTER_OS_HOST:$_cdomain.cer"
-  DEPLOY_SCRIPT_CMD="/system script add name=\"LE Cert Deploy - $_cdomain\" owner=admin policy=ftp,read,write,password,sensitive \
-source=\"## generated by routeros deploy script in acme.sh;\
-\n/certificate remove [ find name=$_cdomain.cer_0 ];\
-\n/certificate remove [ find name=$_cdomain.cer_1 ];\
-\ndelay 1;\
-\n/certificate import file-name=$_cdomain.cer passphrase=\\\"\\\";\
-\n/certificate import file-name=$_cdomain.key passphrase=\\\"\\\";\
-\ndelay 1;\
-\n/file remove $_cdomain.cer;\
-\n/file remove $_cdomain.key;\
-\ndelay 2;\
-\n/ip service set www-ssl certificate=$_cdomain.cer_0;\
-\n$ROUTER_OS_ADDITIONAL_SERVICES;\
+  DEPLOY_SCRIPT_CMD="/system script add name=\"LE Cert Deploy - $_cdomain\" owner=admin policy=ftp,read,write,password,sensitive 
+source=\"## generated by routeros deploy script in acme.sh
+\n/certificate remove [ find name=$_cdomain.cer_0 ]
+\n/certificate remove [ find name=$_cdomain.cer_1 ]
+\ndelay 1
+\n/certificate import file-name=$_cdomain.cer passphrase=\\\"\\\"
+\n/certificate import file-name=$_cdomain.key passphrase=\\\"\\\"
+\ndelay 1
+\n/file remove $_cdomain.cer
+\n/file remove $_cdomain.key
+\ndelay 2
+\n/ip service set www-ssl certificate=$_cdomain.cer_0
+\n$ROUTER_OS_ADDITIONAL_SERVICES
 \n\"
 "
  # shellcheck disable=SC2029
--- a/deploy/vault_cli.sh
+++ b/deploy/vault_cli.sh
@@ -2,10 +2,10 @@

 # Here is a script to deploy cert to hashicorp vault
 # (https://www.vaultproject.io/)
-#
+# 
 # it requires the vault binary to be available in PATH, and the following
 # environment variables:
-#
+# 
 # VAULT_PREFIX - this contains the prefix path in vault
 # VAULT_ADDR - vault requires this to find your vault server
 #
--- a/dnsapi/dns_ali.sh
+++ b/dnsapi/dns_ali.sh
@@ -185,7 +185,7 @@ _clean() {
    return 1
  fi

-  record_id="$(echo "$response" | tr '{' "\n" | grep "$_sub_domain" | grep -- "$txtvalue" | tr "," "\n" | grep RecordId | cut -d '"' -f 4)"
+  record_id="$(echo "$response" | tr '{' "\n" | grep "$_sub_domain" | grep "$txtvalue" | tr "," "\n" | grep RecordId | cut -d '"' -f 4)"
  _debug2 record_id "$record_id"

  if [ -z "$record_id" ]; then
--- a/dnsapi/dns_aws.sh
+++ b/dnsapi/dns_aws.sh
@@ -6,8 +6,6 @@
 #AWS_SECRET_ACCESS_KEY="xxxxxxx"

 #This is the Amazon Route53 api wrapper for acme.sh
-#All `_sleep` commands are included to avoid Route53 throttling, see
-#https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DNSLimitations.html#limits-api-requests

 AWS_HOST="route53.amazonaws.com"
 AWS_URL="https://$AWS_HOST"
@@ -45,7 +43,6 @@ dns_aws_add() {
  _debug "First detect the root zone"
  if ! _get_root "$fulldomain"; then
    _err "invalid domain"
-    _sleep 1
    return 1
  fi
  _debug _domain_id "$_domain_id"
@@ -54,7 +51,6 @@ dns_aws_add() {

  _info "Getting existing records for $fulldomain"
  if ! aws_rest GET "2013-04-01$_domain_id/rrset" "name=$fulldomain&type=TXT"; then
-    _sleep 1
    return 1
  fi

@@ -67,7 +63,6 @@ dns_aws_add() {

  if [ "$_resource_record" ] && _contains "$response" "$txtvalue"; then
    _info "The TXT record already exists. Skipping."
-    _sleep 1
    return 0
  fi

@@ -77,10 +72,9 @@ dns_aws_add() {

  if aws_rest POST "2013-04-01$_domain_id/rrset/" "" "$_aws_tmpl_xml" && _contains "$response" "ChangeResourceRecordSetsResponse"; then
    _info "TXT record updated successfully."
-    _sleep 1
    return 0
  fi
-  _sleep 1
+
  return 1
 }

@@ -99,7 +93,6 @@ dns_aws_rm() {
  _debug "First detect the root zone"
  if ! _get_root "$fulldomain"; then
    _err "invalid domain"
-    _sleep 1
    return 1
  fi
  _debug _domain_id "$_domain_id"
@@ -108,7 +101,6 @@ dns_aws_rm() {

  _info "Getting existing records for $fulldomain"
  if ! aws_rest GET "2013-04-01$_domain_id/rrset" "name=$fulldomain&type=TXT"; then
-    _sleep 1
    return 1
  fi

@@ -117,7 +109,6 @@ dns_aws_rm() {
    _debug "_resource_record" "$_resource_record"
  else
    _debug "no records exist, skip"
-    _sleep 1
    return 0
  fi

@@ -125,10 +116,9 @@ dns_aws_rm() {

  if aws_rest POST "2013-04-01$_domain_id/rrset/" "" "$_aws_tmpl_xml" && _contains "$response" "ChangeResourceRecordSetsResponse"; then
    _info "TXT record deleted successfully."
-    _sleep 1
    return 0
  fi
-  _sleep 1
+
  return 1

 }
--- a/dnsapi/dns_cf.sh
+++ b/dnsapi/dns_cf.sh
@@ -5,9 +5,6 @@
 #
 #CF_Email="xxxx@sss.com"

-#CF_Token="xxxx"
-#CF_Account_ID="xxxx"
-
 CF_Api="https://api.cloudflare.com/client/v4"

 ########  Public functions #####################
@@ -17,33 +14,27 @@ dns_cf_add() {
  fulldomain=$1
  txtvalue=$2

-  CF_Token="${CF_Token:-$(_readaccountconf_mutable CF_Token)}"
-  CF_Account_ID="${CF_Account_ID:-$(_readaccountconf_mutable CF_Account_ID)}"
-  CF_Key="${CF_Key:-$(_readaccountconf_mutable CF_Key)}"
-  CF_Email="${CF_Email:-$(_readaccountconf_mutable CF_Email)}"
+  _getdnsapiconf CF_Key
+  _getdnsapiconf CF_Email

-  if [ "$CF_Token" ]; then
-    _saveaccountconf_mutable CF_Token "$CF_Token"
-    _saveaccountconf_mutable CF_Account_ID "$CF_Account_ID"
-  else
-    if [ -z "$CF_Key" ] || [ -z "$CF_Email" ]; then
-      CF_Key=""
-      CF_Email=""
-      _err "You didn't specify a Cloudflare api key and email yet."
-      _err "You can get yours from here https://dash.cloudflare.com/profile."
-      return 1
-    fi
-
-    if ! _contains "$CF_Email" "@"; then
-      _err "It seems that the CF_Email=$CF_Email is not a valid email address."
-      _err "Please check and retry."
-      return 1
-    fi
-    #save the api key and email to the account conf file.
-    _saveaccountconf_mutable CF_Key "$CF_Key"
-    _saveaccountconf_mutable CF_Email "$CF_Email"
+  if [ -z "$CF_Key" ] || [ -z "$CF_Email" ]; then
+    CF_Key=""
+    CF_Email=""
+    _err "You didn't specify a Cloudflare api key and email yet."
+    _err "You can get yours from here https://dash.cloudflare.com/profile."
+    return 1
  fi

+  if ! _contains "$CF_Email" "@"; then
+    _err "It seems that the CF_Email=$CF_Email is not a valid email address."
+    _err "Please check and retry."
+    return 1
+  fi
+
+  #save the api key and email to the account conf file.
+  _savednsapiconf CF_Key "$CF_Key"
+  _savednsapiconf CF_Email "$CF_Email"
+
  _debug "First detect the root zone"
  if ! _get_root "$fulldomain"; then
    _err "invalid domain"
@@ -81,6 +72,19 @@ dns_cf_add() {
  fi
  _err "Add txt record error."
  return 1
+  #  else
+  #    _info "Updating record"
+  #    record_id=$(printf "%s\n" "$response" | _egrep_o "\"id\":\"[^\"]*\"" | cut -d : -f 2 | tr -d \" | head -n 1)
+  #    _debug "record_id" "$record_id"
+  #
+  #    _cf_rest PUT "zones/$_domain_id/dns_records/$record_id" "{\"id\":\"$record_id\",\"type\":\"TXT\",\"name\":\"$fulldomain\",\"content\":\"$txtvalue\",\"zone_id\":\"$_domain_id\",\"zone_name\":\"$_domain\"}"
+  #    if [ "$?" = "0" ]; then
+  #      _info "Updated, OK"
+  #      return 0
+  #    fi
+  #    _err "Update error"
+  #    return 1
+  #  fi

 }

@@ -89,10 +93,15 @@ dns_cf_rm() {
  fulldomain=$1
  txtvalue=$2

-  CF_Token="${CF_Token:-$(_readaccountconf_mutable CF_Token)}"
-  CF_Account_ID="${CF_Account_ID:-$(_readaccountconf_mutable CF_Account_ID)}"
-  CF_Key="${CF_Key:-$(_readaccountconf_mutable CF_Key)}"
-  CF_Email="${CF_Email:-$(_readaccountconf_mutable CF_Email)}"
+  _getdnsapiconf CF_Key
+  _getdnsapiconf CF_Email
+  if [ -z "$CF_Key" ] || [ -z "$CF_Email" ]; then
+    CF_Key=""
+    CF_Email=""
+    _err "You didn't specify a Cloudflare api key and email yet."
+    _err "You can get yours from here https://dash.cloudflare.com/profile."
+    return 1
+  fi

  _debug "First detect the root zone"
  if ! _get_root "$fulldomain"; then
@@ -149,14 +158,8 @@ _get_root() {
      return 1
    fi

-    if [ "$CF_Account_ID" ]; then
-      if ! _cf_rest GET "zones?name=$h&account.id=$CF_Account_ID"; then
-        return 1
-      fi
-    else
-      if ! _cf_rest GET "zones?name=$h"; then
-        return 1
-      fi
+    if ! _cf_rest GET "zones?name=$h"; then
+      return 1
    fi

    if _contains "$response" "\"name\":\"$h\"" || _contains "$response" '"total_count":1'; then
@@ -180,17 +183,12 @@ _cf_rest() {
  data="$3"
  _debug "$ep"

-  email_trimmed=$(echo "$CF_Email" | tr -d '"')
-  key_trimmed=$(echo "$CF_Key" | tr -d '"')
-  token_trimmed=$(echo "$CF_Token" | tr -d '"')
+  email_trimmed=$(echo $CF_Email | tr -d '"')
+  key_trimmed=$(echo $CF_Key | tr -d '"')

-  export _H1="Content-Type: application/json"
-  if [ "$token_trimmed" ]; then
-    export _H2="Authorization: Bearer $token_trimmed"
-  else
-    export _H2="X-Auth-Email: $email_trimmed"
-    export _H3="X-Auth-Key: $key_trimmed"
-  fi
+  export _H1="X-Auth-Email: $email_trimmed"
+  export _H2="X-Auth-Key: $key_trimmed"
+  export _H3="Content-Type: application/json"

  if [ "$m" != "GET" ]; then
    _debug data "$data"
--- a/dnsapi/dns_da.sh
+++ b/dnsapi/dns_da.sh
@@ -9,7 +9,7 @@
 #
 # User must provide login data and URL to DirectAdmin incl. port.
 # You can create login key, by using the Login Keys function
-# ( https://da.example.com:8443/CMD_LOGIN_KEYS ), which only has access to
+# ( https://da.example.com:8443/CMD_LOGIN_KEYS ), which only has access to 
 # - CMD_API_DNS_CONTROL
 # - CMD_API_SHOW_DOMAINS
 #
--- a/dnsapi/dns_desec.sh
+++ b/dnsapi/dns_desec.sh
@@ -25,8 +25,8 @@ dns_desec_add() {
  if [ -z "$DEDYN_TOKEN" ] || [ -z "$DEDYN_NAME" ]; then
    DEDYN_TOKEN=""
    DEDYN_NAME=""
-    _err "You did not specify DEDYN_TOKEN and DEDYN_NAME yet."
-    _err "Please create your key and try again."
+    _err "You don't specify DEDYN_TOKEN and DEDYN_NAME yet."
+    _err "Please create you key and try again."
    _err "e.g."
    _err "export DEDYN_TOKEN=d41d8cd98f00b204e9800998ecf8427e"
    _err "export DEDYN_NAME=foobar.dedyn.io"
@@ -92,8 +92,8 @@ dns_desec_rm() {
  if [ -z "$DEDYN_TOKEN" ] || [ -z "$DEDYN_NAME" ]; then
    DEDYN_TOKEN=""
    DEDYN_NAME=""
-    _err "You did not specify DEDYN_TOKEN and DEDYN_NAME yet."
-    _err "Please create your key and try again."
+    _err "You don't specify DEDYN_TOKEN and DEDYN_NAME yet."
+    _err "Please create you key and try again."
    _err "e.g."
    _err "export DEDYN_TOKEN=d41d8cd98f00b204e9800998ecf8427e"
    _err "export DEDYN_NAME=foobar.dedyn.io"
--- a/dnsapi/dns_doapi.sh
+++ b/dnsapi/dns_doapi.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env sh

 # Official Let's Encrypt API for do.de / Domain-Offensive
-#
+# 
 # This is different from the dns_do adapter, because dns_do is only usable for enterprise customers
 # This API is also available to private customers/individuals
-#
-# Provide the required LetsEncrypt token like this:
+# 
+# Provide the required LetsEncrypt token like this: 
 # DO_LETOKEN="FmD408PdqT1E269gUK57"

 DO_API="https://www.do.de/api/letsencrypt"
--- a/dnsapi/dns_domeneshop.sh
+++ b/dnsapi/dns_domeneshop.sh
@@ -1,155 +0,0 @@
-#!/usr/bin/env sh
-
-DOMENESHOP_Api_Endpoint="https://api.domeneshop.no/v0"
-
-#####################  Public functions #####################
-
-# Usage: dns_domeneshop_add <full domain> <txt record>
-# Example: dns_domeneshop_add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_domeneshop_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  # Get token and secret
-  DOMENESHOP_Token="${DOMENESHOP_Token:-$(_readaccountconf_mutable DOMENESHOP_Token)}"
-  DOMENESHOP_Secret="${DOMENESHOP_Secret:-$(_readaccountconf_mutable DOMENESHOP_Secret)}"
-
-  if [ -z "$DOMENESHOP_Token" ] || [ -z "$DOMENESHOP_Secret" ]; then
-    DOMENESHOP_Token=""
-    DOMENESHOP_Secret=""
-    _err "You need to spesify a Domeneshop/Domainnameshop API Token and Secret."
-    return 1
-  fi
-
-  # Save the api token and secret.
-  _saveaccountconf_mutable DOMENESHOP_Token "$DOMENESHOP_Token"
-  _saveaccountconf_mutable DOMENESHOP_Secret "$DOMENESHOP_Secret"
-
-  # Get the domain name id
-  if ! _get_domainid "$fulldomain"; then
-    _err "Did not find domainname"
-    return 1
-  fi
-
-  # Create record
-  _domeneshop_rest POST "domains/$_domainid/dns" "{\"type\":\"TXT\",\"host\":\"$_sub_domain\",\"data\":\"$txtvalue\",\"ttl\":120}"
-}
-
-# Usage: dns_domeneshop_rm <full domain> <txt record>
-# Example: dns_domeneshop_rm _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_domeneshop_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  # Get token and secret
-  DOMENESHOP_Token="${DOMENESHOP_Token:-$(_readaccountconf_mutable DOMENESHOP_Token)}"
-  DOMENESHOP_Secret="${DOMENESHOP_Secret:-$(_readaccountconf_mutable DOMENESHOP_Secret)}"
-
-  if [ -z "$DOMENESHOP_Token" ] || [ -z "$DOMENESHOP_Secret" ]; then
-    DOMENESHOP_Token=""
-    DOMENESHOP_Secret=""
-    _err "You need to spesify a Domeneshop/Domainnameshop API Token and Secret."
-    return 1
-  fi
-
-  # Get the domain name id
-  if ! _get_domainid "$fulldomain"; then
-    _err "Did not find domainname"
-    return 1
-  fi
-
-  # Find record
-  if ! _get_recordid "$_domainid" "$_sub_domain" "$txtvalue"; then
-    _err "Did not find dns record"
-    return 1
-  fi
-
-  # Remove record
-  _domeneshop_rest DELETE "domains/$_domainid/dns/$_recordid"
-}
-
-#####################  Private functions #####################
-
-_get_domainid() {
-  domain=$1
-
-  # Get domains
-  _domeneshop_rest GET "domains"
-
-  if ! _contains "$response" "\"id\":"; then
-    _err "failed to get domain names"
-    return 1
-  fi
-
-  i=2
-  p=1
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
-    _debug "h" "$h"
-    if [ -z "$h" ]; then
-      #not valid
-      return 1
-    fi
-
-    if _contains "$response" "\"$h\"" >/dev/null; then
-      # We have found the domain name.
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
-      _domain=$h
-      _domainid=$(printf "%s" "$response" | _egrep_o "[^{]*\"domain\":\"$_domain\"[^}]*" | _egrep_o "\"id\":[0-9]+" | cut -d : -f 2)
-      return 0
-    fi
-    p=$i
-    i=$(_math "$i" + 1)
-  done
-  return 1
-}
-
-_get_recordid() {
-  domainid=$1
-  subdomain=$2
-  txtvalue=$3
-
-  # Get all dns records for the domainname
-  _domeneshop_rest GET "domains/$domainid/dns"
-
-  if ! _contains "$response" "\"id\":"; then
-    _debug "No records in dns"
-    return 1
-  fi
-
-  if ! _contains "$response" "\"host\":\"$subdomain\""; then
-    _debug "Record does not exist"
-    return 1
-  fi
-
-  # Get the id of the record in question
-  _recordid=$(printf "%s" "$response" | _egrep_o "[^{]*\"host\":\"$subdomain\"[^}]*" | _egrep_o "[^{]*\"data\":\"$txtvalue\"[^}]*" | _egrep_o "\"id\":[0-9]+" | cut -d : -f 2)
-  if [ -z "$_recordid" ]; then
-    return 1
-  fi
-  return 0
-}
-
-_domeneshop_rest() {
-  method=$1
-  endpoint=$2
-  data=$3
-
-  credentials=$(printf "%b" "$DOMENESHOP_Token:$DOMENESHOP_Secret" | _base64)
-
-  export _H1="Authorization: Basic $credentials"
-  export _H2="Content-Type: application/json"
-
-  if [ "$method" != "GET" ]; then
-    response="$(_post "$data" "$DOMENESHOP_Api_Endpoint/$endpoint" "" "$method")"
-  else
-    response="$(_get "$DOMENESHOP_Api_Endpoint/$endpoint")"
-  fi
-
-  if [ "$?" != "0" ]; then
-    _err "error $endpoint"
-    return 1
-  fi
-
-  return 0
-}
--- a/dnsapi/dns_dp.sh
+++ b/dnsapi/dns_dp.sh
@@ -63,7 +63,7 @@ dns_dp_rm() {
    return 0
  fi

-  record_id=$(echo "$response" | tr "{" "\n" | grep -- "$txtvalue" | grep '^"id"' | cut -d : -f 2 | cut -d '"' -f 2)
+  record_id=$(echo "$response" | tr "{" "\n" | grep "$txtvalue" | grep '^"id"' | cut -d : -f 2 | cut -d '"' -f 2)
  _debug record_id "$record_id"
  if [ -z "$record_id" ]; then
    _err "Can not get record id."
--- a/dnsapi/dns_durabledns.sh
+++ b/dnsapi/dns_durabledns.sh
@@ -147,11 +147,11 @@ _dd_soap() {

  # build SOAP XML
  _xml='<?xml version="1.0" encoding="utf-8"?>
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
-xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
-xmlns:tns="urn:'$_urn'"
-xmlns:types="urn:'$_urn'/encodedTypes"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" 
+xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
+xmlns:tns="urn:'$_urn'" 
+xmlns:types="urn:'$_urn'/encodedTypes" 
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 xmlns:xsd="http://www.w3.org/2001/XMLSchema">
  <soap:Body soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">'"$body"'</soap:Body>
 </soap:Envelope>'
--- a/dnsapi/dns_easydns.sh
+++ b/dnsapi/dns_easydns.sh
@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-#######################################################
-#
-# easyDNS REST API for acme.sh by Neilpang based on dns_cf.sh
-# 
-# Please note: # API is currently beta and subject to constant change
-# http://sandbox.rest.easydns.net:3000/
-#
-# Author: wurzelpanzer [wurzelpanzer@maximolider.net]
-# Report Bugs here: https://github.com/Neilpang/acme.sh/issues/2647
-#
-####################  Public functions #################
-
-#EASYDNS_Key="xxxxxxxxxxxxxxxxxxxxxxxx"
-#EASYDNS_Token="xxxxxxxxxxxxxxxxxxxxxxxx"
-EASYDNS_Api="https://rest.easydns.net"
-
-#Usage: add  _acme-challenge.www.domain.com  "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_easydns_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  EASYDNS_Token="${EASYDNS_Token:-$(_readaccountconf_mutable EASYDNS_Token)}"
-  EASYDNS_Key="${EASYDNS_Key:-$(_readaccountconf_mutable EASYDNS_Key)}"
-
-  if [ -z "$EASYDNS_Token" ] || [ -z "$EASYDNS_Key" ]; then
-    _err "You didn't specify an easydns.net token or api key. Please sign up at http://docs.sandbox.rest.easydns.net/beta_signup.php"
-    return 1
-  else
-    _saveaccountconf_mutable EASYDNS_Token "$EASYDNS_Token"
-    _saveaccountconf_mutable EASYDNS_Key "$EASYDNS_Key"
-  fi
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _debug "Getting txt records"
-  _EASYDNS_rest GET "zones/records/all/${_domain}/search/${_sub_domain}"
-
-  if ! printf "%s" "$response" | grep \"status\":200 >/dev/null; then
-    _err "Error"
-    return 1
-  fi
-
-  _info "Adding record"
-  if _EASYDNS_rest PUT "zones/records/add/$_domain/TXT" "{\"host\":\"$_sub_domain\",\"rdata\":\"$txtvalue\"}"; then
-    if _contains "$response" "\"status\":201"; then
-      _info "Added, OK"
-      return 0
-    elif _contains "$response" "Record already exists"; then
-      _info "Already exists, OK"
-      return 0
-    else
-      _err "Add txt record error."
-      return 1
-    fi
-  fi
-  _err "Add txt record error."
-  return 1
-
-}
-
-dns_easydns_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  EASYDNS_Token="${EASYDNS_Token:-$(_readaccountconf_mutable EASYDNS_Token)}"
-  EASYDNS_Key="${EASYDNS_Key:-$(_readaccountconf_mutable EASYDNS_Key)}"
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _debug "Getting txt records"
-  _EASYDNS_rest GET "zones/records/all/${_domain}/search/${_sub_domain}"
-
-  if ! printf "%s" "$response" | grep \"status\":200 >/dev/null; then
-    _err "Error"
-    return 1
-  fi
-
-  count=$(printf "%s\n" "$response" | _egrep_o "\"count\":[^,]*" | cut -d : -f 2)
-  _debug count "$count"
-  if [ "$count" = "0" ]; then
-    _info "Don't need to remove."
-  else
-    record_id=$(printf "%s\n" "$response" | _egrep_o "\"id\":\"[^\"]*\"" | cut -d : -f 2 | tr -d \" | head -n 1)
-    _debug "record_id" "$record_id"
-    if [ -z "$record_id" ]; then
-      _err "Can not get record id to remove."
-      return 1
-    fi
-    if ! _EASYDNS_rest DELETE "zones/records/$_domain/$record_id"; then
-      _err "Delete record error."
-      return 1
-    fi
-    _contains "$response" "\"status\":200"
-  fi
-
-}
-
-####################  Private functions below ##################################
-#_acme-challenge.www.domain.com
-#returns
-# _sub_domain=_acme-challenge.www
-# _domain=domain.com
-_get_root() {
-  domain=$1
-  i=1
-  p=1
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
-    _debug h "$h"
-    if [ -z "$h" ]; then
-      #not valid
-      return 1
-    fi
-
-    if ! _EASYDNS_rest GET "zones/records/all/$h"; then
-      return 1
-    fi
-
-    if _contains "$response" "\"status\":200"; then
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
-      _domain=$h
-      return 0
-    fi
-
-    p=$i
-    i=$(_math "$i" + 1)
-  done
-  return 1
-}
-
-_EASYDNS_rest() {
-  m=$1
-  ep="$2"
-  data="$3"
-  _debug "$ep"
-
-  basicauth=$(printf "%s" "$EASYDNS_Token":"$EASYDNS_Key" | _base64)
-
-  export _H1="accept: application/json"
-  if [ "$basicauth" ]; then
-    export _H2="Authorization: Basic $basicauth"
-  fi
-
-  if [ "$m" != "GET" ]; then
-    export _H3="Content-Type: application/json"
-    _debug data "$data"
-    response="$(_post "$data" "$EASYDNS_Api/$ep" "" "$m")"
-  else
-    response="$(_get "$EASYDNS_Api/$ep")"
-  fi
-
-  if [ "$?" != "0" ]; then
-    _err "error $ep"
-    return 1
-  fi
-  _debug2 response "$response"
-  return 0
-}
--- a/dnsapi/dns_euserv.sh
+++ b/dnsapi/dns_euserv.sh
@@ -127,7 +127,7 @@ dns_euserv_rm() {
  else
    # find XML block where txtvalue is in. The record_id is allways prior this line!
    _endLine=$(echo "$response" | grep -n '>dns_record_content<.*>'"$txtvalue"'<' | cut -d ':' -f 1)
-    # record_id is the last <name> Tag with a number before the row _endLine, identified by </name><value><struct>
+    # record_id is the last <name> Tag with a number before the row _endLine, identified by </name><value><struct> 
    _record_id=$(echo "$response" | sed -n '1,'"$_endLine"'p' | grep '</name><value><struct>' | _tail_n 1 | sed 's/.*<name>\([0-9]*\)<\/name>.*/\1/')
    _info "Deleting record"
    _euserv_delete_record "$_record_id"
--- a/dnsapi/dns_freedns.sh
+++ b/dnsapi/dns_freedns.sh
@@ -303,9 +303,9 @@ _freedns_domain_id() {
      return 1
    fi

-    domain_id="$(echo "$htmlpage" | tr -d " \t\r\n\v\f" | sed 's/<tr>/@<tr>/g' | tr '@' '\n' \
+    domain_id="$(echo "$htmlpage" | tr -d "[:space:]" | sed 's/<tr>/@<tr>/g' | tr '@' '\n' \
      | grep "<td>$search_domain</td>\|<td>$search_domain(.*)</td>" \
-      | sed -n 's/.*\(edit\.php?edit_domain_id=[0-9a-zA-Z]*\).*/\1/p' \
+      | _egrep_o "edit\.php\?edit_domain_id=[0-9a-zA-Z]+" \
      | cut -d = -f 2)"
    # The above beauty extracts domain ID from the html page...
    # strip out all blank space and new lines. Then insert newlines
@@ -349,17 +349,17 @@ _freedns_data_id() {
      return 1
    fi

-    data_id="$(echo "$htmlpage" | tr -d " \t\r\n\v\f" | sed 's/<tr>/@<tr>/g' | tr '@' '\n' \
+    data_id="$(echo "$htmlpage" | tr -d "[:space:]" | sed 's/<tr>/@<tr>/g' | tr '@' '\n' \
      | grep "<td[a-zA-Z=#]*>$record_type</td>" \
      | grep "<ahref.*>$search_domain</a>" \
-      | sed -n 's/.*\(edit\.php?data_id=[0-9a-zA-Z]*\).*/\1/p' \
+      | _egrep_o "edit\.php\?data_id=[0-9a-zA-Z]+" \
      | cut -d = -f 2)"
    # The above beauty extracts data ID from the html page...
    # strip out all blank space and new lines. Then insert newlines
    # before each table row <tr>
    # search for the record type withing each row (e.g. TXT)
    # search for the domain within each row (which is within a <a..>
-    # </a> anchor. And finally extract the domain ID.
+    # </a> anchor. And finally extract the domain ID.         
    if [ -n "$data_id" ]; then
      printf "%s" "$data_id"
      return 0
--- a/dnsapi/dns_he.sh
+++ b/dnsapi/dns_he.sh
@@ -134,9 +134,9 @@ _find_zone() {
  _zone_ids=$(echo "$_matches" | _egrep_o "hosted_dns_zoneid=[0-9]*&" | cut -d = -f 2 | tr -d '&')
  _zone_names=$(echo "$_matches" | _egrep_o "name=.*onclick" | cut -d '"' -f 2)
  _debug2 "These are the zones on this HE account:"
-  _debug2 "_zone_names" "$_zone_names"
+  _debug2 "$_zone_names"
  _debug2 "And these are their respective IDs:"
-  _debug2 "_zone_ids" "$_zone_ids"
+  _debug2 "$_zone_ids"
  if [ -z "$_zone_names" ] || [ -z "$_zone_ids" ]; then
    _err "Can not get zone names."
    return 1
@@ -154,14 +154,10 @@ _find_zone() {

    _debug "Looking for zone \"${_attempted_zone}\""

-    line_num="$(echo "$_zone_names" | grep -n "^$_attempted_zone\$" | _head_n 1 | cut -d : -f 1)"
-    _debug2 line_num "$line_num"
+    line_num="$(echo "$_zone_names" | grep -n "^$_attempted_zone" | cut -d : -f 1)"
+
    if [ "$line_num" ]; then
      _zone_id=$(echo "$_zone_ids" | sed -n "${line_num}p")
-      if [ -z "$_zone_id" ]; then
-        _err "Can not find zone id."
-        return 1
-      fi
      _debug "Found relevant zone \"$_attempted_zone\" with id \"$_zone_id\" - will be used for domain \"$_domain\"."
      return 0
    fi
--- a/dnsapi/dns_hexonet.sh
+++ b/dnsapi/dns_hexonet.sh
@@ -1,156 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Hexonet_Login="username!roleId"
-#
-# Hexonet_Password="rolePassword"
-
-Hexonet_Api="https://coreapi.1api.net/api/call.cgi"
-
-########  Public functions #####################
-
-#Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_hexonet_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  Hexonet_Login="${Hexonet_Login:-$(_readaccountconf_mutable Hexonet_Login)}"
-  Hexonet_Password="${Hexonet_Password:-$(_readaccountconf_mutable Hexonet_Password)}"
-  if [ -z "$Hexonet_Login" ] || [ -z "$Hexonet_Password" ]; then
-    Hexonet_Login=""
-    Hexonet_Password=""
-    _err "You must export variables: Hexonet_Login and Hexonet_Password"
-    return 1
-  fi
-
-  if ! _contains "$Hexonet_Login" "!"; then
-    _err "It seems that the Hexonet_Login=$Hexonet_Login is not a restrivteed user."
-    _err "Please check and retry."
-    return 1
-  fi
-
-  #save the username and password to the account conf file.
-  _saveaccountconf_mutable Hexonet_Login "$Hexonet_Login"
-  _saveaccountconf_mutable Hexonet_Password "$Hexonet_Password"
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _debug "Getting txt records"
-  _hexonet_rest "&command=QueryDNSZoneRRList&dnszone=${h}.&RRTYPE=TXT"
-
-  if ! _contains "$response" "CODE=200"; then
-    _err "Error"
-    return 1
-  fi
-
-  _info "Adding record"
-  if _hexonet_rest "command=UpdateDNSZone&dnszone=${_domain}.&addrr0=${_sub_domain}%20IN%20TXT%20${txtvalue}"; then
-    if _contains "$response" "CODE=200"; then
-      _info "Added, OK"
-      return 0
-    else
-      _err "Add txt record error."
-      return 1
-    fi
-  fi
-  _err "Add txt record error."
-  return 1
-
-}
-
-#fulldomain txtvalue
-dns_hexonet_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  Hexonet_Login="${Hexonet_Login:-$(_readaccountconf_mutable Hexonet_Login)}"
-  Hexonet_Password="${Hexonet_Password:-$(_readaccountconf_mutable Hexonet_Password)}"
-  if [ -z "$Hexonet_Login" ] || [ -z "$Hexonet_Password" ]; then
-    Hexonet_Login=""
-    Hexonet_Password=""
-    _err "You must export variables: Hexonet_Login and Hexonet_Password"
-    return 1
-  fi
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _debug "Getting txt records"
-  _hexonet_rest "&command=QueryDNSZoneRRList&dnszone=${h}.&RRTYPE=TXT&RR=${txtvalue}"
-
-  if ! _contains "$response" "CODE=200"; then
-    _err "Error"
-    return 1
-  fi
-
-  count=$(printf "%s\n" "$response" | _egrep_o "PROPERTY[TOTAL][0]=" | cut -d = -f 2)
-  _debug count "$count"
-  if [ "$count" = "0" ]; then
-    _info "Don't need to remove."
-  else
-    if ! _hexonet_rest "&command=UpdateDNSZone&dnszone=${_domain}.&delrr0='${_sub_domain}%20IN%20TXT%20\"${txtvalue}\""; then
-      _err "Delete record error."
-      return 1
-    fi
-    _contains "$response" "CODE=200"
-  fi
-
-}
-
-####################  Private functions below ##################################
-#_acme-challenge.www.domain.com
-#returns
-# _sub_domain=_acme-challenge.www
-# _domain=domain.com
-_get_root() {
-  domain=$1
-  i=1
-  p=1
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
-    _debug h "$h"
-    if [ -z "$h" ]; then
-      #not valid
-      return 1
-    fi
-
-    if ! _hexonet_rest "&command=QueryDNSZoneRRList&dnszone=${h}."; then
-      return 1
-    fi
-
-    if _contains "$response" "CODE=200"; then
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
-      _domain=$h
-      return 0
-    fi
-    p=$i
-    i=$(_math "$i" + 1)
-  done
-  return 1
-}
-
-_hexonet_rest() {
-  query_params="$1"
-  _debug "$query_params"
-
-  response="$(_get "${Hexonet_Api}?s_login=${Hexonet_Login}&s_pw=${Hexonet_Password}&${query_params}")"
-
-  if [ "$?" != "0" ]; then
-    _err "error $query_params"
-    return 1
-  fi
-  _debug2 response "$response"
-  return 0
-}
--- a/dnsapi/dns_leaseweb.sh
+++ b/dnsapi/dns_leaseweb.sh
@@ -1,149 +0,0 @@
-#!/usr/bin/env sh
-
-#Author: Rolph Haspers <r.haspers@global.leaseweb.com>
-#Utilize leaseweb.com API to finish dns-01 verifications.
-#Requires a Leaseweb API Key (export LSW_Key="Your Key")
-#See http://developer.leaseweb.com for more information.
-########  Public functions #####################
-
-LSW_API="https://api.leaseweb.com/hosting/v2/domains/"
-
-#Usage: dns_leaseweb_add   _acme-challenge.www.domain.com
-dns_leaseweb_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  LSW_Key="${LSW_Key:-$(_readaccountconf_mutable LSW_Key)}"
-  if [ -z "$LSW_Key" ]; then
-    LSW_Key=""
-    _err "You don't specify Leaseweb api key yet."
-    _err "Please create your key and try again."
-    return 1
-  fi
-
-  #save the api key to the account conf file.
-  _saveaccountconf_mutable LSW_Key "$LSW_Key"
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-
-  _debug _root_domain "$_domain"
-  _debug _domain "$fulldomain"
-
-  if _lsw_api "POST" "$_domain" "$fulldomain" "$txtvalue"; then
-    if [ "$_code" = "201" ]; then
-      _info "Added, OK"
-      return 0
-    else
-      _err "Add txt record error, invalid code. Code: $_code"
-      return 1
-    fi
-  fi
-  _err "Add txt record error."
-
-  return 1
-}
-
-#Usage: fulldomain txtvalue
-#Remove the txt record after validation.
-dns_leaseweb_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  LSW_Key="${LSW_Key:-$(_readaccountconf_mutable LSW_Key)}"
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-
-  _debug _root_domain "$_domain"
-  _debug _domain "$fulldomain"
-
-  if _lsw_api "DELETE" "$_domain" "$fulldomain" "$txtvalue"; then
-    if [ "$_code" = "204" ]; then
-      _info "Deleted, OK"
-      return 0
-    else
-      _err "Delete txt record error."
-      return 1
-    fi
-  fi
-  _err "Delete txt record error."
-
-  return 1
-}
-
-####################  Private functions below ##################################
-# _acme-challenge.www.domain.com
-# returns
-# _domain=domain.com
-_get_root() {
-  rdomain=$1
-  i="$(echo "$rdomain" | tr '.' ' ' | wc -w)"
-  i=$(_math "$i" - 1)
-
-  while true; do
-    h=$(printf "%s" "$rdomain" | cut -d . -f "$i"-100)
-    _debug h "$h"
-    if [ -z "$h" ]; then
-      return 1 #not valid domain
-    fi
-
-    #Check API if domain exists
-    if _lsw_api "GET" "$h"; then
-      if [ "$_code" = "200" ]; then
-        _domain="$h"
-        return 0
-      fi
-    fi
-    i=$(_math "$i" - 1)
-    if [ "$i" -lt 2 ]; then
-      return 1 #not found, no need to check _acme-challenge.sub.domain in leaseweb api.
-    fi
-  done
-
-  return 1
-}
-
-_lsw_api() {
-  cmd=$1
-  d=$2
-  fd=$3
-  tvalue=$4
-
-  # Construct the HTTP Authorization header
-  export _H2="Content-Type: application/json"
-  export _H1="X-Lsw-Auth: ${LSW_Key}"
-
-  if [ "$cmd" = "GET" ]; then
-    response="$(_get "$LSW_API/$d")"
-    _code="$(grep "^HTTP" "$HTTP_HEADER" | _tail_n 1 | cut -d " " -f 2 | tr -d "\\r\\n")"
-    _debug "http response code $_code"
-    _debug response "$response"
-    return 0
-  fi
-
-  if [ "$cmd" = "POST" ]; then
-    data="{\"name\": \"$fd.\",\"type\": \"TXT\",\"content\": [\"$tvalue\"],\"ttl\": 60}"
-    response="$(_post "$data" "$LSW_API/$d/resourceRecordSets" "$data" "POST")"
-    _code="$(grep "^HTTP" "$HTTP_HEADER" | _tail_n 1 | cut -d " " -f 2 | tr -d "\\r\\n")"
-    _debug "http response code $_code"
-    _debug response "$response"
-    return 0
-  fi
-
-  if [ "$cmd" = "DELETE" ]; then
-    response="$(_post "" "$LSW_API/$d/resourceRecordSets/$fd/TXT" "" "DELETE")"
-    _code="$(grep "^HTTP" "$HTTP_HEADER" | _tail_n 1 | cut -d " " -f 2 | tr -d "\\r\\n")"
-    _debug "http response code $_code"
-    _debug response "$response"
-    return 0
-  fi
-
-  return 1
-}
--- a/dnsapi/dns_lexicon.sh
+++ b/dnsapi/dns_lexicon.sh
@@ -63,16 +63,6 @@ _lexicon_init() {
    _saveaccountconf_mutable "$Lx_domaintoken" "$Lx_domaintoken_v"
    eval export "$Lx_domaintoken"
  fi
-
-  # shellcheck disable=SC2018,SC2019
-  Lx_api_key=$(echo LEXICON_"${PROVIDER}"_API_KEY | tr 'a-z' 'A-Z')
-  eval "$Lx_api_key=\${$Lx_api_key:-$(_readaccountconf_mutable "$Lx_api_key")}"
-  Lx_api_key_v=$(eval echo \$"$Lx_api_key")
-  _secure_debug "$Lx_api_key" "$Lx_api_key_v"
-  if [ "$Lx_api_key_v" ]; then
-    _saveaccountconf_mutable "$Lx_api_key" "$Lx_api_key_v"
-    eval export "$Lx_api_key"
-  fi
 }

 ########  Public functions #####################
--- a/dnsapi/dns_linode_v4.sh
+++ b/dnsapi/dns_linode_v4.sh
@@ -31,8 +31,7 @@ dns_linode_v4_add() {
  _payload="{
              \"type\": \"TXT\",
              \"name\": \"$_sub_domain\",
-              \"target\": \"$txtvalue\",
-              \"ttl_sec\": 300
+              \"target\": \"$txtvalue\"
            }"

  if _rest POST "/$_domain_id/records" "$_payload" && [ -n "$response" ]; then
--- a/dnsapi/dns_me.sh
+++ b/dnsapi/dns_me.sh
@@ -2,7 +2,7 @@

 # bug reports to dev@1e.ca

-# ME_Key=qmlkdjflmkqdjf
+# ME_Key=qmlkdjflmkqdjf	
 # ME_Secret=qmsdlkqmlksdvnnpae

 ME_Api=https://api.dnsmadeeasy.com/V2.0/dns/managed
--- a/dnsapi/dns_miab.sh
+++ b/dnsapi/dns_miab.sh
@@ -1,210 +0,0 @@
-#!/usr/bin/env sh
-
-# Name: dns_miab.sh
-#
-# Authors:
-#    Darven Dissek 2018
-#    William Gertz 2019
-#
-#     Thanks to Neil Pang and other developers here for code reused from acme.sh from DNS-01
-#     used to communicate with the MailinaBox Custom DNS API
-# Report Bugs here:
-#    https://github.com/billgertz/MIAB_dns_api (for dns_miab.sh)
-#    https://github.com/Neilpang/acme.sh       (for acme.sh)
-#
-########  Public functions #####################
-
-#Usage: dns_miab_add  _acme-challenge.www.domain.com  "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_miab_add() {
-  fulldomain=$1
-  txtvalue=$2
-  _info "Using miab challange add"
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  #retrieve MIAB environemt vars
-  if ! _retrieve_miab_env; then
-    return 1
-  fi
-
-  #check domain and seperate into doamin and host
-  if ! _get_root "$fulldomain"; then
-    _err "Cannot find any part of ${fulldomain} is hosted on ${MIAB_Server}"
-    return 1
-  fi
-
-  _debug2 _sub_domain "$_sub_domain"
-  _debug2 _domain "$_domain"
-
-  #add the challenge record
-  _api_path="custom/${fulldomain}/txt"
-  _miab_rest "$txtvalue" "$_api_path" "POST"
-
-  #check if result was good
-  if _contains "$response" "updated DNS"; then
-    _info "Successfully created the txt record"
-    return 0
-  else
-    _err "Error encountered during record add"
-    _err "$response"
-    return 1
-  fi
-}
-
-#Usage: dns_miab_rm  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_miab_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  _info "Using miab challage delete"
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  #retrieve MIAB environemt vars
-  if ! _retrieve_miab_env; then
-    return 1
-  fi
-
-  #check domain and seperate into doamin and host
-  if ! _get_root "$fulldomain"; then
-    _err "Cannot find any part of ${fulldomain} is hosted on ${MIAB_Server}"
-    return 1
-  fi
-
-  _debug2 _sub_domain "$_sub_domain"
-  _debug2 _domain "$_domain"
-
-  #Remove the challenge record
-  _api_path="custom/${fulldomain}/txt"
-  _miab_rest "$txtvalue" "$_api_path" "DELETE"
-
-  #check if result was good
-  if _contains "$response" "updated DNS"; then
-    _info "Successfully removed the txt record"
-    return 0
-  else
-    _err "Error encountered during record remove"
-    _err "$response"
-    return 1
-  fi
-}
-
-####################  Private functions below ##################################
-#
-#Usage: _get_root  _acme-challenge.www.domain.com
-#Returns:
-# _sub_domain=_acme-challenge.www
-# _domain=domain.com
-_get_root() {
-  _passed_domain=$1
-  _debug _passed_domain "$_passed_domain"
-  _i=2
-  _p=1
-
-  #get the zones hosed on MIAB server, must be a json stream
-  _miab_rest "" "zones" "GET"
-
-  if ! _is_json "$response"; then
-    _err "ERROR fetching domain list"
-    _err "$response"
-    return 1
-  fi
-
-  #cycle through the passed domain seperating out a test domain discarding
-  #   the subdomain by marching thorugh the dots
-  while true; do
-    _test_domain=$(printf "%s" "$_passed_domain" | cut -d . -f ${_i}-100)
-    _debug _test_domain "$_test_domain"
-
-    if [ -z "$_test_domain" ]; then
-      return 1
-    fi
-
-    #report found if the test domain is in the json response and
-    #   report the subdomain
-    if _contains "$response" "\"$_test_domain\""; then
-      _sub_domain=$(printf "%s" "$_passed_domain" | cut -d . -f 1-${_p})
-      _domain=${_test_domain}
-      return 0
-    fi
-
-    #cycle to the next dot in the passed domain
-    _p=${_i}
-    _i=$(_math "$_i" + 1)
-  done
-
-  return 1
-}
-
-#Usage: _retrieve_miab_env
-#Returns (from store or environment variables):
-# MIAB_Username
-# MIAB_Password
-# MIAB_Server
-#retrieve MIAB environment variables, report errors and quit if problems
-_retrieve_miab_env() {
-  MIAB_Username="${MIAB_Username:-$(_readaccountconf_mutable MIAB_Username)}"
-  MIAB_Password="${MIAB_Password:-$(_readaccountconf_mutable MIAB_Password)}"
-  MIAB_Server="${MIAB_Server:-$(_readaccountconf_mutable MIAB_Server)}"
-
-  #debug log the environmental variables
-  _debug MIAB_Username "$MIAB_Username"
-  _debug MIAB_Password "$MIAB_Password"
-  _debug MIAB_Server "$MIAB_Server"
-
-  #check if MIAB environemt vars set and quit if not
-  if [ -z "$MIAB_Username" ] || [ -z "$MIAB_Password" ] || [ -z "$MIAB_Server" ]; then
-    _err "You didn't specify one or more of MIAB_Username, MIAB_Password or MIAB_Server."
-    _err "Please check these environment variables and try again."
-    return 1
-  fi
-
-  #save the credentials to the account conf file.
-  _saveaccountconf_mutable MIAB_Username "$MIAB_Username"
-  _saveaccountconf_mutable MIAB_Password "$MIAB_Password"
-  _saveaccountconf_mutable MIAB_Server "$MIAB_Server"
-}
-
-#Useage: _miab_rest  "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"  "custom/_acme-challenge.www.domain.com/txt  "POST"
-#Returns: "updated DNS: domain.com"
-#rest interface MIAB dns
-_miab_rest() {
-  _data="$1"
-  _api_path="$2"
-  _httpmethod="$3"
-
-  #encode username and password for basic authentication
-  _credentials="$(printf "%s" "$MIAB_Username:$MIAB_Password" | _base64)"
-  export _H1="Authorization: Basic $_credentials"
-  _url="https://${MIAB_Server}/admin/dns/${_api_path}"
-
-  _debug2 _data "$_data"
-  _debug _api_path "$_api_path"
-  _debug2 _url "$_url"
-  _debug2 _credentails "$_credentials"
-  _debug _httpmethod "$_httpmethod"
-
-  if [ "$_httpmethod" = "GET" ]; then
-    response="$(_get "$_url")"
-  else
-    response="$(_post "$_data" "$_url" "" "$_httpmethod")"
-  fi
-
-  _retcode="$?"
-
-  if [ "$_retcode" != "0" ]; then
-    _err "MIAB REST authentication failed on $_httpmethod"
-    return 1
-  fi
-
-  _debug response "$response"
-  return 0
-}
-
-#Usage: _is_json  "\[\n   "mydomain.com"\n]"
-#Reurns "\[\n   "mydomain.com"\n]"
-#returns the string if it begins and ends with square braces
-_is_json() {
-  _str="$(echo "$1" | _normalizeJson)"
-  echo "$_str" | grep '^\[.*\]$' >/dev/null 2>&1
-}
--- a/dnsapi/dns_misaka.sh
+++ b/dnsapi/dns_misaka.sh
@@ -1,159 +0,0 @@
-#!/usr/bin/env sh
-
-# bug reports to support+acmesh@misaka.io
-# based on dns_nsone.sh by dev@1e.ca
-
-#
-#Misaka_Key="sdfsdfsdfljlbjkljlkjsdfoiwje"
-#
-
-Misaka_Api="https://dnsapi.misaka.io/dns"
-
-########  Public functions #####################
-
-#Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_misaka_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  if [ -z "$Misaka_Key" ]; then
-    Misaka_Key=""
-    _err "You didn't specify misaka.io dns api key yet."
-    _err "Please create you key and try again."
-    return 1
-  fi
-
-  #save the api key and email to the account conf file.
-  _saveaccountconf Misaka_Key "$Misaka_Key"
-
-  _debug "checking root zone [$fulldomain]"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _debug "Getting txt records"
-  _misaka_rest GET "zones/${_domain}/recordsets?search=${_sub_domain}"
-
-  if ! _contains "$response" "\"results\":"; then
-    _err "Error"
-    return 1
-  fi
-
-  count=$(printf "%s\n" "$response" | _egrep_o "\"name\":\"$_sub_domain\",[^{]*\"type\":\"TXT\"" | wc -l | tr -d " ")
-  _debug count "$count"
-  if [ "$count" = "0" ]; then
-    _info "Adding record"
-
-    if _misaka_rest PUT "zones/${_domain}/recordsets/${_sub_domain}/TXT" "{\"records\":[{\"value\":\"\\\"$txtvalue\\\"\"}],\"filters\":[],\"ttl\":1}"; then
-      _debug response "$response"
-      if _contains "$response" "$_sub_domain"; then
-        _info "Added"
-        return 0
-      else
-        _err "Add txt record error."
-        return 1
-      fi
-    fi
-    _err "Add txt record error."
-  else
-    _info "Updating record"
-
-    _misaka_rest POST "zones/${_domain}/recordsets/${_sub_domain}/TXT?append=true" "{\"records\": [{\"value\": \"\\\"$txtvalue\\\"\"}],\"ttl\":1}"
-    if [ "$?" = "0" ] && _contains "$response" "$_sub_domain"; then
-      _info "Updated!"
-      #todo: check if the record takes effect
-      return 0
-    fi
-    _err "Update error"
-    return 1
-  fi
-
-}
-
-#fulldomain
-dns_misaka_rm() {
-  fulldomain=$1
-  txtvalue=$2
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _debug "Getting txt records"
-  _misaka_rest GET "zones/${_domain}/recordsets?search=${_sub_domain}"
-
-  count=$(printf "%s\n" "$response" | _egrep_o "\"name\":\"$_sub_domain\",[^{]*\"type\":\"TXT\"" | wc -l | tr -d " ")
-  _debug count "$count"
-  if [ "$count" = "0" ]; then
-    _info "Don't need to remove."
-  else
-    if ! _misaka_rest DELETE "zones/${_domain}/recordsets/${_sub_domain}/TXT"; then
-      _err "Delete record error."
-      return 1
-    fi
-    _contains "$response" ""
-  fi
-}
-
-####################  Private functions below ##################################
-#_acme-challenge.www.domain.com
-#returns
-# _sub_domain=_acme-challenge.www
-# _domain=domain.com
-# _domain_id=sdjkglgdfewsdfg
-_get_root() {
-  domain=$1
-  i=2
-  p=1
-  if ! _misaka_rest GET "zones?limit=1000"; then
-    return 1
-  fi
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
-    _debug h "$h"
-    if [ -z "$h" ]; then
-      #not valid
-      return 1
-    fi
-
-    if _contains "$response" "\"name\":\"$h\""; then
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
-      _domain="$h"
-      return 0
-    fi
-    p=$i
-    i=$(_math "$i" + 1)
-  done
-  return 1
-}
-
-_misaka_rest() {
-  m=$1
-  ep="$2"
-  data="$3"
-  _debug "$ep"
-
-  export _H1="Content-Type: application/json"
-  export _H2="User-Agent: acme.sh/$VER misaka-dns-acmesh/20191213"
-  export _H3="Authorization: Token $Misaka_Key"
-
-  if [ "$m" != "GET" ]; then
-    _debug data "$data"
-    response="$(_post "$data" "$Misaka_Api/$ep" "" "$m")"
-  else
-    response="$(_get "$Misaka_Api/$ep")"
-  fi
-
-  if [ "$?" != "0" ]; then
-    _err "error $ep"
-    return 1
-  fi
-  _debug2 response "$response"
-  return 0
-}
--- a/dnsapi/dns_namecheap.sh
+++ b/dnsapi/dns_namecheap.sh
@@ -3,10 +3,10 @@
 # Namecheap API
 # https://www.namecheap.com/support/api/intro.aspx
 #
-# Requires Namecheap API key set in
-#NAMECHEAP_API_KEY,
+# Requires Namecheap API key set in 
+#NAMECHEAP_API_KEY, 
 #NAMECHEAP_USERNAME,
-#NAMECHEAP_SOURCEIP
+#NAMECHEAP_SOURCEIP 
 # Due to Namecheap's API limitation all the records of your domain will be read and re applied, make sure to have a backup of your records you could apply if any issue would arise.

 ########  Public functions #####################
--- a/dnsapi/dns_namesilo.sh
+++ b/dnsapi/dns_namesilo.sh
@@ -59,14 +59,9 @@ dns_namesilo_rm() {
  if _namesilo_rest GET "dnsListRecords?version=1&type=xml&key=$Namesilo_Key&domain=$_domain"; then
    retcode=$(printf "%s\n" "$response" | _egrep_o "<code>300")
    if [ "$retcode" ]; then
-      _record_id=$(echo "$response" | _egrep_o "<record_id>([^<]*)</record_id><type>TXT</type><host>$fulldomain</host>" | _egrep_o "<record_id>([^<]*)</record_id>" | sed -r "s/<record_id>([^<]*)<\/record_id>/\1/" | tail -n 1)
-      _debug _record_id "$_record_id"
-      if [ "$_record_id" ]; then
-        _info "Successfully retrieved the record id for ACME challenge."
-      else
-        _info "Empty record id, it seems no such record."
-        return 0
-      fi
+      _record_id=$(printf "%s\n" "$response" | _egrep_o "<record_id>([^<]*)</record_id><type>TXT</type><host>$fulldomain</host>" | _egrep_o "<record_id>([^<]*)</record_id>" | sed -r "s/<record_id>([^<]*)<\/record_id>/\1/" | tail -n 1)
+      _debug record_id "$_record_id"
+      _info "Successfully retrieved the record id for ACME challenge."
    else
      _err "Unable to retrieve the record id."
      return 1
@@ -110,7 +105,7 @@ _get_root() {
      return 1
    fi

-    if _contains "$response" "<domain>$host"; then
+    if _contains "$response" "$host"; then
      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
      _domain="$host"
      return 0
--- a/dnsapi/dns_nic.sh
+++ b/dnsapi/dns_nic.sh
@@ -1,205 +0,0 @@
-#!/usr/bin/env sh
-
-#
-#NIC_ClientID='0dc0xxxxxxxxxxxxxxxxxxxxxxxxce88'
-#NIC_ClientSecret='3LTtxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxnuW8'
-#NIC_Username="000000/NIC-D"
-#NIC_Password="xxxxxxx"
-
-NIC_Api="https://api.nic.ru"
-
-dns_nic_add() {
-  fulldomain="${1}"
-  txtvalue="${2}"
-
-  if ! _nic_get_authtoken save; then
-    _err "get NIC auth token failed"
-    return 1
-  fi
-
-  _debug "First detect the root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "Invalid domain"
-    return 1
-  fi
-
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-  _debug _service "$_service"
-
-  _info "Adding record"
-  if ! _nic_rest PUT "services/$_service/zones/$_domain/records" "<?xml version=\"1.0\" encoding=\"UTF-8\" ?><request><rr-list><rr><name>$_sub_domain</name><type>TXT</type><txt><string>$txtvalue</string></txt></rr></rr-list></request>"; then
-    _err "Add TXT record error"
-    return 1
-  fi
-
-  if ! _nic_rest POST "services/$_service/zones/$_domain/commit" ""; then
-    return 1
-  fi
-  _info "Added, OK"
-}
-
-dns_nic_rm() {
-  fulldomain="${1}"
-  txtvalue="${2}"
-
-  if ! _nic_get_authtoken; then
-    _err "get NIC auth token failed"
-    return 1
-  fi
-
-  if ! _get_root "$fulldomain"; then
-    _err "Invalid domain"
-    return 1
-  fi
-
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-  _debug _service "$_service"
-
-  if ! _nic_rest GET "services/$_service/zones/$_domain/records"; then
-    _err "Get records error"
-    return 1
-  fi
-
-  _domain_id=$(printf "%s" "$response" | grep "$_sub_domain" | grep -- "$txtvalue" | sed -r "s/.*<rr id=\"(.*)\".*/\1/g")
-
-  if ! _nic_rest DELETE "services/$_service/zones/$_domain/records/$_domain_id"; then
-    _err "Delete record error"
-    return 1
-  fi
-
-  if ! _nic_rest POST "services/$_service/zones/$_domain/commit" ""; then
-    return 1
-  fi
-}
-
-####################  Private functions below ##################################
-
-#_nic_get_auth_elements [need2save]
-_nic_get_auth_elements() {
-  _need2save=$1
-
-  NIC_ClientID="${NIC_ClientID:-$(_readaccountconf_mutable NIC_ClientID)}"
-  NIC_ClientSecret="${NIC_ClientSecret:-$(_readaccountconf_mutable NIC_ClientSecret)}"
-  NIC_Username="${NIC_Username:-$(_readaccountconf_mutable NIC_Username)}"
-  NIC_Password="${NIC_Password:-$(_readaccountconf_mutable NIC_Password)}"
-
-  ## for backward compatibility
-  if [ -z "$NIC_ClientID" ] || [ -z "$NIC_ClientSecret" ]; then
-    NIC_Token="${NIC_Token:-$(_readaccountconf_mutable NIC_Token)}"
-    _debug NIC_Token "$NIC_Token"
-    if [ -n "$NIC_Token" ]; then
-      _two_values="$(echo "${NIC_Token}" | _dbase64)"
-      _debug _two_values "$_two_values"
-      NIC_ClientID=$(echo "$_two_values" | cut -d':' -f1)
-      NIC_ClientSecret=$(echo "$_two_values" | cut -d':' -f2-)
-      _debug restored_NIC_ClientID "$NIC_ClientID"
-      _debug restored_NIC_ClientSecret "$NIC_ClientSecret"
-    fi
-  fi
-
-  if [ -z "$NIC_ClientID" ] || [ -z "$NIC_ClientSecret" ] || [ -z "$NIC_Username" ] || [ -z "$NIC_Password" ]; then
-    NIC_ClientID=""
-    NIC_ClientSecret=""
-    NIC_Username=""
-    NIC_Password=""
-    _err "You must export variables: NIC_ClientID, NIC_ClientSecret, NIC_Username and NIC_Password"
-    return 1
-  fi
-
-  if [ "$_need2save" ]; then
-    _saveaccountconf_mutable NIC_ClientID "$NIC_ClientID"
-    _saveaccountconf_mutable NIC_ClientSecret "$NIC_ClientSecret"
-    _saveaccountconf_mutable NIC_Username "$NIC_Username"
-    _saveaccountconf_mutable NIC_Password "$NIC_Password"
-  fi
-
-  NIC_BasicAuth=$(printf "%s:%s" "${NIC_ClientID}" "${NIC_ClientSecret}" | _base64)
-  _debug NIC_BasicAuth "$NIC_BasicAuth"
-
-}
-
-#_nic_get_authtoken [need2save]
-_nic_get_authtoken() {
-  _need2save=$1
-
-  if ! _nic_get_auth_elements "$_need2save"; then
-    return 1
-  fi
-
-  _info "Getting NIC auth token"
-
-  export _H1="Authorization: Basic ${NIC_BasicAuth}"
-  export _H2="Content-Type: application/x-www-form-urlencoded"
-
-  res=$(_post "grant_type=password&username=${NIC_Username}&password=${NIC_Password}&scope=%28GET%7CPUT%7CPOST%7CDELETE%29%3A%2Fdns-master%2F.%2B" "$NIC_Api/oauth/token" "" "POST")
-  if _contains "$res" "access_token"; then
-    _auth_token=$(printf "%s" "$res" | cut -d , -f2 | tr -d "\"" | sed "s/access_token://")
-    _info "Token received"
-    _debug _auth_token "$_auth_token"
-    return 0
-  fi
-  return 1
-}
-
-_get_root() {
-  domain="$1"
-  i=1
-  p=1
-
-  if ! _nic_rest GET "zones"; then
-    return 1
-  fi
-
-  _all_domains=$(printf "%s" "$response" | grep "idn-name" | sed -r "s/.*idn-name=\"(.*)\" name=.*/\1/g")
-  _debug2 _all_domains "$_all_domains"
-
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f "$i"-100)
-    _debug h "$h"
-
-    if [ -z "$h" ]; then
-      return 1
-    fi
-
-    if _contains "$_all_domains" "^$h$"; then
-      _sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
-      _domain=$h
-      _service=$(printf "%s" "$response" | grep "idn-name=\"$_domain\"" | sed -r "s/.*service=\"(.*)\".*$/\1/")
-      return 0
-    fi
-    p="$i"
-    i=$(_math "$i" + 1)
-  done
-  return 1
-}
-
-_nic_rest() {
-  m="$1"
-  ep="$2"
-  data="$3"
-  _debug "$ep"
-
-  export _H1="Content-Type: application/xml"
-  export _H2="Authorization: Bearer $_auth_token"
-
-  if [ "$m" != "GET" ]; then
-    _debug data "$data"
-    response=$(_post "$data" "$NIC_Api/dns-master/$ep" "" "$m")
-  else
-    response=$(_get "$NIC_Api/dns-master/$ep")
-  fi
-
-  if _contains "$response" "<errors>"; then
-    error=$(printf "%s" "$response" | grep "error code" | sed -r "s/.*<error code=.*>(.*)<\/error>/\1/g")
-    _err "Error: $error"
-    return 1
-  fi
-
-  if ! _contains "$response" "<status>success</status>"; then
-    return 1
-  fi
-  _debug2 response "$response"
-  return 0
-}
--- a/dnsapi/dns_nsupdate.sh
+++ b/dnsapi/dns_nsupdate.sh
@@ -27,7 +27,7 @@ dns_nsupdate_add() {
  [ -n "$DEBUG" ] && [ "$DEBUG" -ge "$DEBUG_LEVEL_2" ] && nsdebug="-D"
  if [ -z "${NSUPDATE_ZONE}" ]; then
    nsupdate -k "${NSUPDATE_KEY}" $nsdebug <<EOF
-server ${NSUPDATE_SERVER}  ${NSUPDATE_SERVER_PORT}
+server ${NSUPDATE_SERVER}  ${NSUPDATE_SERVER_PORT} 
 update add ${fulldomain}. 60 in txt "${txtvalue}"
 send
 EOF
@@ -64,7 +64,7 @@ dns_nsupdate_rm() {
  [ -n "$DEBUG" ] && [ "$DEBUG" -ge "$DEBUG_LEVEL_2" ] && nsdebug="-D"
  if [ -z "${NSUPDATE_ZONE}" ]; then
    nsupdate -k "${NSUPDATE_KEY}" $nsdebug <<EOF
-server ${NSUPDATE_SERVER}  ${NSUPDATE_SERVER_PORT}
+server ${NSUPDATE_SERVER}  ${NSUPDATE_SERVER_PORT} 
 update delete ${fulldomain}. txt
 send
 EOF
--- a/dnsapi/dns_pleskxml.sh
+++ b/dnsapi/dns_pleskxml.sh
@@ -1,414 +0,0 @@
-#!/usr/bin/env sh
-
-##  Name: dns_pleskxml.sh
-##  Created by Stilez.
-##  Also uses some code from PR#1832 by @romanlum (https://github.com/Neilpang/acme.sh/pull/1832/files)
-
-##  This DNS-01 method uses the Plesk XML API described at:
-##  https://docs.plesk.com/en-US/12.5/api-rpc/about-xml-api.28709
-##  and more specifically: https://docs.plesk.com/en-US/12.5/api-rpc/reference.28784
-
-##  Note: a DNS ID with host = empty string is OK for this API, see
-##  https://docs.plesk.com/en-US/obsidian/api-rpc/about-xml-api/reference/managing-dns/managing-dns-records/adding-dns-record.34798
-##  For example, to add a TXT record to DNS alias domain "acme-alias.com" would be a valid Plesk action.
-##  So this API module can handle such a request, if needed.
-
-##  For ACME v2 purposes, new TXT records are appended when added, and removing one TXT record will not affect any other TXT records.
-
-##  The user credentials (username+password) and URL/URI for the Plesk XML API must be set by the user
-##  before this module is called (case sensitive):
-##
-##  ```
-##  export pleskxml_uri="https://address-of-my-plesk-server.net:8443/enterprise/control/agent.php"
-##          (or probably something similar)
-##  export pleskxml_user="my plesk username"
-##  export pleskxml_pass="my plesk password"
-##  ```
-
-##  Ok, let's issue a cert now:
-##  ```
-##  acme.sh --issue --dns dns_pleskxml -d example.com -d www.example.com
-##  ```
-##
-##  The `pleskxml_uri`, `pleskxml_user` and `pleskxml_pass` will be saved in `~/.acme.sh/account.conf` and reused when needed.
-
-####################  INTERNAL VARIABLES + NEWLINE + API TEMPLATES ##################################
-
-pleskxml_init_checks_done=0
-
-# Variable containing bare newline - not a style issue
-# shellcheck disable=SC1004
-NEWLINE='\
-'
-
-pleskxml_tplt_get_domains="<packet><customer><get-domain-list><filter/></get-domain-list></customer></packet>"
-# Get a list of domains that PLESK can manage, so we can check root domain + host for acme.sh
-# Also used to test credentials and URI.
-# No params.
-
-pleskxml_tplt_get_dns_records="<packet><dns><get_rec><filter><site-id>%s</site-id></filter></get_rec></dns></packet>"
-# Get all DNS records for a Plesk domain ID.
-# PARAM = Plesk domain id to query
-
-pleskxml_tplt_add_txt_record="<packet><dns><add_rec><site-id>%s</site-id><type>TXT</type><host>%s</host><value>%s</value></add_rec></dns></packet>"
-# Add a TXT record to a domain.
-# PARAMS = (1) Plesk internal domain ID, (2) "hostname" for the new record, eg '_acme_challenge', (3) TXT record value
-
-pleskxml_tplt_rmv_dns_record="<packet><dns><del_rec><filter><id>%s</id></filter></del_rec></dns></packet>"
-# Delete a specific TXT record from a domain.
-# PARAM = the Plesk internal ID for the DNS record to be deleted
-
-####################  Public functions ##################################
-
-#Usage: dns_pleskxml_add   _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_pleskxml_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  _info "Entering dns_pleskxml_add() to add TXT record '$txtvalue' to domain '$fulldomain'..."
-
-  # Get credentials if not already checked, and confirm we can log in to Plesk XML API
-  if ! _credential_check; then
-    return 1
-  fi
-
-  # Get root and subdomain details, and Plesk domain ID
-  if ! _pleskxml_get_root_domain "$fulldomain"; then
-    return 1
-  fi
-
-  _debug 'Credentials OK, and domain identified. Calling Plesk XML API to add TXT record'
-
-  # printf using template in a variable - not a style issue
-  # shellcheck disable=SC2059
-  request="$(printf "$pleskxml_tplt_add_txt_record" "$root_domain_id" "$sub_domain_name" "$txtvalue")"
-  if ! _call_api "$request"; then
-    return 1
-  fi
-
-  # OK, we should have added a TXT record. Let's check and return success if so.
-  # All that should be left in the result, is one section, containing <result><status>ok</status><id>NEW_DNS_RECORD_ID</id></result>
-
-  results="$(_api_response_split "$pleskxml_prettyprint_result" 'result' '<status>')"
-
-  if ! _value "$results" | grep '<status>ok</status>' | grep '<id>[0-9]\{1,\}</id>' >/dev/null; then
-    # Error - doesn't contain expected string. Something's wrong.
-    _err 'Error when calling Plesk XML API.'
-    _err 'The result did not contain the expected <id>XXXXX</id> section, or contained other values as well.'
-    _err 'This is unexpected: something has gone wrong.'
-    _err 'The full response was:'
-    _err "$pleskxml_prettyprint_result"
-    return 1
-  fi
-
-  recid="$(_value "$results" | grep '<id>[0-9]\{1,\}</id>' | sed 's/^.*<id>\([0-9]\{1,\}\)<\/id>.*$/\1/')"
-
-  _info "Success. TXT record appears to be correctly added (Plesk record ID=$recid). Exiting dns_pleskxml_add()."
-
-  return 0
-}
-
-#Usage: dns_pleskxml_rm   _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_pleskxml_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  _info "Entering dns_pleskxml_rm() to remove TXT record '$txtvalue' from domain '$fulldomain'..."
-
-  # Get credentials if not already checked, and confirm we can log in to Plesk XML API
-  if ! _credential_check; then
-    return 1
-  fi
-
-  # Get root and subdomain details, and Plesk domain ID
-  if ! _pleskxml_get_root_domain "$fulldomain"; then
-    return 1
-  fi
-
-  _debug 'Credentials OK, and domain identified. Calling Plesk XML API to get list of TXT records and their IDs'
-
-  # printf using template in a variable - not a style issue
-  # shellcheck disable=SC2059
-  request="$(printf "$pleskxml_tplt_get_dns_records" "$root_domain_id")"
-  if ! _call_api "$request"; then
-    return 1
-  fi
-
-  # Reduce output to one line per DNS record, filtered for TXT records with a record ID only (which they should all have)
-  # Also strip out spaces between tags, redundant <data> and </data> group tags and any <self-closing/> tags
-  reclist="$(_api_response_split "$pleskxml_prettyprint_result" 'result' '<status>ok</status>' \
-    | sed 's# \{1,\}<\([a-zA-Z]\)#<\1#g;s#</\{0,1\}data>##g;s#<[a-z][^/<>]*/>##g' \
-    | grep "<site-id>${root_domain_id}</site-id>" \
-    | grep '<id>[0-9]\{1,\}</id>' \
-    | grep '<type>TXT</type>'
-  )"
-
-  if [ -z "$reclist" ]; then
-    _err "No TXT records found for root domain ${root_domain_name} (Plesk domain ID ${root_domain_id}). Exiting."
-    return 1
-  fi
-
-  _debug "Got list of DNS TXT records for root domain '$root_domain_name':"
-  _debug "$reclist"
-
-  recid="$(_value "$reclist" \
-    | grep "<host>${fulldomain}.</host>" \
-    | grep "<value>${txtvalue}</value>" \
-    | sed 's/^.*<id>\([0-9]\{1,\}\)<\/id>.*$/\1/'
-  )"
-
-  if ! _value "$recid" | grep '^[0-9]\{1,\}$' >/dev/null; then
-    _err "DNS records for root domain '${root_domain_name}' (Plesk ID ${root_domain_id}) + host '${sub_domain_name}' do not contain the TXT record '${txtvalue}'"
-    _err "Cannot delete TXT record. Exiting."
-    return 1
-  fi
-
-  _debug "Found Plesk record ID for target text string '${txtvalue}': ID=${recid}"
-  _debug 'Calling Plesk XML API to remove TXT record'
-
-  # printf using template in a variable - not a style issue
-  # shellcheck disable=SC2059
-  request="$(printf "$pleskxml_tplt_rmv_dns_record" "$recid")"
-  if ! _call_api "$request"; then
-    return 1
-  fi
-
-  # OK, we should have removed a TXT record. Let's check and return success if so.
-  # All that should be left in the result, is one section, containing <result><status>ok</status><id>PLESK_DELETED_DNS_RECORD_ID</id></result>
-
-  results="$(_api_response_split "$pleskxml_prettyprint_result" 'result' '<status>')"
-
-  if ! _value "$results" | grep '<status>ok</status>' | grep '<id>[0-9]\{1,\}</id>' >/dev/null; then
-    # Error - doesn't contain expected string. Something's wrong.
-    _err 'Error when calling Plesk XML API.'
-    _err 'The result did not contain the expected <id>XXXXX</id> section, or contained other values as well.'
-    _err 'This is unexpected: something has gone wrong.'
-    _err 'The full response was:'
-    _err "$pleskxml_prettyprint_result"
-    return 1
-  fi
-
-  _info "Success. TXT record appears to be correctly removed. Exiting dns_pleskxml_rm()."
-  return 0
-}
-
-####################  Private functions below (utility functions) ##################################
-
-# Outputs value of a variable without additional newlines etc
-_value() {
-  printf '%s' "$1"
-}
-
-# Outputs value of a variable (FQDN) and cuts it at 2 specified '.' delimiters, returning the text in between
-# $1, $2 = where to cut
-# $3 = FQDN
-_valuecut() {
-  printf '%s' "$3" | cut -d . -f "${1}-${2}"
-}
-
-# Counts '.' present in a domain name or other string
-# $1 = domain name
-_countdots() {
-  _value "$1" | tr -dc '.' | wc -c | sed 's/ //g'
-}
-
-# Cleans up an API response, splits it "one line per item in the response" and greps for a string that in the context, identifies "useful" lines
-# $1 - result string from API
-# $2 - plain text tag to resplit on (usually "result" or "domain"). NOT REGEX
-# $3 - basic regex to recognise useful return lines
-# note: $3 matches via basic NOT extended regex (BRE), as extended regex capabilities not needed at the moment.
-#       Last line could change to <sed -n '/.../p'> instead, with suitable escaping of ['"/$],
-#       if future Plesk XML API changes ever require extended regex
-_api_response_split() {
-  printf '%s' "$1" \
-    | sed 's/^ +//;s/ +$//' \
-    | tr -d '\n\r' \
-    | sed "s/<\/\{0,1\}$2>/${NEWLINE}/g" \
-    | grep "$3"
-}
-
-####################  Private functions below (DNS functions) ##################################
-
-# Calls Plesk XML API, and checks results for obvious issues
-_call_api() {
-  request="$1"
-  errtext=''
-
-  _debug 'Entered _call_api(). Calling Plesk XML API with request:'
-  _debug "'$request'"
-
-  export _H1="HTTP_AUTH_LOGIN: $pleskxml_user"
-  export _H2="HTTP_AUTH_PASSWD: $pleskxml_pass"
-  export _H3="content-Type: text/xml"
-  export _H4="HTTP_PRETTY_PRINT: true"
-  pleskxml_prettyprint_result="$(_post "${request}" "$pleskxml_uri" "" "POST")"
-  pleskxml_retcode="$?"
-  _debug 'The responses from the Plesk XML server were:'
-  _debug "retcode=$pleskxml_retcode. Literal response:"
-  _debug "'$pleskxml_prettyprint_result'"
-
-  # Detect any <status> that isn't "ok". None of the used calls should fail if the API is working correctly.
-  # Also detect if there simply aren't any status lines (null result?) and report that, as well.
-
-  statuslines_count_total="$(echo "$pleskxml_prettyprint_result" | grep -c '^ *<status>[^<]*</status> *$')"
-  statuslines_count_okay="$(echo "$pleskxml_prettyprint_result" | grep -c '^ *<status>ok</status> *$')"
-
-  if [ -z "$statuslines_count_total" ]; then
-
-    # We have no status lines at all. Results are empty
-    errtext='The Plesk XML API unexpectedly returned an empty set of results for this call.'
-
-  elif [ "$statuslines_count_okay" -ne "$statuslines_count_total" ]; then
-
-    # We have some status lines that aren't "ok". Any available details are in API response fields "status" "errcode" and "errtext"
-    # Workaround for basic regex: 
-    #   - filter output to keep only lines like this: "SPACES<TAG>text</TAG>SPACES" (shouldn't be necessary with prettyprint but guarantees subsequent code is ok)
-    #   - then edit the 3 "useful" error tokens individually and remove closing tags on all lines
-    #   - then filter again to remove all lines not edited (which will be the lines not starting A-Z)
-    errtext="$(_value "$pleskxml_prettyprint_result" \
-      | grep '^ *<[a-z]\{1,\}>[^<]*<\/[a-z]\{1,\}> *$' \
-      | sed 's/^ *<status>/Status:     /;s/^ *<errcode>/Error code: /;s/^ *<errtext>/Error text: /;s/<\/.*$//' \
-      | grep '^[A-Z]'
-    )"
-
-  fi
-
-  if [ "$pleskxml_retcode" -ne 0 ] || [ "$errtext" != "" ]; then
-    # Call failed, for reasons either in the retcode or the response text...
-
-    if [ "$pleskxml_retcode" -eq 0 ]; then
-      _err "The POST request was successfully sent to the Plesk server."
-    else
-      _err "The return code for the POST request was $pleskxml_retcode (non-zero = failure in submitting request to server)."
-    fi
-
-    if [ "$errtext" != "" ]; then
-      _err 'The error responses received from the Plesk server were:'
-      _err "$errtext"
-    else
-      _err "No additional error messages were received back from the Plesk server"
-    fi
-
-    _err "The Plesk XML API call failed."
-    return 1
-
-  fi
-
-  _debug "Leaving _call_api(). Successful call."
-
-  return 0
-}
-
-# Startup checks (credentials, URI)
-_credential_check() {
-  _debug "Checking Plesk XML API login credentials and URI..."
-
-  if [ "$pleskxml_init_checks_done" -eq 1 ]; then
-    _debug "Initial checks already done, no need to repeat. Skipped."
-    return 0
-  fi
-
-  pleskxml_user="${pleskxml_user:-$(_readaccountconf_mutable pleskxml_user)}"
-  pleskxml_pass="${pleskxml_pass:-$(_readaccountconf_mutable pleskxml_pass)}"
-  pleskxml_uri="${pleskxml_uri:-$(_readaccountconf_mutable pleskxml_uri)}"
-
-  if [ -z "$pleskxml_user" ] || [ -z "$pleskxml_pass" ] || [ -z "$pleskxml_uri" ]; then
-    pleskxml_user=""
-    pleskxml_pass=""
-    pleskxml_uri=""
-    _err "You didn't specify one or more of the Plesk XML API username, password, or URI."
-    _err "Please create these and try again."
-    _err "Instructions are in the 'dns_pleskxml' plugin source code or in the acme.sh documentation."
-    return 1
-  fi
-
-  # Test the API is usable, by trying to read the list of managed domains...
-  _call_api "$pleskxml_tplt_get_domains"
-  if [ "$pleskxml_retcode" -ne 0 ]; then
-    _err 'Failed to access Plesk XML API.'
-    _err "Please check your login credentials and Plesk URI, and that the URI is reachable, and try again."
-    return 1
-  fi
-
-  _saveaccountconf_mutable pleskxml_uri "$pleskxml_uri"
-  _saveaccountconf_mutable pleskxml_user "$pleskxml_user"
-  _saveaccountconf_mutable pleskxml_pass "$pleskxml_pass"
-
-  _debug "Test login to Plesk XML API successful. Login credentials and URI successfully saved to the acme.sh configuration file for future use."
-
-  pleskxml_init_checks_done=1
-
-  return 0
-}
-
-# For a FQDN, identify the root domain managed by Plesk, its domain ID in Plesk, and the host if any.
-
-# IMPORTANT NOTE:  a result with host = empty string is OK for this API, see
-# https://docs.plesk.com/en-US/obsidian/api-rpc/about-xml-api/reference/managing-dns/managing-dns-records/adding-dns-record.34798
-# See notes at top of this file
-
-_pleskxml_get_root_domain() {
-  original_full_domain_name="$1"
-
-  _debug "Identifying DNS root domain for '$original_full_domain_name' that is managed by the Plesk account."
-
-  # test if the domain as provided is valid for splitting.
-
-  if [ "$(_countdots "$original_full_domain_name")" -eq 0 ]; then
-    _err "Invalid domain. The ACME domain must contain at least two parts (aa.bb) to identify a domain and tld for the TXT record."
-    return 1
-  fi
-
-  _debug "Querying Plesk server for list of managed domains..."
-
-  _call_api "$pleskxml_tplt_get_domains"
-  if [ "$pleskxml_retcode" -ne 0 ]; then
-    return 1
-  fi
-
-  # Generate a crude list of domains known to this Plesk account.
-  # We convert <ascii-name> tags to <name> so it'll flag on a hit with either <name> or <ascii-name> fields,
-  # for non-Western character sets.
-  # Output will be one line per known domain, containing 2 <name> tages and a single <id> tag
-  # We don't actually need to check for type, name, *and* id, but it guarantees only usable lines are returned.
-
-  output="$(_api_response_split "$pleskxml_prettyprint_result" 'domain' '<type>domain</type>' | sed 's/<ascii-name>/<name>/g;s/<\/ascii-name>/<\/name>/g' | grep '<name>' | grep '<id>')"
-
-  _debug 'Domains managed by Plesk server are (ignore the hacked output):'
-  _debug "$output"
-
-  # loop and test if domain, or any parent domain, is managed by Plesk
-  # Loop until we don't have any '.' in the string we're testing as a candidate Plesk-managed domain
-
-  root_domain_name="$original_full_domain_name"
-
-  while true; do
-
-    _debug "Checking if '$root_domain_name' is managed by the Plesk server..."
-
-    root_domain_id="$(_value "$output" | grep "<name>$root_domain_name</name>" | _head_n 1 | sed 's/^.*<id>\([0-9]\{1,\}\)<\/id>.*$/\1/')"
-
-    if [ -n "$root_domain_id" ]; then
-      # Found a match
-      # SEE IMPORTANT NOTE ABOVE - THIS FUNCTION CAN RETURN HOST='', AND THAT'S OK FOR PLESK XML API WHICH ALLOWS IT.
-      # SO WE HANDLE IT AND DON'T PREVENT IT
-      sub_domain_name="$(_value "$original_full_domain_name" | sed "s/\.\{0,1\}${root_domain_name}"'$//')"
-      _info "Success. Matched host '$original_full_domain_name' to: DOMAIN '${root_domain_name}' (Plesk ID '${root_domain_id}'), HOST '${sub_domain_name}'. Returning."
-      return 0
-    fi
-
-    # No match, try next parent up (if any)...
-
-    root_domain_name="$(_valuecut 2 1000 "$root_domain_name")"
-
-    if [ "$(_countdots "$root_domain_name")" -eq 0 ]; then
-      _debug "No match, and next parent would be a TLD..."
-      _err "Cannot find '$original_full_domain_name' or any parent domain of it, in Plesk."
-      _err "Are you sure that this domain is managed by this Plesk server?"
-      return 1
-    fi
-
-    _debug "No match, trying next parent up..."
-
-  done
-}
--- a/dnsapi/dns_rcode0.sh
+++ b/dnsapi/dns_rcode0.sh
@@ -1,224 +0,0 @@
-#!/usr/bin/env sh
-
-#Rcode0 API Integration
-#https://my.rcodezero.at/api-doc
-#
-# log into https://my.rcodezero.at/enableapi and  get your ACME API Token (the ACME API token has limited
-# access to the REST calls needed for acme.sh only)
-#
-#RCODE0_URL="https://my.rcodezero.at"
-#RCODE0_API_TOKEN="0123456789ABCDEF"
-#RCODE0_TTL=60
-
-DEFAULT_RCODE0_URL="https://my.rcodezero.at"
-DEFAULT_RCODE0_TTL=60
-
-########  Public functions #####################
-#Usage: add _acme-challenge.www.domain.com "123456789ABCDEF0000000000000000000000000000000000000"
-#fulldomain
-#txtvalue
-dns_rcode0_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  RCODE0_API_TOKEN="${RCODE0_API_TOKEN:-$(_readaccountconf_mutable RCODE0_API_TOKEN)}"
-  RCODE0_URL="${RCODE0_URL:-$(_readaccountconf_mutable RCODE0_URL)}"
-  RCODE0_TTL="${RCODE0_TTL:-$(_readaccountconf_mutable RCODE0_TTL)}"
-
-  if [ -z "$RCODE0_URL" ]; then
-    RCODE0_URL="$DEFAULT_RCODE0_URL"
-  fi
-
-  if [ -z "$RCODE0_API_TOKEN" ]; then
-    RCODE0_API_TOKEN=""
-    _err "Missing Rcode0 ACME API Token."
-    _err "Please login and create your token at httsp://my.rcodezero.at/enableapi and try again."
-    return 1
-  fi
-
-  if [ -z "$RCODE0_TTL" ]; then
-    RCODE0_TTL="$DEFAULT_RCODE0_TTL"
-  fi
-
-  #save the token to the account conf file.
-  _saveaccountconf_mutable RCODE0_API_TOKEN "$RCODE0_API_TOKEN"
-
-  if [ "$RCODE0_URL" != "$DEFAULT_RCODE0_URL" ]; then
-    _saveaccountconf_mutable RCODE0_URL "$RCODE0_URL"
-  fi
-
-  if [ "$RCODE0_TTL" != "$DEFAULT_RCODE0_TTL" ]; then
-    _saveaccountconf_mutable RCODE0_TTL "$RCODE0_TTL"
-  fi
-
-  _debug "Detect root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "No 'MASTER' zone for $fulldomain found at RcodeZero Anycast."
-    return 1
-  fi
-  _debug _domain "$_domain"
-
-  _debug "Adding record"
-
-  _record_string=""
-  _build_record_string "$txtvalue"
-  _list_existingchallenges
-  for oldchallenge in $_existing_challenges; do
-    _build_record_string "$oldchallenge"
-  done
-
-  _debug "Challenges: $_existing_challenges"
-
-  if [ -z "$_existing_challenges" ]; then
-    if ! _rcode0_rest "PATCH" "/api/v1/acme/zones/$_domain/rrsets" "[{\"changetype\": \"add\", \"name\": \"$fulldomain.\", \"type\": \"TXT\", \"ttl\": $RCODE0_TTL, \"records\": [$_record_string]}]"; then
-      _err "Add txt record error."
-      return 1
-    fi
-  else
-    # try update in case a records exists (need for wildcard certs)
-    if ! _rcode0_rest "PATCH" "/api/v1/acme/zones/$_domain/rrsets" "[{\"changetype\": \"update\", \"name\": \"$fulldomain.\", \"type\": \"TXT\", \"ttl\": $RCODE0_TTL, \"records\": [$_record_string]}]"; then
-      _err "Set txt record error."
-      return 1
-    fi
-  fi
-
-  return 0
-}
-
-#fulldomain txtvalue
-dns_rcode0_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  RCODE0_API_TOKEN="${RCODE0_API_TOKEN:-$(_readaccountconf_mutable RCODE0_API_TOKEN)}"
-  RCODE0_URL="${RCODE0_URL:-$(_readaccountconf_mutable RCODE0_URL)}"
-  RCODE0_TTL="${RCODE0_TTL:-$(_readaccountconf_mutable RCODE0_TTL)}"
-
-  if [ -z "$RCODE0_URL" ]; then
-    RCODE0_URL="$DEFAULT_RCODE0_URL"
-  fi
-
-  if [ -z "$RCODE0_API_TOKEN" ]; then
-    RCODE0_API_TOKEN=""
-    _err "Missing Rcode0 API Token."
-    _err "Please login and create your token at httsp://my.rcodezero.at/enableapi and try again."
-    return 1
-  fi
-
-  #save the api addr and key to the account conf file.
-  _saveaccountconf_mutable RCODE0_URL "$RCODE0_URL"
-  _saveaccountconf_mutable RCODE0_API_TOKEN "$RCODE0_API_TOKEN"
-
-  if [ "$RCODE0_TTL" != "$DEFAULT_RCODE0_TTL" ]; then
-    _saveaccountconf_mutable RCODE0_TTL "$RCODE0_TTL"
-  fi
-
-  if [ -z "$RCODE0_TTL" ]; then
-    RCODE0_TTL="$DEFAULT_RCODE0_TTL"
-  fi
-
-  _debug "Detect root zone"
-  if ! _get_root "$fulldomain"; then
-    _err "invalid domain"
-    return 1
-  fi
-
-  _debug "Remove record"
-
-  #Enumerate existing acme challenges
-  _list_existingchallenges
-
-  if _contains "$_existing_challenges" "$txtvalue"; then
-    #Delete all challenges (PowerDNS API does not allow to delete content)
-    if ! _rcode0_rest "PATCH" "/api/v1/acme/zones/$_domain/rrsets" "[{\"changetype\": \"delete\", \"name\": \"$fulldomain.\", \"type\": \"TXT\"}]"; then
-      _err "Delete txt record error."
-      return 1
-    fi
-    _record_string=""
-    #If the only existing challenge was the challenge to delete: nothing to do
-    if ! [ "$_existing_challenges" = "$txtvalue" ]; then
-      for oldchallenge in $_existing_challenges; do
-        #Build up the challenges to re-add, ommitting the one what should be deleted
-        if ! [ "$oldchallenge" = "$txtvalue" ]; then
-          _build_record_string "$oldchallenge"
-        fi
-      done
-      #Recreate the existing challenges
-      if ! _rcode0_rest "PATCH" "/api/v1/acme/zones/$_domain/rrsets" "[{\"changetype\": \"update\", \"name\": \"$fulldomain.\", \"type\": \"TXT\", \"ttl\": $RCODE0_TTL, \"records\": [$_record_string]}]"; then
-        _err "Set txt record error."
-        return 1
-      fi
-    fi
-  else
-    _info "Record not found, nothing to remove"
-  fi
-
-  return 0
-}
-
-####################  Private functions below ##################################
-#_acme-challenge.www.domain.com
-#returns
-# _domain=domain.com
-_get_root() {
-  domain=$1
-  i=1
-
-  while true; do
-    h=$(printf "%s" "$domain" | cut -d . -f $i-100)
-
-    _debug "try to find: $h"
-    if _rcode0_rest "GET" "/api/v1/acme/zones/$h"; then
-      if [ "$response" = "[\"found\"]" ]; then
-        _domain="$h"
-        if [ -z "$h" ]; then
-          _domain="=2E"
-        fi
-        return 0
-      elif [ "$response" = "[\"not a master domain\"]" ]; then
-        return 1
-      fi
-    fi
-
-    if [ -z "$h" ]; then
-      return 1
-    fi
-    i=$(_math $i + 1)
-  done
-  _debug "no matching domain for $domain found"
-
-  return 1
-}
-
-_rcode0_rest() {
-  method=$1
-  ep=$2
-  data=$3
-
-  export _H1="Authorization: Bearer $RCODE0_API_TOKEN"
-
-  if [ ! "$method" = "GET" ]; then
-    _debug data "$data"
-    response="$(_post "$data" "$RCODE0_URL$ep" "" "$method")"
-  else
-    response="$(_get "$RCODE0_URL$ep")"
-  fi
-
-  if [ "$?" != "0" ]; then
-    _err "error $ep"
-    return 1
-  fi
-  _debug2 response "$response"
-
-  return 0
-}
-
-_build_record_string() {
-  _record_string="${_record_string:+${_record_string}, }{\"content\": \"\\\"${1}\\\"\", \"disabled\": false}"
-}
-
-_list_existingchallenges() {
-  _rcode0_rest "GET" "/api/v1/acme/zones/$_domain/rrsets"
-  _existing_challenges=$(echo "$response" | _normalizeJson | _egrep_o "\"name\":\"${fulldomain}[^]]*}" | _egrep_o 'content\":\"\\"[^\\]*' | sed -n 's/^content":"\\"//p')
-  _debug2 "$_existing_challenges"
-}
--- a/dnsapi/dns_unoeuro.sh
+++ b/dnsapi/dns_unoeuro.sh
@@ -52,7 +52,7 @@ dns_unoeuro_add() {
  fi
  _info "Adding record"

-  if _uno_rest POST "my/products/$h/dns/records" "{\"name\":\"$fulldomain\",\"type\":\"TXT\",\"data\":\"$txtvalue\",\"ttl\":120,\"priority\":0}"; then
+  if _uno_rest POST "my/products/$h/dns/records" "{\"name\":\"$fulldomain\",\"type\":\"TXT\",\"data\":\"$txtvalue\",\"ttl\":120}"; then
    if _contains "$response" "\"status\": 200" >/dev/null; then
      _info "Added, OK"
      return 0
--- a/dnsapi/dns_variomedia.sh
+++ b/dnsapi/dns_variomedia.sh
@@ -1,147 +0,0 @@
-#!/usr/bin/env sh
-
-#
-#VARIOMEDIA_API_TOKEN=000011112222333344445555666677778888
-
-VARIOMEDIA_API="https://api.variomedia.de"
-
-######## Public functions #####################
-
-#Usage: add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_variomedia_add() {
-  fulldomain=$1
-  txtvalue=$2
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  VARIOMEDIA_API_TOKEN="${VARIOMEDIA_API_TOKEN:-$(_readaccountconf_mutable VARIOMEDIA_API_TOKEN)}"
-  if test -z "$VARIOMEDIA_API_TOKEN"; then
-    VARIOMEDIA_API_TOKEN=""
-    _err 'VARIOMEDIA_API_TOKEN was not exported'
-    return 1
-  fi
-
-  _saveaccountconf_mutable VARIOMEDIA_API_TOKEN "$VARIOMEDIA_API_TOKEN"
-
-  _debug 'First detect the root zone'
-  if ! _get_root "$fulldomain"; then
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  if ! _variomedia_rest POST "dns-records" "{\"data\": {\"type\": \"dns-record\", \"attributes\": {\"record_type\": \"TXT\", \"name\": \"$_sub_domain\", \"domain\": \"$_domain\", \"data\": \"$txtvalue\", \"ttl\":300}}}"; then
-    _err "$response"
-    return 1
-  fi
-
-  _debug2 _response "$response"
-  return 0
-}
-
-#fulldomain txtvalue
-dns_variomedia_rm() {
-  fulldomain=$1
-  txtvalue=$2
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  VARIOMEDIA_API_TOKEN="${VARIOMEDIA_API_TOKEN:-$(_readaccountconf_mutable VARIOMEDIA_API_TOKEN)}"
-  if test -z "$VARIOMEDIA_API_TOKEN"; then
-    VARIOMEDIA_API_TOKEN=""
-    _err 'VARIOMEDIA_API_TOKEN was not exported'
-    return 1
-  fi
-
-  _saveaccountconf_mutable VARIOMEDIA_API_TOKEN "$VARIOMEDIA_API_TOKEN"
-
-  _debug 'First detect the root zone'
-  if ! _get_root "$fulldomain"; then
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _debug 'Getting txt records'
-
-  if ! _variomedia_rest GET "dns-records?filter[domain]=$_domain"; then
-    _err 'Error'
-    return 1
-  fi
-
-  _record_id="$(echo "$response" | cut -d '[' -f2 | cut -d']' -f1 | sed 's/},[ \t]*{/\},§\{/g' | tr § '\n' | grep "$_sub_domain" | grep "$txtvalue" | sed 's/^{//;s/}[,]?$//' | tr , '\n' | tr -d '\"' | grep ^id | cut -d : -f2 | tr -d ' ')"
-  _debug _record_id "$_record_id"
-  if [ "$_record_id" ]; then
-    _info "Successfully retrieved the record id for ACME challenge."
-  else
-    _info "Empty record id, it seems no such record."
-    return 0
-  fi
-
-  if ! _variomedia_rest DELETE "/dns-records/$_record_id"; then
-    _err "$response"
-    return 1
-  fi
-
-  _debug2 _response "$response"
-  return 0
-}
-
-#################### Private functions below ##################################
-#_acme-challenge.www.domain.com
-#returns
-# _sub_domain=_acme-challenge.www
-# _domain=domain.com
-_get_root() {
-  fulldomain=$1
-  i=1
-  while true; do
-    h=$(printf "%s" "$fulldomain" | cut -d . -f $i-100)
-    _debug h "$h"
-    if [ -z "$h" ]; then
-      return 1
-    fi
-
-    if ! _variomedia_rest GET "domains/$h"; then
-      return 1
-    fi
-
-    if _startswith "$response" "\{\"data\":"; then
-      if _contains "$response" "\"id\": \"$h\""; then
-        _sub_domain="$(echo "$fulldomain" | sed "s/\\.$h\$//")"
-        _domain=$h
-        return 0
-      fi
-    fi
-    i=$(_math "$i" + 1)
-  done
-
-  _debug "root domain not found"
-  return 1
-}
-
-_variomedia_rest() {
-  m=$1
-  ep="$2"
-  data="$3"
-  _debug "$ep"
-
-  export _H1="Authorization: token $VARIOMEDIA_API_TOKEN"
-  export _H2="Content-Type: application/vnd.api+json"
-  export _H3="Accept: application/vnd.variomedia.v1+json"
-
-  if [ "$m" != "GET" ]; then
-    _debug data "$data"
-    response="$(_post "$data" "$VARIOMEDIA_API/$ep" "" "$m")"
-  else
-    response="$(_get "$VARIOMEDIA_API/$ep")"
-  fi
-
-  if [ "$?" != "0" ]; then
-    _err "Error $ep"
-    return 1
-  fi
-
-  _debug2 response "$response"
-  return 0
-}
--- a/dnsapi/dns_vscale.sh
+++ b/dnsapi/dns_vscale.sh
@@ -102,7 +102,7 @@ _get_root() {
        return 1
      fi

-      hostedzone="$(echo "$response" | tr "{" "\n" | _egrep_o "\"name\":\s*\"$h\".*}")"
+      hostedzone="$(echo "$response" | _egrep_o "{.*\"name\":\s*\"$h\".*}")"
      if [ "$hostedzone" ]; then
        _domain_id=$(printf "%s\n" "$hostedzone" | _egrep_o "\"id\":\s*[0-9]+" | _head_n 1 | cut -d : -f 2 | tr -d \ )
        if [ "$_domain_id" ]; then
--- a/dnsapi/dns_vultr.sh
+++ b/dnsapi/dns_vultr.sh
@@ -1,161 +0,0 @@
-#!/usr/bin/env sh
-
-#
-#VULTR_API_KEY=000011112222333344445555666677778888
-
-VULTR_Api="https://api.vultr.com/v1"
-
-########  Public functions #####################
-
-#Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-dns_vultr_add() {
-  fulldomain=$1
-  txtvalue=$2
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  VULTR_API_KEY="${VULTR_API_KEY:-$(_readaccountconf_mutable VULTR_API_KEY)}"
-  if test -z "$VULTR_API_KEY"; then
-    VULTR_API_KEY=''
-    _err 'VULTR_API_KEY was not exported'
-    return 1
-  fi
-
-  _saveaccountconf_mutable VULTR_API_KEY "$VULTR_API_KEY"
-
-  _debug 'First detect the root zone'
-  if ! _get_root "$fulldomain"; then
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _debug 'Getting txt records'
-  _vultr_rest GET "dns/records?domain=$_domain"
-
-  if printf "%s\n" "$response" | grep "\"type\":\"TXT\",\"name\":\"$fulldomain\"" >/dev/null; then
-    _err 'Error'
-    return 1
-  fi
-
-  if ! _vultr_rest POST 'dns/create_record' "domain=$_domain&name=$_sub_domain&data=\"$txtvalue\"&type=TXT"; then
-    _err "$response"
-    return 1
-  fi
-
-  _debug2 _response "$response"
-  return 0
-}
-
-#fulldomain txtvalue
-dns_vultr_rm() {
-  fulldomain=$1
-  txtvalue=$2
-  _debug fulldomain "$fulldomain"
-  _debug txtvalue "$txtvalue"
-
-  VULTR_API_KEY="${VULTR_API_KEY:-$(_readaccountconf_mutable VULTR_API_KEY)}"
-  if test -z "$VULTR_API_KEY"; then
-    VULTR_API_KEY=""
-    _err 'VULTR_API_KEY was not exported'
-    return 1
-  fi
-
-  _saveaccountconf_mutable VULTR_API_KEY "$VULTR_API_KEY"
-
-  _debug 'First detect the root zone'
-  if ! _get_root "$fulldomain"; then
-    return 1
-  fi
-  _debug _sub_domain "$_sub_domain"
-  _debug _domain "$_domain"
-
-  _debug 'Getting txt records'
-  _vultr_rest GET "dns/records?domain=$_domain"
-
-  if printf "%s\n" "$response" | grep "\"type\":\"TXT\",\"name\":\"$fulldomain\"" >/dev/null; then
-    _err 'Error'
-    return 1
-  fi
-
-  _record_id="$(echo "$response" | tr '{}' '\n' | grep '"TXT"' | grep "$txtvalue" | tr ',' '\n' | grep -i 'RECORDID' | cut -d : -f 2)"
-  _debug _record_id "$_record_id"
-  if [ "$_record_id" ]; then
-    _info "Successfully retrieved the record id for ACME challenge."
-  else
-    _info "Empty record id, it seems no such record."
-    return 0
-  fi
-
-  if ! _vultr_rest POST 'dns/delete_record' "domain=$_domain&RECORDID=$_record_id"; then
-    _err "$response"
-    return 1
-  fi
-
-  _debug2 _response "$response"
-  return 0
-}
-
-####################  Private functions below ##################################
-#_acme-challenge.www.domain.com
-#returns
-# _sub_domain=_acme-challenge.www
-# _domain=domain.com
-# _domain_id=sdjkglgdfewsdfg
-_get_root() {
-  domain=$1
-  i=1
-  while true; do
-    _domain=$(printf "%s" "$domain" | cut -d . -f $i-100)
-    _debug h "$_domain"
-    if [ -z "$_domain" ]; then
-      return 1
-    fi
-
-    if ! _vultr_rest GET "dns/list"; then
-      return 1
-    fi
-
-    if printf "%s\n" "$response" | grep '^\[.*\]' >/dev/null; then
-      if _contains "$response" "\"domain\":\"$_domain\""; then
-        _sub_domain="$(echo "$fulldomain" | sed "s/\\.$_domain\$//")"
-        return 0
-      else
-        _debug "Go to next level of $_domain"
-      fi
-    else
-      _err "$response"
-      return 1
-    fi
-    i=$(_math "$i" + 1)
-  done
-
-  return 1
-}
-
-_vultr_rest() {
-  m=$1
-  ep="$2"
-  data="$3"
-  _debug "$ep"
-
-  api_key_trimmed=$(echo $VULTR_API_KEY | tr -d '"')
-
-  export _H1="Api-Key: $api_key_trimmed"
-  export _H2='Content-Type: application/x-www-form-urlencoded'
-
-  if [ "$m" != "GET" ]; then
-    _debug data "$data"
-    response="$(_post "$data" "$VULTR_Api/$ep" "" "$m")"
-  else
-    response="$(_get "$VULTR_Api/$ep")"
-  fi
-
-  if [ "$?" != "0" ]; then
-    _err "Error $ep"
-    return 1
-  fi
-
-  _debug2 response "$response"
-  return 0
-}
--- a/dnsapi/dns_zone.sh
+++ b/dnsapi/dns_zone.sh
@@ -136,10 +136,10 @@ _get_root() {
    if [ -z "$h" ]; then
      return 1
    fi
-    if ! _zone_rest GET "dns/$h"; then
+    if ! _zone_rest GET "dns/$h/a"; then
      return 1
    fi
-    if _contains "$response" "\"identificator\":\"$h\"" >/dev/null; then
+    if _contains "$response" "\"name\":\"$h\"" >/dev/null; then
      _domain=$h
      return 0
    fi
--- a/notify/dingtalk.sh
+++ b/notify/dingtalk.sh
@@ -1,68 +0,0 @@
-#!/usr/bin/env sh
-
-#Support dingtalk webhooks api
-
-#DINGTALK_WEBHOOK="xxxx"
-
-#optional
-#DINGTALK_KEYWORD="yyyy"
-
-#DINGTALK_SIGNING_KEY="SEC08ffdbd403cbc3fc8a65xxxxxxxxxxxxxxxxxxxx"
-
-# subject  content statusCode
-dingtalk_send() {
-  _subject="$1"
-  _content="$2"
-  _statusCode="$3" #0: success, 1: error 2($RENEW_SKIP): skipped
-  _debug "_subject" "$_subject"
-  _debug "_content" "$_content"
-  _debug "_statusCode" "$_statusCode"
-
-  DINGTALK_WEBHOOK="${DINGTALK_WEBHOOK:-$(_readaccountconf_mutable DINGTALK_WEBHOOK)}"
-  if [ -z "$DINGTALK_WEBHOOK" ]; then
-    DINGTALK_WEBHOOK=""
-    _err "You didn't specify a dingtalk webhooks DINGTALK_WEBHOOK yet."
-    _err "You can get yours from https://dingtalk.com"
-    return 1
-  fi
-  _saveaccountconf_mutable DINGTALK_WEBHOOK "$DINGTALK_WEBHOOK"
-
-  DINGTALK_KEYWORD="${DINGTALK_KEYWORD:-$(_readaccountconf_mutable DINGTALK_KEYWORD)}"
-  if [ "$DINGTALK_KEYWORD" ]; then
-    _saveaccountconf_mutable DINGTALK_KEYWORD "$DINGTALK_KEYWORD"
-  fi
-
-  #  DINGTALK_SIGNING_KEY="${DINGTALK_SIGNING_KEY:-$(_readaccountconf_mutable DINGTALK_SIGNING_KEY)}"
-  #  if [ -z "$DINGTALK_SIGNING_KEY" ]; then
-  #    DINGTALK_SIGNING_KEY="value1"
-  #    _info "The DINGTALK_SIGNING_KEY is not set, so use the default value1 as key."
-  #  elif ! _hasfield "$_IFTTT_AVAIL_MSG_KEYS" "$DINGTALK_SIGNING_KEY"; then
-  #    _err "The DINGTALK_SIGNING_KEY \"$DINGTALK_SIGNING_KEY\" is not available, should be one of $_IFTTT_AVAIL_MSG_KEYS"
-  #    DINGTALK_SIGNING_KEY=""
-  #    return 1
-  #  else
-  #    _saveaccountconf_mutable DINGTALK_SIGNING_KEY "$DINGTALK_SIGNING_KEY"
-  #  fi
-
-  #  if [ "$DINGTALK_SIGNING_KEY" = "$IFTTT_CONTENT_KEY" ]; then
-  #    DINGTALK_SIGNING_KEY=""
-  #    IFTTT_CONTENT_KEY=""
-  #    _err "The DINGTALK_SIGNING_KEY must not be same as IFTTT_CONTENT_KEY."
-  #    return 1
-  #  fi
-
-  _content=$(echo "$_content" | _json_encode)
-  _subject=$(echo "$_subject" | _json_encode)
-  _data="{\"msgtype\": \"text\", \"text\": {\"content\": \"[$DINGTALK_KEYWORD]\n$_subject\n$_content\"}}"
-
-  response="$(_post "$_data" "$DINGTALK_WEBHOOK" "" "POST" "application/json")"
-
-  if [ "$?" = "0" ] && _contains "$response" "errmsg\":\"ok"; then
-    _info "dingtalk webhooks event fired success."
-    return 0
-  fi
-
-  _err "dingtalk webhooks event fired error."
-  _err "$response"
-  return 1
-}
--- a/notify/ifttt.sh
+++ b/notify/ifttt.sh
@@ -1,86 +0,0 @@
-#!/usr/bin/env sh
-
-#Support ifttt.com webhooks api
-
-#IFTTT_API_KEY="xxxx"
-#IFTTT_EVENT_NAME="yyyy"
-
-#IFTTT_SUBJECT_KEY="value1|value2|value3"      #optional, use "value1" as default
-#IFTTT_CONTENT_KEY="value1|value2|value3"      #optional, use "value2" as default
-
-_IFTTT_AVAIL_MSG_KEYS="value1,value2,value3"
-
-# subject  content statusCode
-ifttt_send() {
-  _subject="$1"
-  _content="$2"
-  _statusCode="$3" #0: success, 1: error 2($RENEW_SKIP): skipped
-  _debug "_subject" "$_subject"
-  _debug "_content" "$_content"
-  _debug "_statusCode" "$_statusCode"
-
-  IFTTT_API_KEY="${IFTTT_API_KEY:-$(_readaccountconf_mutable IFTTT_API_KEY)}"
-  if [ -z "$IFTTT_API_KEY" ]; then
-    IFTTT_API_KEY=""
-    _err "You didn't specify a ifttt webhooks api key IFTTT_API_KEY yet."
-    _err "You can get yours from https://ifttt.com"
-    return 1
-  fi
-  _saveaccountconf_mutable IFTTT_API_KEY "$IFTTT_API_KEY"
-
-  IFTTT_EVENT_NAME="${IFTTT_EVENT_NAME:-$(_readaccountconf_mutable IFTTT_EVENT_NAME)}"
-  if [ -z "$IFTTT_EVENT_NAME" ]; then
-    IFTTT_EVENT_NAME=""
-    _err "You didn't specify a ifttt webhooks event name IFTTT_EVENT_NAME yet."
-    return 1
-  fi
-  _saveaccountconf_mutable IFTTT_EVENT_NAME "$IFTTT_EVENT_NAME"
-
-  IFTTT_SUBJECT_KEY="${IFTTT_SUBJECT_KEY:-$(_readaccountconf_mutable IFTTT_SUBJECT_KEY)}"
-  if [ -z "$IFTTT_SUBJECT_KEY" ]; then
-    IFTTT_SUBJECT_KEY="value1"
-    _info "The IFTTT_SUBJECT_KEY is not set, so use the default value1 as key."
-  elif ! _hasfield "$_IFTTT_AVAIL_MSG_KEYS" "$IFTTT_SUBJECT_KEY"; then
-    _err "The IFTTT_SUBJECT_KEY \"$IFTTT_SUBJECT_KEY\" is not available, should be one of $_IFTTT_AVAIL_MSG_KEYS"
-    IFTTT_SUBJECT_KEY=""
-    return 1
-  else
-    _saveaccountconf_mutable IFTTT_SUBJECT_KEY "$IFTTT_SUBJECT_KEY"
-  fi
-
-  IFTTT_CONTENT_KEY="${IFTTT_CONTENT_KEY:-$(_readaccountconf_mutable IFTTT_CONTENT_KEY)}"
-  if [ -z "$IFTTT_CONTENT_KEY" ]; then
-    IFTTT_CONTENT_KEY="value2"
-    _info "The IFTTT_CONTENT_KEY is not set, so use the default value2 as key."
-  elif ! _hasfield "$_IFTTT_AVAIL_MSG_KEYS" "$IFTTT_CONTENT_KEY"; then
-    _err "The IFTTT_CONTENT_KEY \"$IFTTT_CONTENT_KEY\" is not available, should be one of $_IFTTT_AVAIL_MSG_KEYS"
-    IFTTT_CONTENT_KEY=""
-    return 1
-  else
-    _saveaccountconf_mutable IFTTT_CONTENT_KEY "$IFTTT_CONTENT_KEY"
-  fi
-
-  if [ "$IFTTT_SUBJECT_KEY" = "$IFTTT_CONTENT_KEY" ]; then
-    IFTTT_SUBJECT_KEY=""
-    IFTTT_CONTENT_KEY=""
-    _err "The IFTTT_SUBJECT_KEY must not be same as IFTTT_CONTENT_KEY."
-    return 1
-  fi
-
-  IFTTT_API_URL="https://maker.ifttt.com/trigger/$IFTTT_EVENT_NAME/with/key/$IFTTT_API_KEY"
-
-  _content=$(echo "$_content" | _json_encode)
-  _subject=$(echo "$_subject" | _json_encode)
-  _data="{\"$IFTTT_SUBJECT_KEY\": \"$_subject\", \"$IFTTT_CONTENT_KEY\": \"$_content\"}"
-
-  response="$(_post "$_data" "$IFTTT_API_URL" "" "POST" "application/json")"
-
-  if [ "$?" = "0" ] && _contains "$response" "Congratulations"; then
-    _info "IFTTT webhooks event fired success."
-    return 0
-  fi
-
-  _err "IFTTT webhooks event fired error."
-  _err "$response"
-  return 1
-}
--- a/notify/mailgun.sh
+++ b/notify/mailgun.sh
@@ -7,7 +7,7 @@

 #MAILGUN_REGION="us|eu"          #optional, use "us" as default
 #MAILGUN_API_DOMAIN="xxxxxx.com"  #optional, use the default sandbox domain
-#MAILGUN_FROM="xxx@xxxxx.com"    #optional, use the default sandbox account
+#MAILGUN_FROM="xxx@xxxxx.com"    #optional, use the default sendbox account

 _MAILGUN_BASE_US="https://api.mailgun.net/v3"
 _MAILGUN_BASE_EU="https://api.eu.mailgun.net/v3"
--- a/notify/pushover.sh
+++ b/notify/pushover.sh
@@ -1,63 +0,0 @@
-#!/usr/bin/env sh
-
-#Support for pushover.net's api. Push notification platform for multiple platforms
-#PUSHOVER_TOKEN="" Required, pushover application token
-#PUSHOVER_USER="" Required, pushover userkey
-#PUSHOVER_DEVICE="" Optional, Specific device or devices by hostnames, joining multiples with a comma (such as device=iphone,nexus5)
-#PUSHOVER_PRIORITY="" Optional, Lowest Priority (-2), Low Priority (-1), Normal Priority (0), High Priority (1)
-
-PUSHOVER_URI="https://api.pushover.net/1/messages.json"
-
-pushover_send() {
-  _subject="$1"
-  _content="$2"
-  _statusCode="$3" #0: success, 1: error 2($RENEW_SKIP): skipped
-  _debug "_statusCode" "$_statusCode"
-
-  PUSHOVER_TOKEN="${PUSHOVER_TOKEN:-$(_readaccountconf_mutable PUSHOVER_TOKEN)}"
-  if [ -z "$PUSHOVER_TOKEN" ]; then
-    PUSHOVER_TOKEN=""
-    _err "You didn't specify a PushOver application token yet."
-    return 1
-  fi
-  _saveaccountconf_mutable PUSHOVER_TOKEN "$PUSHOVER_TOKEN"
-
-  PUSHOVER_USER="${PUSHOVER_USER:-$(_readaccountconf_mutable PUSHOVER_USER)}"
-  if [ -z "$PUSHOVER_USER" ]; then
-    PUSHOVER_USER=""
-    _err "You didn't specify a PushOver UserKey yet."
-    return 1
-  fi
-  _saveaccountconf_mutable PUSHOVER_USER "$PUSHOVER_USER"
-
-  PUSHOVER_DEVICE="${PUSHOVER_DEVICE:-$(_readaccountconf_mutable PUSHOVER_DEVICE)}"
-  if [ "$PUSHOVER_DEVICE" ]; then
-    _saveaccountconf_mutable PUSHOVER_DEVICE "$PUSHOVER_DEVICE"
-  fi
-
-  PUSHOVER_PRIORITY="${PUSHOVER_PRIORITY:-$(_readaccountconf_mutable PUSHOVER_PRIORITY)}"
-  if [ "$PUSHOVER_PRIORITY" ]; then
-    _saveaccountconf_mutable PUSHOVER_PRIORITY "$PUSHOVER_PRIORITY"
-  fi
-
-  PUSHOVER_SOUND="${PUSHOVER_SOUND:-$(_readaccountconf_mutable PUSHOVER_SOUND)}"
-  if [ "$PUSHOVER_SOUND" ]; then
-    _saveaccountconf_mutable PUSHOVER_SOUND "$PUSHOVER_SOUND"
-  fi
-
-  export _H1="Content-Type: application/json"
-  _content="$(printf "*%s*\n" "$_content" | _json_encode)"
-  _subject="$(printf "*%s*\n" "$_subject" | _json_encode)"
-  _data="{\"token\": \"$PUSHOVER_TOKEN\",\"user\": \"$PUSHOVER_USER\",\"title\": \"$_subject\",\"message\": \"$_content\",\"sound\": \"$PUSHOVER_SOUND\", \"device\": \"$PUSHOVER_DEVICE\", \"priority\": \"$PUSHOVER_PRIORITY\"}"
-
-  response="$(_post "$_data" "$PUSHOVER_URI")"
-
-  if [ "$?" = "0" ] && _contains "$response" "{\"status\":1"; then
-    _info "PUSHOVER send success."
-    return 0
-  fi
-
-  _err "PUSHOVER send error."
-  _err "$response"
-  return 1
-}
--- a/notify/sendgrid.sh
+++ b/notify/sendgrid.sh
@@ -42,13 +42,13 @@ sendgrid_send() {

  _content="$(echo "$_content" | _json_encode)"
  _data="{\"personalizations\": [{\"to\": [{\"email\": \"$SENDGRID_TO\"}]}],\"from\": {\"email\": \"$SENDGRID_FROM\"},\"subject\": \"$_subject\",\"content\": [{\"type\": \"text/plain\", \"value\": \"$_content\"}]}"
-  response="$(_post "$_data" "https://api.sendgrid.com/v3/mail/send")"
-
-  if [ "$?" = "0" ] && [ -z "$response" ]; then
-    _info "sendgrid send sccess."
-    return 0
+  response="" #just make shellcheck happy
+  if _post "$_data" "https://api.sendgrid.com/v3/mail/send"; then
+    if [ -z "$response" ]; then
+      _info "sendgrid send sccess."
+      return 0
+    fi
  fi
-
  _err "sendgrid send error."
  _err "$response"
  return 1
--- a/notify/xmpp.sh
+++ b/notify/xmpp.sh
@@ -1,90 +0,0 @@
-#!/usr/bin/env sh
-
-#Support xmpp via sendxmpp
-
-#XMPP_BIN="/usr/bin/sendxmpp"
-#XMPP_BIN_ARGS="-n -t --tls-ca-path=/etc/ssl/certs"
-#XMPP_TO="zzzz@example.com"
-
-xmpp_send() {
-  _subject="$1"
-  _content="$2"
-  _statusCode="$3" #0: success, 1: error 2($RENEW_SKIP): skipped
-  _debug "_subject" "$_subject"
-  _debug "_content" "$_content"
-  _debug "_statusCode" "$_statusCode"
-
-  XMPP_BIN="${XMPP_BIN:-$(_readaccountconf_mutable XMPP_BIN)}"
-  if [ -n "$XMPP_BIN" ] && ! _exists "$XMPP_BIN"; then
-    _err "It seems that the command $XMPP_BIN is not in path."
-    return 1
-  fi
-  _XMPP_BIN=$(_xmpp_bin)
-  if [ -n "$XMPP_BIN" ]; then
-    _saveaccountconf_mutable XMPP_BIN "$XMPP_BIN"
-  else
-    _clearaccountconf "XMPP_BIN"
-  fi
-
-  XMPP_BIN_ARGS="${XMPP_BIN_ARGS:-$(_readaccountconf_mutable XMPP_BIN_ARGS)}"
-  if [ -n "$XMPP_BIN_ARGS" ]; then
-    _saveaccountconf_mutable XMPP_BIN_ARGS "$XMPP_BIN_ARGS"
-  else
-    _clearaccountconf "XMPP_BIN_ARGS"
-  fi
-
-  XMPP_TO="${XMPP_TO:-$(_readaccountconf_mutable XMPP_TO)}"
-  if [ -n "$XMPP_TO" ]; then
-    if ! _xmpp_valid "$XMPP_TO"; then
-      _err "It seems that the XMPP_TO=$XMPP_TO is not a valid xmpp address."
-      return 1
-    fi
-
-    _saveaccountconf_mutable XMPP_TO "$XMPP_TO"
-  fi
-
-  result=$({ _xmpp_message | eval "$(_xmpp_cmnd)"; } 2>&1)
-
-  # shellcheck disable=SC2181
-  if [ $? -ne 0 ]; then
-    _debug "xmpp send error."
-    _err "$result"
-    return 1
-  fi
-
-  _debug "xmpp send success."
-  return 0
-}
-
-_xmpp_bin() {
-  if [ -n "$XMPP_BIN" ]; then
-    _XMPP_BIN="$XMPP_BIN"
-  elif _exists "sendxmpp"; then
-    _XMPP_BIN="sendxmpp"
-  else
-    _err "Please install sendxmpp first."
-    return 1
-  fi
-
-  echo "$_XMPP_BIN"
-}
-
-_xmpp_cmnd() {
-  case $(basename "$_XMPP_BIN") in
-    sendxmpp)
-      echo "'$_XMPP_BIN' '$XMPP_TO' $XMPP_BIN_ARGS"
-      ;;
-    *)
-      _err "Command $XMPP_BIN is not supported, use sendxmpp."
-      return 1
-      ;;
-  esac
-}
-
-_xmpp_message() {
-  echo "$_subject"
-}
-
-_xmpp_valid() {
-  _contains "$1" "@"
-}