From: Paul Hänsch Date: Thu, 4 Apr 2019 12:09:45 +0000 (+0200) Subject: Merge branch 'master' of plutz.net:cgilite X-Git-Url: http://git.plutz.net/?p=cgilite;a=commitdiff_plain;h=e2678dc719c2dcda2de9a6079ac63837681e1a26;hp=4feaa19ab266bca60388152b6c1f550d09b1184b Merge branch 'master' of plutz.net:cgilite --- diff --git a/cgilite.sh b/cgilite.sh index a84de14..7eab08a 100755 --- a/cgilite.sh +++ b/cgilite.sh @@ -119,14 +119,26 @@ cgilite_value(){ printf -- "$(printf %s "${str%%&*}" |sed -r 's;\+; ;g;'"$HEX_DECODE")" } +cgilite_keys(){ + local str="&$1" + while [ "${str#*&}" != "${str}" ]; do + str="${str#*&}" + printf '%s\n' "${str%%=*}" + done \ + | sort -u +} + GET(){ cgilite_value "${QUERY_STRING}" $@; } GET_COUNT(){ cgilite_count "${QUERY_STRING}" $1; } +GET_KEYS(){ cgilite_keys "${QUERY_STRING}"; } POST(){ cgilite_value "${cgilite_post}" $@; } POST_COUNT(){ cgilite_count "${cgilite_post}" $1; } +POST_KEYS(){ cgilite_keys "${cgilite_post}"; } REF(){ cgilite_value "${HTTP_REFERER#*\?}" $@; } REF_COUNT(){ cgilite_count "${HTTP_REFERER#*\?}" $1; } +REF_KEYS(){ cgilite_keys "${HTTP_REFERER#*\?}"; } COOKIE(){ HEX_DECODE "$( diff --git a/html-sh.sed b/html-sh.sed index 3f63b3d..976d42e 100755 --- a/html-sh.sed +++ b/html-sh.sed @@ -60,7 +60,8 @@ s;(]+)?)>[ \t]*multiple;\1 multiple="multiple">;g; t attribs; s;(<[^/][^>]*>)[ \t]*;\1;g; -s;(<[^/][^>]*)>[ \t]*]+>;\1/>;g; +# s;(<[^/][^>]*)>[ \t]*]+>;\1/>;g; +s;(<(br|hr|img|input|link|meta|area|base|col|command|embed|keygen|param|source|track|wbr)[^>]*)>[ \t]*;\1>;g; s;;