From ae329385316511db8a4f377f3c630b2ba31e01d7 Mon Sep 17 00:00:00 2001
From: Felipe Braz <felipebraz@kinghost.com.br>
Date: Mon, 19 Mar 2018 12:17:47 -0300
Subject: [PATCH 01/18] added dnsapi/dns_kinghost.sh

---
 dnsapi/dns_kinghost.sh | 110 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 dnsapi/dns_kinghost.sh

diff --git a/dnsapi/dns_kinghost.sh b/dnsapi/dns_kinghost.sh
new file mode 100644
index 00000000..3697e4ae
--- /dev/null
+++ b/dnsapi/dns_kinghost.sh
@@ -0,0 +1,110 @@
+#!/usr/bin/env sh
+
+#KINGHOST_username="xxxx@sss.com"
+#KINGHOST_Password="sdfsdfsdfljlbjkljlkjsdfoiwje"
+
+KING_Api="https://api.kinghost.net/acme"
+
+# Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
+# Used to add txt record
+dns_kinghost_add() {
+    fulldomain=$1
+    txtvalue=$2
+
+    KINGHOST_username="${KINGHOST_username:-$(_readaccountconf_mutable KINGHOST_username)}"
+    KINGHOST_Password="${KINGHOST_Password:-$(_readaccountconf_mutable KINGHOST_Password)}"
+    if [ -z "$KINGHOST_username" ] || [ -z "$KINGHOST_Password" ]; then
+        KINGHOST_username=""
+        KINGHOST_Password=""
+        _err "You don't specify KingHost api password and email yet."
+        _err "Please create you key and try again."
+        return 1
+    fi
+    
+    #save the credentials to the account conf file.
+    _saveaccountconf_mutable KINGHOST_username  "$KINGHOST_username"
+    _saveaccountconf_mutable KINGHOST_Password  "$KINGHOST_Password"
+
+    _debug "Getting txt records"
+    _kinghost_rest GET "dns" "name=$fulldomain&content=$txtvalue"
+
+    #This API call returns "status":"ok" if dns record does not exists
+    #We are creating a new txt record here, so we expect the "ok" status
+    if ! printf "%s" "$response" | grep '"status":"ok"' >/dev/null; then
+        _err "Error"
+        _err "$response"
+        return 1
+    fi
+
+    _kinghost_rest POST "dns" "name=$fulldomain&content=$txtvalue"
+    if ! printf "%s" "$response" | grep '"status":"ok"' >/dev/null; then
+        _err "Error"
+        _err "$response"
+        return 1
+    fi
+
+    return 0;
+}
+
+# Usage: fulldomain txtvalue
+# Used to remove the txt record after validation
+dns_kinghost_rm() {
+    fulldomain=$1
+    txtvalue=$2
+
+    KINGHOST_Password="${KINGHOST_Password:-$(_readaccountconf_mutable KINGHOST_Password)}"
+    KINGHOST_username="${KINGHOST_username:-$(_readaccountconf_mutable KINGHOST_username)}"
+        if [ -z "$KINGHOST_Password" ] || [ -z "$KINGHOST_username" ]; then
+        KINGHOST_Password=""
+        KINGHOST_username=""
+        _err "You don't specify KingHost api key and email yet."
+        _err "Please create you key and try again."
+        return 1
+    fi
+
+    _debug "Getting txt records"
+    _kinghost_rest GET "dns" "name=$fulldomain&content=$txtvalue"
+
+    #This API call returns "status":"ok" if dns record does not exists
+    #We are removing a txt record here, so the record must exists
+    if printf "%s" "$response" | grep '"status":"ok"' >/dev/null; then
+        _err "Error"
+        _err "$response"
+        return 1
+    fi
+
+    _kinghost_rest DELETE "dns" "name=$fulldomain&content=$txtvalue"
+    if ! printf "%s" "$response" | grep '"status":"ok"' >/dev/null; then
+        _err "Error"
+        _err "$response"
+        return 1
+    fi
+
+    return 0;
+}
+
+
+####################  Private functions below ##################################
+_kinghost_rest() {
+  method=$1
+  uri="$2"
+  data="$3"
+  _debug "$uri"
+
+  export _H1="X-Auth-Email: $KINGHOST_username"
+  export _H2="X-Auth-Key: $KINGHOST_Password"
+
+  if [ "$method" != "GET" ]; then
+    _debug data "$data"
+    response="$(_post "$data" "$KING_Api/$uri.json" "" "$method")"
+  else
+    response="$(_get "$KING_Api/$uri.json?$data")"
+  fi
+
+  if [ "$?" != "0" ]; then
+    _err "error $uri"
+    return 1
+  fi
+  _debug2 response "$response"
+  return 0
+}

From 2ff6f4d3cfe9494f552fdd0fd72e418a75ece7e5 Mon Sep 17 00:00:00 2001
From: Felipe Braz <felipebraz@kinghost.com.br>
Date: Mon, 19 Mar 2018 12:26:54 -0300
Subject: [PATCH 02/18] updated docs for dns_kinghost api usage

---
 README.md        |  1 +
 dnsapi/README.md | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/README.md b/README.md
index 5471c573..0faea3ed 100644
--- a/README.md
+++ b/README.md
@@ -313,6 +313,7 @@ You don't have to do anything manually!
 1. zonomi.com DNS API
 1. DreamHost.com API
 1. DirectAdmin API
