Merge branch 'master' of plutz.net:cgilite

diff --git a/cgilite.sh b/cgilite.sh
index a84de140c97867d1a1fc074ac252e390dbf22c7c..7eab08a5b4bc92691b34e7cdc3e61679f2f8d2b6 100755 (executable)
--- 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 3f63b3d6fecf14dfd8808a3d58f655ff173e3040..976d42e814d4f4d836f3bb93df97653f10fd4b48 100755 (executable)
--- a/html-sh.sed
+++ b/html-sh.sed
@@ -60,7 +60,8 @@ s;(<select( [^>]+)?)>[ \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>;\1>;g;
 
 s;<!-->;<!--;;