Merge pull request #4059 from NerLOR/master

dns_world4you: fix _parse_paket_nr
This commit is contained in:
neil 2022-04-29 14:48:31 +08:00 committed by GitHub
commit 8ba7d02fdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -54,15 +54,14 @@ dns_world4you_add() {
if _contains "$res" "successfully"; then if _contains "$res" "successfully"; then
return 0 return 0
else else
msg=$(echo "$res" | tr '\n' '\t' | sed 's/.*<h3 class="mb-5">[^\t]*\t *\([^\t]*\)\t.*/\1/') msg=$(echo "$res" | grep -A 15 'data-type="danger"' | grep "<h3[^>]*>[^<]" | sed 's/<[^>]*>\|^\s*//g')
if _contains "$msg" '^<\!DOCTYPE html>'; then if [ "$msg" = '' ]; then
msg='Unknown error' _err "Unable to add record: Unknown error"
fi
_err "Unable to add record: $msg"
if _contains "$msg" '^<\!DOCTYPE html>'; then
echo "$ret" >'error-01.html' echo "$ret" >'error-01.html'
echo "$res" >'error-02.html' echo "$res" >'error-02.html'
_err "View error-01.html and error-02.html for debugging" _err "View error-01.html and error-02.html for debugging"
else
_err "Unable to add record: my.world4you.com: $msg"
fi fi
return 1 return 1
fi fi
@ -119,15 +118,14 @@ dns_world4you_rm() {
if _contains "$res" "successfully"; then if _contains "$res" "successfully"; then
return 0 return 0
else else
msg=$(echo "$res" | tr '\n' '\t' | sed 's/.*<h3 class="mb-5">[^\t]*\t *\([^\t]*\)\t.*/\1/') msg=$(echo "$res" | grep -A 15 'data-type="danger"' | grep "<h3[^>]*>[^<]" | sed 's/<[^>]*>\|^\s*//g')
if _contains "$msg" '^<\!DOCTYPE html>'; then if [ "$msg" = '' ]; then
msg='Unknown error' _err "Unable to remove record: Unknown error"
fi
_err "Unable to remove record: $msg"
if _contains "$msg" '^<\!DOCTYPE html>'; then
echo "$ret" >'error-01.html' echo "$ret" >'error-01.html'
echo "$res" >'error-02.html' echo "$res" >'error-02.html'
_err "View error-01.html and error-02.html for debugging" _err "View error-01.html and error-02.html for debugging"
else
_err "Unable to remove record: my.world4you.com: $msg"
fi fi
return 1 return 1
fi fi
@ -199,6 +197,6 @@ _get_paketnr() {
TLD="$domain" TLD="$domain"
_debug domain "$domain" _debug domain "$domain"
RECORD=$(echo "$fqdn" | cut -c"1-$((${#fqdn} - ${#TLD} - 1))") RECORD=$(echo "$fqdn" | cut -c"1-$((${#fqdn} - ${#TLD} - 1))")
PAKETNR=$(echo "$form" | grep "data-textfilter=\".* $domain " | _head_n 1 | sed 's/^.* \([0-9]*\) .*$/\1/') PAKETNR=$(echo "$form" | grep "data-textfilter=\".* $domain " | _tail_n 1 | sed "s|.*$WORLD4YOU_API/\\([0-9]*\\)/.*|\\1|")
return 0 return 0
} }