+1. KingHost (https://www.kinghost.com.br/)
 
 
 And: 
diff --git a/dnsapi/README.md b/dnsapi/README.md
index 8b4a8358..caae7cff 100644
--- a/dnsapi/README.md
+++ b/dnsapi/README.md
@@ -784,6 +784,17 @@ acme.sh --issue --dns dns_da -d example.com -d www.example.com
 
 The `DA_Api` and `DA_Api_Insecure` will be saved in `~/.acme.sh/account.conf` and will be reused when needed.
 
+## 42. Use KingHost DNS API
+
+API access must be enabled at https://painel.kinghost.com.br/painel.api.php
+
+```
+export KINGHOST_username="yourusername"
+export KINGHOST_Password="yourpassword"
+acme.sh --issue --dns dns_kinghost -d example.com -d *.example.com
+```
+
+The `KINGHOST_username` and `KINGHOST_Password` will be saved in `~/.acme.sh/account.conf` and will be reused when needed.
 
 # Use custom API
 

From 48bdfa23771393bfe62d858aacb1110ed1eb5639 Mon Sep 17 00:00:00 2001
From: Felipe Braz <felipebraz@kinghost.com.br>
Date: Mon, 19 Mar 2018 13:49:58 -0300
Subject: [PATCH 03/18] added doc header to dns_kinghost.sh

---
 dnsapi/dns_kinghost.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/dnsapi/dns_kinghost.sh b/dnsapi/dns_kinghost.sh
index 3697e4ae..5d3a4935 100644
--- a/dnsapi/dns_kinghost.sh
+++ b/dnsapi/dns_kinghost.sh
@@ -1,7 +1,16 @@
 #!/usr/bin/env sh
 
-#KINGHOST_username="xxxx@sss.com"
-#KINGHOST_Password="sdfsdfsdfljlbjkljlkjsdfoiwje"
+############################################################
+# KingHost API support                                     #
+# http://api.kinghost.net/doc/                             #
+#                                                          #
+# Author: Felipe Keller Braz <felipebraz@kinghost.com.br>  #
+# Report Bugs here: https://github.com/kinghost/acme.sh    #
+#                                                          #
+# Values to export:                                        #
+# export KINGHOST_username="email@provider.com"            #
+# export KINGHOST_Password="xxxxxxxxxx"                    #
+############################################################
 
 KING_Api="https://api.kinghost.net/acme"
 
@@ -83,7 +92,6 @@ dns_kinghost_rm() {
     return 0;
 }
 
-
 ####################  Private functions below ##################################
 _kinghost_rest() {
   method=$1

From 6787c81abe86a8339d917069f74e2601b4f878ff Mon Sep 17 00:00:00 2001
From: Felipe Braz <felipebraz@kinghost.com.br>
Date: Tue, 20 Mar 2018 09:58:10 -0300
Subject: [PATCH 04/18] renamed KINGHOST_username => KINGHOST_Username

---
 dnsapi/dns_kinghost.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dnsapi/dns_kinghost.sh b/dnsapi/dns_kinghost.sh
index 5d3a4935..fc436bbd 100644
--- a/dnsapi/dns_kinghost.sh
+++ b/dnsapi/dns_kinghost.sh
@@ -8,7 +8,7 @@
 # Report Bugs here: https://github.com/kinghost/acme.sh    #
 #                                                          #
 # Values to export:                                        #
-# export KINGHOST_username="email@provider.com"            #
+# export KINGHOST_Username="email@provider.com"            #
 # export KINGHOST_Password="xxxxxxxxxx"                    #
 ############################################################
 
@@ -20,10 +20,10 @@ dns_kinghost_add() {
     fulldomain=$1
     txtvalue=$2
 
-    KINGHOST_username="${KINGHOST_username:-$(_readaccountconf_mutable KINGHOST_username)}"
+    KINGHOST_Username="${KINGHOST_Username:-$(_readaccountconf_mutable KINGHOST_Username)}"
     KINGHOST_Password="${KINGHOST_Password:-$(_readaccountconf_mutable KINGHOST_Password)}"
-    if [ -z "$KINGHOST_username" ] || [ -z "$KINGHOST_Password" ]; then
-        KINGHOST_username=""
+    if [ -z "$KINGHOST_Username" ] || [ -z "$KINGHOST_Password" ]; then
+        KINGHOST_Username=""
         KINGHOST_Password=""
         _err "You don't specify KingHost api password and email yet."
         _err "Please create you key and try again."
@@ -31,7 +31,7 @@ dns_kinghost_add() {
     fi
     
     #save the credentials to the account conf file.
-    _saveaccountconf_mutable KINGHOST_username  "$KINGHOST_username"
+    _saveaccountconf_mutable KINGHOST_Username  "$KINGHOST_Username"
     _saveaccountconf_mutable KINGHOST_Password  "$KINGHOST_Password"
 
     _debug "Getting txt records"
@@ -62,10 +62,10 @@ dns_kinghost_rm() {
     txtvalue=$2
 
     KINGHOST_Password="${KINGHOST_Password:-$(_readaccountconf_mutable KINGHOST_Password)}"
-    KINGHOST_username="${KINGHOST_username:-$(_readaccountconf_mutable KINGHOST_username)}"
-        if [ -z "$KINGHOST_Password" ] || [ -z "$KINGHOST_username" ]; then
+    KINGHOST_Username="${KINGHOST_Username:-$(_readaccountconf_mutable KINGHOST_Username)}"
+        if [ -z "$KINGHOST_Password" ] || [ -z "$KINGHOST_Username" ]; then
         KINGHOST_Password=""
-        KINGHOST_username=""
+        KINGHOST_Username=""
         _err "You don't specify KingHost api key and email yet."
         _err "Please create you key and try again."
         return 1
@@ -99,7 +99,7 @@ _kinghost_rest() {
   data="$3"
   _debug "$uri"
 
-  export _H1="X-Auth-Email: $KINGHOST_username"
+  export _H1="X-Auth-Email: $KINGHOST_Username"
   export _H2="X-Auth-Key: $KINGHOST_Password"
 
   if [ "$method" != "GET" ]; then

From aa9975ad0d03d08a7cd7beaad60b4ff29adc3277 Mon Sep 17 00:00:00 2001
From: Felipe Braz <felipebraz@kinghost.com.br>
Date: Tue, 20 Mar 2018 10:08:52 -0300
Subject: [PATCH 05/18] dns_kinghost.sh :: changed printf to echo

---
 dnsapi/dns_kinghost.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dnsapi/dns_kinghost.sh b/dnsapi/dns_kinghost.sh
index fc436bbd..2dc57cb8 100644
--- a/dnsapi/dns_kinghost.sh
+++ b/dnsapi/dns_kinghost.sh
@@ -39,14 +39,14 @@ dns_kinghost_add() {
 
     #This API call returns "status":"ok" if dns record does not exists
     #We are creating a new txt record here, so we expect the "ok" status
-    if ! printf "%s" "$response" | grep '"status":"ok"' >/dev/null; then
+    if ! echo "$response" | grep '"status":"ok"' >/dev/null; then
         _err "Error"
         _err "$response"
         return 1
     fi
 
     _kinghost_rest POST "dns" "name=$fulldomain&content=$txtvalue"
-    if ! printf "%s" "$response" | grep '"status":"ok"' >/dev/null; then
+    if ! echo "$response" | grep '"status":"ok"' >/dev/null; then
         _err "Error"
         _err "$response"
         return 1
@@ -76,14 +76,14 @@ dns_kinghost_rm() {
 
     #This API call returns "status":"ok" if dns record does not exists
     #We are removing a txt record here, so the record must exists
-    if printf "%s" "$response" | grep '"status":"ok"' >/dev/null; then
+    if echo "$response" | grep '"status":"ok"' >/dev/null; then
         _err "Error"
         _err "$response"
         return 1
     fi
 
     _kinghost_rest DELETE "dns" "name=$fulldomain&content=$txtvalue"
-    if ! printf "%s" "$response" | grep '"status":"ok"' >/dev/null; then
+    if ! echo "$response" | grep '"status":"ok"' >/dev/null; then
         _err "Error"
         _err "$response"
         return 1

From 9c88971bc14314f061f17e71b292027586d0b63e Mon Sep 17 00:00:00 2001
From: James Gibson <iam@jamesgibson.co>
Date: Thu, 22 Mar 2018 23:09:38 -0600
Subject: [PATCH 06/18] Use internal base64 util instead of PATH bin/

---
 dnsapi/dns_namecom.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dnsapi/dns_namecom.sh b/dnsapi/dns_namecom.sh
index b712fa94..254952d6 100755
--- a/dnsapi/dns_namecom.sh
+++ b/dnsapi/dns_namecom.sh
@@ -123,7 +123,7 @@ _namecom_login() {
   # Auth string
   # Name.com API v4 uses http basic auth to authenticate
   # need to convert the token for http auth
-  _namecom_auth=$(printf "%s:%s" "$Namecom_Username" "$Namecom_Token" | base64)
+  _namecom_auth=$(printf "%s:%s" "$Namecom_Username" "$Namecom_Token" | _base64)
 
   if _namecom_rest GET "hello"; then
     retcode=$(printf "%s\n" "$response" | _egrep_o "\"username\"\:\"$Namecom_Username\"")

From fe843bc466b3d3267ac0b1866bf3e3365663c505 Mon Sep 17 00:00:00 2001
From: martgras <martin@grasruck.net>
Date: Sun, 25 Mar 2018 14:32:51 +0200
Subject: [PATCH 07/18] dns_he - proposed fix for #1438

if you have more than one zone of a domain (e.g.  example.com and subdomain.example.com) _find_zone fails.
This fix removes partials matches.
---
 dnsapi/dns_he.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dnsapi/dns_he.sh b/dnsapi/dns_he.sh
index f42d56af..d196fbec 100755
--- a/dnsapi/dns_he.sh
+++ b/dnsapi/dns_he.sh
@@ -143,7 +143,7 @@ _find_zone() {
 
     _debug "Looking for zone \"${_attempted_zone}\""
 
-    line_num="$(echo "$_zone_names" | grep -n "$_attempted_zone" | cut -d : -f 1)"
+    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")

From 7588fc0989dcfb5f99da70a3ad70621b54cef533 Mon Sep 17 00:00:00 2001
From: Chris <chga@multinet.se>
Date: Mon, 26 Mar 2018 09:32:41 +0200
Subject: [PATCH 08/18] Fixes DNSimple for Wildcard certificates

---
 dnsapi/dns_dnsimple.sh | 49 +++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/dnsapi/dns_dnsimple.sh b/dnsapi/dns_dnsimple.sh
index 0bfe2b99..0a5b79bb 100644
--- a/dnsapi/dns_dnsimple.sh
+++ b/dnsapi/dns_dnsimple.sh
@@ -39,7 +39,7 @@ dns_dnsimple_add() {
 
   _get_records "$_account_id" "$_domain" "$_sub_domain"
 
-  if [ "$_records_count" = "0" ]; then
+# if [ "$_records_count" = "0" ]; then
     _info "Adding record"
     if _dnsimple_rest POST "$_account_id/zones/$_domain/records" "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"content\":\"$txtvalue\",\"ttl\":120}"; then
       if printf -- "%s" "$response" | grep "\"name\":\"$_sub_domain\"" >/dev/null; then
@@ -51,22 +51,22 @@ dns_dnsimple_add() {
       fi
     fi
     _err "Add txt record error."
-  else
-    _info "Updating record"
-    _extract_record_id "$_records" "$_sub_domain"
+# else
+#   _info "Updating record"
+#   _extract_record_id "$_records" "$_sub_domain"
 
-    if _dnsimple_rest \
-      PATCH \
-      "$_account_id/zones/$_domain/records/$_record_id" \
-      "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"content\":\"$txtvalue\",\"ttl\":120}"; then
+#   if _dnsimple_rest \
+#     PATCH \
+#     "$_account_id/zones/$_domain/records/$_record_id" \
+#     "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"content\":\"$txtvalue\",\"ttl\":120}"; then
 
-      _info "Updated!"
-      return 0
-    fi
+#     _info "Updated!"
+#     return 0
+#   fi
 
-    _err "Update error"
-    return 1
-  fi
+#   _err "Update error"
+#   return 1
+# fi
 }
 
 # fulldomain
@@ -84,19 +84,20 @@ dns_dnsimple_rm() {
   fi
 
   _get_records "$_account_id" "$_domain" "$_sub_domain"
+
   _extract_record_id "$_records" "$_sub_domain"
-
   if [ "$_record_id" ]; then
-
-    if _dnsimple_rest DELETE "$_account_id/zones/$_domain/records/$_record_id"; then
-      _info "removed record" "$_record_id"
-      return 0
-    fi
+    echo "$_record_id" | while read -r item
+    do
+      if _dnsimple_rest DELETE "$_account_id/zones/$_domain/records/$item"; then
+        _info "removed record" "$item"
+        return 0
+      else
+        _err "failed to remove record" "$item"
+        return 1
+      fi
+    done
   fi
-
-  _err "failed to remove record" "$_record_id"
-  return 1
-
 }
 
 ####################  Private functions bellow ##################################

From 30283282d2f99afcfd39c45e4b3cdbaa0fef4035 Mon Sep 17 00:00:00 2001
From: Chris <chga@multinet.se>
Date: Mon, 26 Mar 2018 09:40:33 +0200
Subject: [PATCH 09/18] Fixing code style according to Travis

---
 dnsapi/dns_dnsimple.sh | 40 +++++++++++-----------------------------
 1 file changed, 11 insertions(+), 29 deletions(-)

diff --git a/dnsapi/dns_dnsimple.sh b/dnsapi/dns_dnsimple.sh
index 0a5b79bb..0dd3918a 100644
--- a/dnsapi/dns_dnsimple.sh
+++ b/dnsapi/dns_dnsimple.sh
@@ -39,34 +39,17 @@ dns_dnsimple_add() {
 
   _get_records "$_account_id" "$_domain" "$_sub_domain"
 
-# if [ "$_records_count" = "0" ]; then
-    _info "Adding record"
-    if _dnsimple_rest POST "$_account_id/zones/$_domain/records" "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"content\":\"$txtvalue\",\"ttl\":120}"; then
-      if printf -- "%s" "$response" | grep "\"name\":\"$_sub_domain\"" >/dev/null; then
-        _info "Added"
-        return 0
-      else
-        _err "Unexpected response while adding text record."
-        return 1
-      fi
+  _info "Adding record"
+  if _dnsimple_rest POST "$_account_id/zones/$_domain/records" "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"content\":\"$txtvalue\",\"ttl\":120}"; then
+    if printf -- "%s" "$response" | grep "\"name\":\"$_sub_domain\"" >/dev/null; then
+      _info "Added"
+      return 0
+    else
+      _err "Unexpected response while adding text record."
+      return 1
     fi
-    _err "Add txt record error."
-# else
-#   _info "Updating record"
-#   _extract_record_id "$_records" "$_sub_domain"
-
-#   if _dnsimple_rest \
-#     PATCH \
-#     "$_account_id/zones/$_domain/records/$_record_id" \
-#     "{\"type\":\"TXT\",\"name\":\"$_sub_domain\",\"content\":\"$txtvalue\",\"ttl\":120}"; then
-
-#     _info "Updated!"
-#     return 0
-#   fi
-
-#   _err "Update error"
-#   return 1
-# fi
+  fi
+  _err "Add txt record error."
 }
 
 # fulldomain
@@ -87,8 +70,7 @@ dns_dnsimple_rm() {
 
   _extract_record_id "$_records" "$_sub_domain"
   if [ "$_record_id" ]; then
-    echo "$_record_id" | while read -r item
-    do
+    echo "$_record_id" | while read -r item; do
       if _dnsimple_rest DELETE "$_account_id/zones/$_domain/records/$item"; then
         _info "removed record" "$item"
         return 0

From 4d2a0697edfbded749df960e0cbb8a770794bcfc Mon Sep 17 00:00:00 2001
From: Felipe Braz <felipebraz@kinghost.com.br>
Date: Mon, 26 Mar 2018 10:49:34 -0300
Subject: [PATCH 10/18] fix identation dnsapi/dns_kinghost.sh

---
 .gitignore             |   2 +
 dnsapi/dns_kinghost.sh | 116 ++++++++++++++++++++---------------------
 2 files changed, 60 insertions(+), 58 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..a13ea469
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.idea
+ae.sh
diff --git a/dnsapi/dns_kinghost.sh b/dnsapi/dns_kinghost.sh
index 2dc57cb8..ddf9f899 100644
--- a/dnsapi/dns_kinghost.sh
+++ b/dnsapi/dns_kinghost.sh
@@ -17,79 +17,79 @@ KING_Api="https://api.kinghost.net/acme"
 # Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
 # Used to add txt record
 dns_kinghost_add() {
-    fulldomain=$1
-    txtvalue=$2
+  fulldomain=$1
+  txtvalue=$2
 
-    KINGHOST_Username="${KINGHOST_Username:-$(_readaccountconf_mutable KINGHOST_Username)}"
-    KINGHOST_Password="${KINGHOST_Password:-$(_readaccountconf_mutable KINGHOST_Password)}"
-    if [ -z "$KINGHOST_Username" ] || [ -z "$KINGHOST_Password" ]; then
-        KINGHOST_Username=""
-        KINGHOST_Password=""
-        _err "You don't specify KingHost api password and email yet."
-        _err "Please create you key and try again."
-        return 1
-    fi
-    
-    #save the credentials to the account conf file.
-    _saveaccountconf_mutable KINGHOST_Username  "$KINGHOST_Username"
-    _saveaccountconf_mutable KINGHOST_Password  "$KINGHOST_Password"
+  KINGHOST_Username="${KINGHOST_Username:-$(_readaccountconf_mutable KINGHOST_Username)}"
+  KINGHOST_Password="${KINGHOST_Password:-$(_readaccountconf_mutable KINGHOST_Password)}"
+  if [ -z "$KINGHOST_Username" ] || [ -z "$KINGHOST_Password" ]; then
+    KINGHOST_Username=""
+    KINGHOST_Password=""
+    _err "You don't specify KingHost api password and email yet."
+    _err "Please create you key and try again."
+    return 1
+  fi
 
-    _debug "Getting txt records"
-    _kinghost_rest GET "dns" "name=$fulldomain&content=$txtvalue"
+  #save the credentials to the account conf file.
+  _saveaccountconf_mutable KINGHOST_Username  "$KINGHOST_Username"
+  _saveaccountconf_mutable KINGHOST_Password  "$KINGHOST_Password"
 
-    #This API call returns "status":"ok" if dns record does not exists
-    #We are creating a new txt record here, so we expect the "ok" status
-    if ! echo "$response" | grep '"status":"ok"' >/dev/null; then
-        _err "Error"
-        _err "$response"
-        return 1
-    fi
+  _debug "Getting txt records"
+  _kinghost_rest GET "dns" "name=$fulldomain&content=$txtvalue"
 
-    _kinghost_rest POST "dns" "name=$fulldomain&content=$txtvalue"
-    if ! echo "$response" | grep '"status":"ok"' >/dev/null; then
-        _err "Error"
-        _err "$response"
-        return 1
-    fi
+  #This API call returns "status":"ok" if dns record does not exists
+  #We are creating a new txt record here, so we expect the "ok" status
+  if ! echo "$response" | grep '"status":"ok"' >/dev/null; then
+    _err "Error"
+    _err "$response"
+    return 1
+  fi
 
-    return 0;
+  _kinghost_rest POST "dns" "name=$fulldomain&content=$txtvalue"
+  if ! echo "$response" | grep '"status":"ok"' >/dev/null; then
+    _err "Error"
+    _err "$response"
+    return 1
+  fi
+
+  return 0;
 }
 
 # Usage: fulldomain txtvalue
 # Used to remove the txt record after validation
 dns_kinghost_rm() {
-    fulldomain=$1
-    txtvalue=$2
+  fulldomain=$1
+  txtvalue=$2
 
-    KINGHOST_Password="${KINGHOST_Password:-$(_readaccountconf_mutable KINGHOST_Password)}"
-    KINGHOST_Username="${KINGHOST_Username:-$(_readaccountconf_mutable KINGHOST_Username)}"
-        if [ -z "$KINGHOST_Password" ] || [ -z "$KINGHOST_Username" ]; then
-        KINGHOST_Password=""
-        KINGHOST_Username=""
-        _err "You don't specify KingHost api key and email yet."
-        _err "Please create you key and try again."
-        return 1
-    fi
+  KINGHOST_Password="${KINGHOST_Password:-$(_readaccountconf_mutable KINGHOST_Password)}"
+  KINGHOST_Username="${KINGHOST_Username:-$(_readaccountconf_mutable KINGHOST_Username)}"
+    if [ -z "$KINGHOST_Password" ] || [ -z "$KINGHOST_Username" ]; then
+    KINGHOST_Password=""
+    KINGHOST_Username=""
+    _err "You don't specify KingHost api key and email yet."
+    _err "Please create you key and try again."
+    return 1
+  fi
 
-    _debug "Getting txt records"
-    _kinghost_rest GET "dns" "name=$fulldomain&content=$txtvalue"
+  _debug "Getting txt records"
+  _kinghost_rest GET "dns" "name=$fulldomain&content=$txtvalue"
 
-    #This API call returns "status":"ok" if dns record does not exists
-    #We are removing a txt record here, so the record must exists
-    if echo "$response" | grep '"status":"ok"' >/dev/null; then
-        _err "Error"
-        _err "$response"
-        return 1
-    fi
+  #This API call returns "status":"ok" if dns record does not exists
+  #We are removing a txt record here, so the record must exists
+  if echo "$response" | grep '"status":"ok"' >/dev/null; then
+    _err "Error"
+    _err "$response"
+    return 1
+  fi
 
-    _kinghost_rest DELETE "dns" "name=$fulldomain&content=$txtvalue"
-    if ! echo "$response" | grep '"status":"ok"' >/dev/null; then
-        _err "Error"
-        _err "$response"
-        return 1
-    fi
+  _kinghost_rest DELETE "dns" "name=$fulldomain&content=$txtvalue"
+  if ! echo "$response" | grep '"status":"ok"' >/dev/null; then
+    _err "Error"
+    _err "$response"
+    return 1
+  fi
 
-    return 0;
+  return 0;
 }
 
 ####################  Private functions below ##################################

From 7efa54666559b797d38a676f3d8ac9d1a7e61b09 Mon Sep 17 00:00:00 2001
From: Felipe Braz <felipebraz@kinghost.com.br>
Date: Mon, 26 Mar 2018 10:58:22 -0300
Subject: [PATCH 11/18] removed local .gitignore file

---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index a13ea469..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.idea
-ae.sh

From e8fd373e6c68a7044a90b82690b917c1b9ce530e Mon Sep 17 00:00:00 2001
From: Felipe Braz <felipebraz@kinghost.com.br>
Date: Mon, 26 Mar 2018 10:58:56 -0300
Subject: [PATCH 12/18] removed blank space at ending of dnsapi/dns_kinghost.sh

---
 dnsapi/dns_kinghost.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dnsapi/dns_kinghost.sh b/dnsapi/dns_kinghost.sh
index ddf9f899..d3a8fb3a 100644
--- a/dnsapi/dns_kinghost.sh
+++ b/dnsapi/dns_kinghost.sh
@@ -115,4 +115,4 @@ _kinghost_rest() {
   fi
   _debug2 response "$response"
   return 0
-}
+}
\ No newline at end of file

From 86ef6e6987d6f8413f0f9184d008a6a5ea7e62b5 Mon Sep 17 00:00:00 2001
From: Felipe Braz <felipebraz@kinghost.com.br>
Date: Mon, 26 Mar 2018 11:21:12 -0300
Subject: [PATCH 13/18] fixes on dnsapi/dns_kinghost.sh and dnsapi/README.md

---
 dnsapi/README.md       |  2 +-
 dnsapi/dns_kinghost.sh | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dnsapi/README.md b/dnsapi/README.md
index f99671e0..e459094e 100644
--- a/dnsapi/README.md
+++ b/dnsapi/README.md
@@ -792,7 +792,7 @@ The `DA_Api` and `DA_Api_Insecure` will be saved in `~/.acme.sh/account.conf` an
 API access must be enabled at https://painel.kinghost.com.br/painel.api.php
 
 ```
-export KINGHOST_username="yourusername"
+export KINGHOST_Username="yourusername"
 export KINGHOST_Password="yourpassword"
 acme.sh --issue --dns dns_kinghost -d example.com -d *.example.com
 ```
diff --git a/dnsapi/dns_kinghost.sh b/dnsapi/dns_kinghost.sh
index d3a8fb3a..7c0d159b 100644
--- a/dnsapi/dns_kinghost.sh
+++ b/dnsapi/dns_kinghost.sh
@@ -31,8 +31,8 @@ dns_kinghost_add() {
   fi
 
   #save the credentials to the account conf file.
-  _saveaccountconf_mutable KINGHOST_Username  "$KINGHOST_Username"
-  _saveaccountconf_mutable KINGHOST_Password  "$KINGHOST_Password"
+ _saveaccountconf_mutable KINGHOST_Username  "$KINGHOST_Username"
+ _saveaccountconf_mutable KINGHOST_Password  "$KINGHOST_Password"
 
   _debug "Getting txt records"
   _kinghost_rest GET "dns" "name=$fulldomain&content=$txtvalue"
@@ -52,7 +52,7 @@ dns_kinghost_add() {
     return 1
   fi
 
-  return 0;
+  return 0
 }
 
 # Usage: fulldomain txtvalue
@@ -63,7 +63,7 @@ dns_kinghost_rm() {
 
   KINGHOST_Password="${KINGHOST_Password:-$(_readaccountconf_mutable KINGHOST_Password)}"
   KINGHOST_Username="${KINGHOST_Username:-$(_readaccountconf_mutable KINGHOST_Username)}"
-    if [ -z "$KINGHOST_Password" ] || [ -z "$KINGHOST_Username" ]; then
+  if [ -z "$KINGHOST_Password" ] || [ -z "$KINGHOST_Username" ]; then
     KINGHOST_Password=""
     KINGHOST_Username=""
     _err "You don't specify KingHost api key and email yet."
@@ -89,7 +89,7 @@ dns_kinghost_rm() {
     return 1
   fi
 
-  return 0;
+  return 0
 }
 
 ####################  Private functions below ##################################
@@ -115,4 +115,4 @@ _kinghost_rest() {
   fi
   _debug2 response "$response"
   return 0
-}
\ No newline at end of file
+}

From f8fb0e67b458821a913e981111b26196001e3a61 Mon Sep 17 00:00:00 2001
From: Felipe Braz <felipebraz@kinghost.com.br>
Date: Mon, 26 Mar 2018 12:17:10 -0300
Subject: [PATCH 14/18] fix dnsapi/dns_kinghost.sh with shfmt utility

---
 dnsapi/dns_kinghost.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dnsapi/dns_kinghost.sh b/dnsapi/dns_kinghost.sh
index 7c0d159b..2ac8e6df 100644
--- a/dnsapi/dns_kinghost.sh
+++ b/dnsapi/dns_kinghost.sh
@@ -31,8 +31,8 @@ dns_kinghost_add() {
   fi
 
   #save the credentials to the account conf file.
- _saveaccountconf_mutable KINGHOST_Username  "$KINGHOST_Username"
- _saveaccountconf_mutable KINGHOST_Password  "$KINGHOST_Password"
+  _saveaccountconf_mutable KINGHOST_Username "$KINGHOST_Username"
+  _saveaccountconf_mutable KINGHOST_Password "$KINGHOST_Password"
 
   _debug "Getting txt records"
   _kinghost_rest GET "dns" "name=$fulldomain&content=$txtvalue"

From 37bc099d393f661bce904097be027e4ccef87a9a Mon Sep 17 00:00:00 2001
From: Felipe Braz <felipebraz@kinghost.com.br>
Date: Mon, 26 Mar 2018 14:27:21 -0300
Subject: [PATCH 15/18] removed redundant api call

---
 dnsapi/dns_infraws.sh | 102 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 dnsapi/dns_infraws.sh

diff --git a/dnsapi/dns_infraws.sh b/dnsapi/dns_infraws.sh
new file mode 100644
index 00000000..30abcbfb
--- /dev/null
+++ b/dnsapi/dns_infraws.sh
@@ -0,0 +1,102 @@
+#!/usr/bin/env sh
+
+############################################################
+# Plugin para criação automática da entrada de DNS txt     #
+# Uso com o sistema acme.sh                                #
+#                                                          #
+# Author: Felipe Keller Braz <felipebraz@kinghost.com.br>  #
+# Report Bugs here: infra_interno@kinghost.com.br          #
+#                                                          #
+# Values to export:                                        #
+# export INFRAWS_Hash="PASSWORD"                           #
+############################################################
+
+INFRAWS_Api="http://infra-ws.kinghost.net/serverbackend/acme"
+
+# Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
+# Used to add txt record
+dns_infraws_add() {
+  fulldomain=$1
+  txtvalue=$2
+
+  INFRAWS_Hash="${INFRAWS_Hash:-$(_readaccountconf_mutable INFRAWS_Hash)}"
+
+  if [ -z "$INFRAWS_Hash" ]; then
+    INFRAWS_Hash=""
+    _err "You don't specify KingHost api password and email yet."
+    _err "Please create you key and try again."
+    return 1
+  fi
+
+  #save the credentials to the account conf file.
+  _saveaccountconf_mutable INFRAWS_Hash "$INFRAWS_Hash"
+
+  _debug "Getting txt records"
+  infraws_rest GET "dns" "name=$fulldomain&content=$txtvalue"
+
+  #This API call returns "status":"ok" if dns record does not exists
+  #We are creating a new txt record here, so we expect the "ok" status
+  if ! echo "$response" | grep '"status":"ok"' >/dev/null; then
+    _err "Error"
+    _err "$response"
+    return 1
+  fi
+
+  infraws_rest POST "dns" "name=$fulldomain&content=$txtvalue"
+  if ! echo "$response" | grep '"status":"ok"' >/dev/null; then
+    _err "Error"
+    _err "$response"
+    return 1
+  fi
+
+  return 0
+}
+
+# Usage: fulldomain txtvalue
+# Used to remove the txt record after validation
+dns_infraws_rm() {
+  fulldomain=$1
+  txtvalue=$2
+
+  INFRAWS_Hash="${INFRAWS_Hash:-$(_readaccountconf_mutable INFRAWS_Hash)}"
+  if [ -z "$INFRAWS_Hash" ]; then
+    INFRAWS_Hash=""
+    _err "You don't specify KingHost api key and email yet."
+    _err "Please create you key and try again."
+    return 1
+  fi
+
+  _debug "Getting txt records"
+  infraws_rest GET "dns" "name=$fulldomain&content=$txtvalue"
+
+  infraws_rest DELETE "dns" "name=$fulldomain&content=$txtvalue"
+  if ! echo "$response" | grep '"status":"ok"' >/dev/null; then
+    _err "Error"
+    _err "$response"
+    return 1
+  fi
+
+  return 0
+}
+
+####################  Private functions below ##################################
+infraws_rest() {
+  method=$1
+  uri="$2"
+  data="$3"
+  _debug "$uri"
+
+  if [ "$method" != "GET" ]; then
+    _debug data "$data"
+    response="$(_post "$data" "$INFRAWS_Api/hash/$INFRAWS_Hash/" "" "$method")"
+  else
+    response="$(_get "$INFRAWS_Api/hash/$INFRAWS_Hash/?$data")"
+  fi
+
+  if [ "$?" != "0" ]; then
+    _err "error $uri"
+    return 1
+  fi
+  _debug2 response "$response"
+  return 0
+}

From 2d1d512d0f968f0bdbca36aafdd043ec427a7bed Mon Sep 17 00:00:00 2001
From: Felipe Braz <felipebraz@kinghost.com.br>
Date: Mon, 26 Mar 2018 14:28:52 -0300
Subject: [PATCH 16/18] removed redundant api call

---
 dnsapi/dns_kinghost.sh | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/dnsapi/dns_kinghost.sh b/dnsapi/dns_kinghost.sh
index 2ac8e6df..898ab286 100644
--- a/dnsapi/dns_kinghost.sh
+++ b/dnsapi/dns_kinghost.sh
@@ -71,17 +71,6 @@ dns_kinghost_rm() {
     return 1
   fi
 
-  _debug "Getting txt records"
-  _kinghost_rest GET "dns" "name=$fulldomain&content=$txtvalue"
-
-  #This API call returns "status":"ok" if dns record does not exists
-  #We are removing a txt record here, so the record must exists
-  if echo "$response" | grep '"status":"ok"' >/dev/null; then
-    _err "Error"
-    _err "$response"
-    return 1
-  fi
-
   _kinghost_rest DELETE "dns" "name=$fulldomain&content=$txtvalue"
   if ! echo "$response" | grep '"status":"ok"' >/dev/null; then
     _err "Error"

From 986f61ac92bcb38b95d7eaff3612d8fb1ec6a5eb Mon Sep 17 00:00:00 2001
From: Felipe Braz <felipebraz@kinghost.com.br>
Date: Wed, 28 Mar 2018 10:18:43 -0300
Subject: [PATCH 17/18] deleted wrog file

---
 dnsapi/dns_infraws.sh | 102 ------------------------------------------
 1 file changed, 102 deletions(-)
 delete mode 100644 dnsapi/dns_infraws.sh

diff --git a/dnsapi/dns_infraws.sh b/dnsapi/dns_infraws.sh
deleted file mode 100644
index 30abcbfb..00000000
--- a/dnsapi/dns_infraws.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/env sh
-
-############################################################
-# Plugin para criação automática da entrada de DNS txt     #
-# Uso com o sistema acme.sh                                #
-#                                                          #
-# Author: Felipe Keller Braz <felipebraz@kinghost.com.br>  #
-# Report Bugs here: infra_interno@kinghost.com.br          #
-#                                                          #
-# Values to export:                                        #
-# export INFRAWS_Hash="PASSWORD"                           #
-############################################################
-
-INFRAWS_Api="http://infra-ws.kinghost.net/serverbackend/acme"
-
-# Usage: add  _acme-challenge.www.domain.com   "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
-# Used to add txt record
-dns_infraws_add() {
-  fulldomain=$1
-  txtvalue=$2
-
-  INFRAWS_Hash="${INFRAWS_Hash:-$(_readaccountconf_mutable INFRAWS_Hash)}"
-
-  if [ -z "$INFRAWS_Hash" ]; then
-    INFRAWS_Hash=""
-    _err "You don't specify KingHost api password and email yet."
-    _err "Please create you key and try again."
-    return 1
-  fi
-
-  #save the credentials to the account conf file.
-  _saveaccountconf_mutable INFRAWS_Hash "$INFRAWS_Hash"
-
-  _debug "Getting txt records"
-  infraws_rest GET "dns" "name=$fulldomain&content=$txtvalue"
-
-  #This API call returns "status":"ok" if dns record does not exists
-  #We are creating a new txt record here, so we expect the "ok" status
-  if ! echo "$response" | grep '"status":"ok"' >/dev/null; then
-    _err "Error"
-    _err "$response"
-    return 1
-  fi
-
-  infraws_rest POST "dns" "name=$fulldomain&content=$txtvalue"
-  if ! echo "$response" | grep '"status":"ok"' >/dev/null; then
-    _err "Error"
-    _err "$response"
-    return 1
-  fi
-
-  return 0
-}
-
-# Usage: fulldomain txtvalue
-# Used to remove the txt record after validation
-dns_infraws_rm() {
-  fulldomain=$1
-  txtvalue=$2
-
-  INFRAWS_Hash="${INFRAWS_Hash:-$(_readaccountconf_mutable INFRAWS_Hash)}"
-  if [ -z "$INFRAWS_Hash" ]; then
-    INFRAWS_Hash=""
-    _err "You don't specify KingHost api key and email yet."
-    _err "Please create you key and try again."
-    return 1
-  fi
-
-  _debug "Getting txt records"
-  infraws_rest GET "dns" "name=$fulldomain&content=$txtvalue"
-
-  infraws_rest DELETE "dns" "name=$fulldomain&content=$txtvalue"
-  if ! echo "$response" | grep '"status":"ok"' >/dev/null; then
-    _err "Error"
-    _err "$response"
-    return 1
-  fi
-
-  return 0
-}
-
-####################  Private functions below ##################################
-infraws_rest() {
-  method=$1
-  uri="$2"
-  data="$3"
-  _debug "$uri"
-
-  if [ "$method" != "GET" ]; then
-    _debug data "$data"
-    response="$(_post "$data" "$INFRAWS_Api/hash/$INFRAWS_Hash/" "" "$method")"
-  else
-    response="$(_get "$INFRAWS_Api/hash/$INFRAWS_Hash/?$data")"
-  fi
-
-  if [ "$?" != "0" ]; then
-    _err "error $uri"
-    return 1
-  fi
-  _debug2 response "$response"
-  return 0
-}

From ce9c22742503efed89dfa4300c7d72739fe9aaf9 Mon Sep 17 00:00:00 2001
From: Habetdin <git@fanlab.org>
Date: Wed, 28 Mar 2018 18:25:52 +0300
Subject: [PATCH 18/18] Update README.md

---
 dnsapi/README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/dnsapi/README.md b/dnsapi/README.md
index e459094e..10295266 100644
--- a/dnsapi/README.md
+++ b/dnsapi/README.md
@@ -799,6 +799,21 @@ acme.sh --issue --dns dns_kinghost -d example.com -d *.example.com
 
 The `KINGHOST_username` and `KINGHOST_Password` will be saved in `~/.acme.sh/account.conf` and will be reused when needed.
 
+## 43. Use Zilore DNS API
+
+First you need to login to your Zilore account to get your API key.
+
+```
+export Zilore_Key="5dcad3a2-36cb-50e8-cb92-000002f9"
+```
+
+Ok, let's issue a cert now:
+```
+acme.sh --issue --dns dns_zilore -d example.com -d www.example.com
+```
+
+The `Zilore_Key` will be saved in `~/.acme.sh/account.conf` and will be reused when needed.
+
 # Use custom API
 
 If your API is not supported yet, you can write your own DNS API.