X-Git-Url: http://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=cgi.sh;h=bba28548768d4f9ddef3e25c941bd13fe8529834;hp=124496e0895ed11bce06279906cad9ed2c51c2b7;hb=bbcee9f486a09ea50ff54210a4ae615a498b1be0;hpb=2030c27378891fc2d26091303269f7b9c228611b

diff --git a/cgi.sh b/cgi.sh
index 124496e..bba2854 100755
--- a/cgi.sh
+++ b/cgi.sh
@@ -27,8 +27,8 @@ declare -A _COOKIE
 # parse HTTP GET string
 debug "== CGI DATA: GET =="
 printf '%s\n' "$QUERY_STRING" |tr '&' '\n' |while read query; do
-  key="$(printf %s "$query" |sed -r 's:^([a-zA-Z0-9_-]+)=(.*)$:\1:')"
-  val="$(printf %s "$query" |sed -r 's:^([a-zA-Z0-9_-]+)=(.*)$:\2:')"
+  key="$(printf %s "$query" |sed -r 's:^([\.a-zA-Z0-9_-]+)=(.*)$:\1:')"
+  val="$(printf %s "$query" |sed -r 's:^([\.a-zA-Z0-9_-]+)=(.*)$:\2:')"
   _GET[$key]="$(printf "$(printf %s "$val" |sed 's:+: :g;s:\\:\\\\:g;s:%:\\x:g')")"
   debug "_GET[$key] => $val"
 done
@@ -37,13 +37,13 @@ if [ "$REQUEST_METHOD" = POST ]; then
   # parse HTTP POST string
   debug "== CGI DATA: POST =="
   sed -u 1q |tr '&' '\n' |while read query; do
-    key="$(printf %s "$query" |sed -r 's:^([a-zA-Z0-9_-]+)=(.*)$:\1:')"
-    val="$(printf %s "$query" |sed -r 's:^([a-zA-Z0-9_-]+)=(.*)$:\2:')"
+    key="$(printf %s "$query" |sed -r 's:^([\.a-zA-Z0-9_-]+)=(.*)$:\1:')"
+    val="$(printf %s "$query" |sed -r 's:^([\.a-zA-Z0-9_-]+)=(.*)$:\2:')"
     value="$(printf "$(printf %s "$val" |sed 's:+: :g;s:\\:\\\\:g;s:%:\\x:g;')")"
     n=''
-    if [ -n "${_POST[$key$n]}" ]; then
+    if [ -n "${_POST[$key$n]+x}" ]; then
       n=0
-      while [ -n "${_POST[$key$n]}" ]; do n=$(($n + 1)); done
+      while [ -n "${_POST[$key$n]+x}" ]; do n=$(($n + 1)); done
     fi
     _POST[$key$n]="$value"
     debug "_POST[$key$n] => $value"
@@ -53,8 +53,8 @@ fi
 cgi_refdata() { # Parse GET data from referer
   debug "== CGI DATA: REFERER =="
   printf '%s\n' "${HTTP_REFERER#*\?}" |tr '&' '\n' |while read query; do
-    key="$(printf %s "$query" |sed -r 's:^([a-zA-Z0-9_-]+)=(.*)$:\1:')"
-    val="$(printf %s "$query" |sed -r 's:^([a-zA-Z0-9_-]+)=(.*)$:\2:')"
+    key="$(printf %s "$query" |sed -r 's:^([\.a-zA-Z0-9_-]+)=(.*)$:\1:')"
+    val="$(printf %s "$query" |sed -r 's:^([\.a-zA-Z0-9_-]+)=(.*)$:\2:')"
     _REF[$key]="$(printf "$(printf %s "$val" |sed 's:+: :g;s:\\:\\\\:g;s:%:\\x:g')")"
     debug "_REF[$key] => $val"
   done
@@ -63,8 +63,8 @@ cgi_refdata() { # Parse GET data from referer
 cgi_cookie() { # Parse GET data from referer
   debug "== CGI DATA: COOKIE =="
   printf '%s\n' "$HTTP_COOKIE" |tr ';' '\n' |while read query; do
-    key="$(printf %s "$query" |sed -r 's:^ *([a-zA-Z0-9_-]+)=(.*)$:\1:')"
-    val="$(printf %s "$query" |sed -r 's:^ *([a-zA-Z0-9_-]+)=(.*)$:\2:')"
+    key="$(printf %s "$query" |sed -r 's:^ *([\.a-zA-Z0-9_-]+)=(.*)$:\1:')"
+    val="$(printf %s "$query" |sed -r 's:^ *([\.a-zA-Z0-9_-]+)=(.*)$:\2:')"
     _COOKIE[$key]="$(printf "$(printf %s "$val" |sed 's:+: :g;s:\\:\\\\:g;s:%:\\x:g')")"
     debug "_COOKIE[$key] => $val"
   done
@@ -84,9 +84,9 @@ urlsafe(){
 
 htmlsafe(){
   printf %s "$*" \
-  | sed 's;<;\&lt\;;g;
+  | sed 's;&;\&amp\;;g;
+         s;<;\&lt\;;g;
          s;>;\&gt\;;g;
-         s;&;\&amp\;;g;
          s;";\&quot\;;g;
          s;'\'';\&apos\;;g;'
 }